1.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/OrchTemplate.gif has changed
2.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/bp_file.gif has changed
3.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/bpel_catalog.gif has changed
4.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/bpel_file.gif has changed
5.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/bpel_file.png has changed
6.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/errorbadge.gif has changed
7.1 Binary file bpel.core/src/org/netbeans/modules/bpel/core/resources/warningbadge.gif has changed
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
8.2 +++ b/bpel.debugger.bdi/external/bdi-1.0.0.jar Sat Jan 26 05:58:37 2008 +0000
8.3 @@ -0,0 +1,1 @@
8.4 +<<<EXTERNAL 6B2D22D5B448F19D6CFBEBC4F8898CD23B086D5F-bdi-1.0.0.jar>>>
9.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/console.gif has changed
10.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/current.gif has changed
11.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/ALARM_EVENT_HANDLER.gif has changed
12.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/ALARM_HANDLER.gif has changed
13.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/ASSIGN.gif has changed
14.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/CATCH.gif has changed
15.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/CATCH_ALL.gif has changed
16.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/COMPENSATE.gif has changed
17.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/COMPENSATE_SCOPE.gif has changed
18.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/COMPENSATION_HANDLER.gif has changed
19.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/COPY.gif has changed
20.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/DEFAULT_BPEL_ENTITY_NODE.gif has changed
21.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/ELSE.gif has changed
22.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/ELSE_IF.gif has changed
23.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/EMPTY.gif has changed
24.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/EVENT_HANDLERS.gif has changed
25.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/EXIT.gif has changed
26.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/FAULT_HANDLERS.gif has changed
27.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/FLOW.gif has changed
28.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/FOR_EACH.gif has changed
29.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/IF.gif has changed
30.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/INVOKE.gif has changed
31.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/MESSAGE_HANDLER.gif has changed
32.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/ON_EVENT.gif has changed
33.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/PICK.gif has changed
34.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/PROCESS.gif has changed
35.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/RECEIVE.gif has changed
36.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/REPEAT_UNTIL.gif has changed
37.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/REPLY.gif has changed
38.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/SCOPE.gif has changed
39.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/SEQUENCE.gif has changed
40.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/TERMINATION_HANDLER.gif has changed
41.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/THEN.gif has changed
42.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/THROW.gif has changed
43.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/WAIT.gif has changed
44.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/WHILE.gif has changed
45.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/ALARM_EVENT_HANDLER.gif has changed
46.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/ALARM_HANDLER.gif has changed
47.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/ASSIGN.gif has changed
48.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/CATCH.gif has changed
49.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/CATCH_ALL.gif has changed
50.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/COMPENSATE.gif has changed
51.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/COMPENSATE_SCOPE.gif has changed
52.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/COMPENSATION_HANDLER.gif has changed
53.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/COPY.gif has changed
54.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/DEFAULT_BPEL_ENTITY_NODE.gif has changed
55.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/ELSE.gif has changed
56.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/ELSE_IF.gif has changed
57.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/EMPTY.gif has changed
58.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/EVENT_HANDLERS.gif has changed
59.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/EXIT.gif has changed
60.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/FAULT_HANDLERS.gif has changed
61.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/FLOW.gif has changed
62.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/FOR_EACH.gif has changed
63.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/IF.gif has changed
64.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/INVOKE.gif has changed
65.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/MESSAGE_HANDLER.gif has changed
66.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/ON_EVENT.gif has changed
67.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/PICK.gif has changed
68.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/PROCESS.gif has changed
69.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/RECEIVE.gif has changed
70.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/REPEAT_UNTIL.gif has changed
71.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/REPLY.gif has changed
72.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/SCOPE.gif has changed
73.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/SEQUENCE.gif has changed
74.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/TERMINATION_HANDLER.gif has changed
75.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/THEN.gif has changed
76.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/THROW.gif has changed
77.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/WAIT.gif has changed
78.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/execution/grayed-out/WHILE.gif has changed
79.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/ATTRIBUTE_NODE.gif has changed
80.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/CDATA_NODE.gif has changed
81.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/DEFAULT_NODE.gif has changed
82.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/ELEMENT_NODE.gif has changed
83.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/ENDPOINT.gif has changed
84.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/MY_ROLE.gif has changed
85.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/PARTNER_LINK.gif has changed
86.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/PARTNER_ROLE.gif has changed
87.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/plinks/TEXT_NODE.gif has changed
88.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/process.gif has changed
89.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/process_execution.png has changed
90.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/running.gif has changed
91.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/suspended.gif has changed
92.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/threads/active.gif has changed
93.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/threads/completed.gif has changed
94.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/threads/current.gif has changed
95.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables.gif has changed
96.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/ATTRIBUTE_NODE.gif has changed
97.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/CDATA_NODE.gif has changed
98.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/DEFAULT_NODE.gif has changed
99.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/ELEMENT_NODE.gif has changed
100.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/MESSAGE_PART.gif has changed
101.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/TEXT_NODE.gif has changed
102.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/VARIABLE_MESSAGE.gif has changed
103.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/VARIABLE_SIMPLE.gif has changed
104.1 Binary file bpel.debugger.ui/src/org/netbeans/modules/bpel/debugger/ui/resources/image/variables/VARIABLE_XML_ELEMENT.gif has changed
105.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/ALARM_EVENT_HANDLER.png has changed
106.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/ALARM_HANDLER.png has changed
107.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/ASSIGN.png has changed
108.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/BOOLEAN_EXPR.png has changed
109.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CATCH.png has changed
110.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CATCH_ALL.png has changed
111.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/COMPENSATE.png has changed
112.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/COMPENSATE_SCOPE.png has changed
113.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/COMPENSATION_HANDLER.png has changed
114.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/COMPLETION_CONDITION.png has changed
115.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/COPY.png has changed
116.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION.png has changed
117.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION_P.png has changed
118.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION_PROPERTY.png has changed
119.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION_PROPERTY_ALIAS.png has changed
120.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION_PROPERTY_CONTAINER.png has changed
121.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION_SET.png has changed
122.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/CORRELATION_SET_CONTAINER.png has changed
123.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/DEFAULT_BPEL_ENTITY_NODE.png has changed
124.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/ELSE.png has changed
125.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/ELSE_IF.png has changed
126.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/EMBEDDED_SCHEMA.png has changed
127.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/EMBEDDED_SCHEMAS_FOLDER.png has changed
128.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/EMPTY.png has changed
129.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/EVENT_HANDLERS.png has changed
130.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/EXIT.png has changed
131.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/FAULT.png has changed
132.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/FAULT_HANDLERS.png has changed
133.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/FLOW.png has changed
134.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/FOR_EACH.png has changed
135.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/FROM.png has changed
136.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/FROM_PART.png has changed
137.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/GLOBAL_COMPLEX_TYPE.png has changed
138.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/GLOBAL_COMPLEX_TYPE_BADGE.png has changed
139.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/GLOBAL_ELEMENT.png has changed
140.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/GLOBAL_ELEMENT_BADGE.png has changed
141.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/GLOBAL_SIMPLE_TYPE.png has changed
142.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/GLOBAL_SIMPLE_TYPE_BADGE.png has changed
143.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/IF.png has changed
144.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/IMPORT.png has changed
145.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/IMPORT_SCHEMA.png has changed
146.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/IMPORT_WSDL.png has changed
147.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/INVOKE.png has changed
148.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/MESSAGE_BADGE.png has changed
149.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/MESSAGE_EXCHANGE.png has changed
150.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/MESSAGE_HANDLER.png has changed
151.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/MESSAGE_PART.png has changed
152.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/MESSAGE_TYPE.png has changed
153.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/ON_EVENT.png has changed
154.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PARTNER_LINK.png has changed
155.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PARTNER_LINK_TYPE.png has changed
156.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PARTNER_ROLE.png has changed
157.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PICK.png has changed
158.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PRIMITIVE_TYPE.png has changed
159.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PRIMITIVE_TYPE_BADGE.png has changed
160.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/PROCESS.png has changed
161.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/QUERY.png has changed
162.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/RECEIVE.png has changed
163.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/REPEAT_UNTIL.png has changed
164.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/REPLY.png has changed
165.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/RETHROW.png has changed
166.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/SCHEMA_ATTRIBUTE.png has changed
167.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/SCHEMA_ELEMENT_TYPE.png has changed
168.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/SCHEMA_FILE.png has changed
169.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/SCOPE.png has changed
170.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/SEQUENCE.png has changed
171.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/TERMINATION_HANDLER.png has changed
172.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/THEN.png has changed
173.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/THROW.png has changed
174.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/TO.png has changed
175.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/TO_PART.png has changed
176.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/UNKNOWN_TYPE.png has changed
177.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE.png has changed
178.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_CONTAINER.png has changed
179.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_GLOBAL_COMPLEX_TYPE.png has changed
180.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_GLOBAL_ELEMENT.png has changed
181.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_GLOBAL_SIMPLE_TYPE.png has changed
182.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_GLOBAL_TYPE.png has changed
183.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_MESSAGE.png has changed
184.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_PRIMITIVE_TYPE.png has changed
185.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/VARIABLE_SCOPE.png has changed
186.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/WAIT.png has changed
187.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/WHILE.png has changed
188.1 Binary file bpel.editors.api/src/org/netbeans/modules/bpel/editors/api/nodes/images/WSDL_FILE.png has changed
189.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_catch.png has changed
190.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_catch_all.png has changed
191.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_compensation_handler.png has changed
192.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_correlation_set.png has changed
193.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_else_if.png has changed
194.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_event_handlers.png has changed
195.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_fault_handlers.png has changed
196.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_on_alarm.png has changed
197.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_on_event.png has changed
198.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_on_message.png has changed
199.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_termination_handler.png has changed
200.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/add_variable.png has changed
201.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/advice.png has changed
202.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/advice_explicit.png has changed
203.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/disabled_breakpoint.png has changed
204.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/e.png has changed
205.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/edit_properties.png has changed
206.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/enabled_breakpoint.png has changed
207.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/envelope_small.png has changed
208.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/envelope_small_gray.png has changed
209.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/envelope_small_red.png has changed
210.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/error.png has changed
211.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/error_explicit.png has changed
212.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/execution.png has changed
213.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/execution_faild.png has changed
214.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/execution_ok.png has changed
215.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/open_wsdl.png has changed
216.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/stub.png has changed
217.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/warning.png has changed
218.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/decoration/resources/warning_explicit.png has changed
219.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/error_badge.png has changed
220.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/expand_all.png has changed
221.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/fit_diagram.png has changed
222.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/fit_width.png has changed
223.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/hand_tool.png has changed
224.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/normal_size.png has changed
225.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/partner_link_filter.png has changed
226.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/select_tool.png has changed
227.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/sequence_filter.png has changed
228.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/validation.png has changed
229.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/zoom_in.png has changed
230.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/design/resources/zoom_out.png has changed
231.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/documentation/image/documentation.gif has changed
232.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/Business_Process_badge.png has changed
233.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_breakpoint.png has changed
234.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_current_breakpoint.png has changed
235.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_current_disabled_breakpoint.png has changed
236.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_current_position.png has changed
237.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_disabled_breakpoint.png has changed
238.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_error.png has changed
239.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/badge_warning.png has changed
240.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/bpel_file.gif has changed
241.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/bpel_file.png has changed
242.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/bpel_folder.png has changed
243.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/continuedebug.png has changed
244.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/messageconnector.png has changed
245.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/test-result.png has changed
246.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/test.gif has changed
247.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/testRunning.gif has changed
248.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/editors/resources/tests.gif has changed
249.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/logging/resources/logging.png has changed
250.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/assign16.png has changed
251.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/assign32.png has changed
252.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/compensate16.png has changed
253.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/compensate32.png has changed
254.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/compensatescope.png has changed
255.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/compensatescope16.png has changed
256.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/empty16.png has changed
257.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/empty32.png has changed
258.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/exit16.png has changed
259.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/exit32.png has changed
260.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/rethrow16.png has changed
261.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/rethrow32.png has changed
262.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/throw16.png has changed
263.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/throw32.png has changed
264.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/wait16.png has changed
265.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/basic/wait32.png has changed
266.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/flow16.png has changed
267.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/flow32.png has changed
268.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/foreach16.png has changed
269.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/foreach32.png has changed
270.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/if16.png has changed
271.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/if32.png has changed
272.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/pick16.png has changed
273.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/pick32.png has changed
274.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/repeatuntil16.png has changed
275.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/repeatuntil32.png has changed
276.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/scope16.png has changed
277.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/scope32.png has changed
278.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/sequence16.png has changed
279.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/sequence32.png has changed
280.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/while16.png has changed
281.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/structured/while32.png has changed
282.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/invoke16.png has changed
283.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/invoke32.png has changed
284.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/partner16.png has changed
285.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/partner32.png has changed
286.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/receive16.png has changed
287.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/receive32.png has changed
288.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/reply16.png has changed
289.1 Binary file bpel.editors/src/org/netbeans/modules/bpel/palette/resources/webservice/reply32.png has changed
290.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_assign.png has changed
291.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_compensate.png has changed
292.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_empty.png has changed
293.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_exit.png has changed
294.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_invoke.png has changed
295.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_receive.png has changed
296.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_reply.png has changed
297.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_throw.png has changed
298.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/activity_wait.png has changed
299.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle1.gif has changed
300.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle2.gif has changed
301.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle3.gif has changed
302.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle4.gif has changed
303.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle5.gif has changed
304.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle6.gif has changed
305.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/circle7.gif has changed
306.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/execution.png has changed
307.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/execution_ok.png has changed
308.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/expand_all.png has changed
309.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/flow.png has changed
310.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/foreach.png has changed
311.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/hand_tool.png has changed
312.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/if.png has changed
313.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/partnerLinkVertical.png has changed
314.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/pick.png has changed
315.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/repeatuntil.png has changed
316.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/scope.png has changed
317.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/select_tool.png has changed
318.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/sequence.png has changed
319.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/thumbnailview.png has changed
320.1 Binary file bpel.help/javahelp/org/netbeans/modules/bpel/help/images/while_activity.png has changed
321.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/boolean.gif has changed
322.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/bpel.gif has changed
323.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/date_time.gif has changed
324.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/duration.gif has changed
325.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/expose.gif has changed
326.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/node.gif has changed
327.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/number.gif has changed
328.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/numeric.gif has changed
329.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/operator.gif has changed
330.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/palette/image/string.gif has changed
331.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/resources/mapper.png has changed
332.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/resources/wrapServiceRef.png has changed
333.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/ATTRIBUTE.png has changed
334.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/ATTRIBUTE_OPTIONAL.png has changed
335.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/ELEMENT.png has changed
336.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/ELEMENT_OPTIONAL.png has changed
337.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/ELEMENT_OPTIONAL_REPEATING.png has changed
338.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/ELEMENT_REPEATING.png has changed
339.1 Binary file bpel.mapper/src/org/netbeans/modules/bpel/mapper/tree/images/RESULT.png has changed
340.1 Binary file bpel.model/src/org/netbeans/modules/bpel/model/api/support/current-date.png has changed
341.1 Binary file bpel.model/src/org/netbeans/modules/bpel/model/api/support/current-dateTime.png has changed
342.1 Binary file bpel.model/src/org/netbeans/modules/bpel/model/api/support/current-time.png has changed
343.1 Binary file bpel.model/src/org/netbeans/modules/bpel/model/api/support/doXslTransform.png has changed
344.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/resources/bpelProject.png has changed
345.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/build.gif has changed
346.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/defaultCategory.gif has changed
347.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/docjar.gif has changed
348.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/general.gif has changed
349.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/icanproProjectIcon.gif has changed
350.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/j2seProject.gif has changed
351.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/jar.gif has changed
352.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/libraries.gif has changed
353.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/projectDependencies.gif has changed
354.1 Binary file bpel.project/src/org/netbeans/modules/bpel/project/ui/resources/run.gif has changed
355.1 Binary file bpel.samples/src/org/netbeans/modules/bpel/samples/resources/project.png has changed
356.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/copy.gif has changed
357.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/empty.gif has changed
358.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/export.gif has changed
359.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/expose.gif has changed
360.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/find.gif has changed
361.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/next.gif has changed
362.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/previous.gif has changed
363.1 Binary file bpel.search/src/org/netbeans/modules/bpel/search/impl/util/image/search.gif has changed
364.1 Binary file bpel.validation/src/org/netbeans/modules/bpel/validation/util/image/quickfix.gif has changed
365.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/design/resources/auto_layout.png has changed
366.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/design/resources/build_project.png has changed
367.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/design/resources/fit_diagram.png has changed
368.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/design/resources/fit_width.png has changed
369.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/design/resources/normal_size.png has changed
370.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/design/resources/style16.png has changed
371.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/resources/collapse.png has changed
372.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/resources/consumesLeft.png has changed
373.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/resources/consumesRight.png has changed
374.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/resources/expand.png has changed
375.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/resources/providesLeft.png has changed
376.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/graph/resources/providesRight.png has changed
377.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/AutoLayout.png has changed
378.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/BuildProject.png has changed
379.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/CasaRootNode.png has changed
380.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ConnectionNode.png has changed
381.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ConnectionsNode.png has changed
382.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ConsumesListNode.png has changed
383.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ConsumesNode.png has changed
384.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/DeployProject.png has changed
385.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/LookAndFeelNode.png has changed
386.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ProvidesListNode.png has changed
387.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ProvidesNode.png has changed
388.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ServiceEnginesNode.png has changed
389.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/ServiceUnitNode.png has changed
390.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/Validation.png has changed
391.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/WSDLEndpointNode.png has changed
392.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/nodes/resources/WSDLEndpointsNode.png has changed
393.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/WSpolicy16.png has changed
394.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/badge_error.png has changed
395.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/badge_warning.png has changed
396.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/bc32.png has changed
397.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/consumesPalette.png has changed
398.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/consumesPalette32.png has changed
399.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/delete16.png has changed
400.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/edit16.png has changed
401.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/extsu.png has changed
402.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/extsu32.png has changed
403.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/hide16.png has changed
404.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/intsu.png has changed
405.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/intsu32.png has changed
406.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/providesPalette.png has changed
407.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/providesPalette32.png has changed
408.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/question_violet.png has changed
409.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/palette/resources/user_created_16.png has changed
410.1 Binary file compapp.casaeditor/src/org/netbeans/modules/compapp/casaeditor/resources/casa16.gif has changed
411.1 Binary file compapp.configextension/src/org/netbeans/modules/compapp/configextension/resources/config-ext.png has changed
412.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-autolayout.png has changed
413.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-buildproject.png has changed
414.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-pal-endpoint-consume.png has changed
415.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-pal-endpoint-provide.png has changed
416.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-pal-su-external.png has changed
417.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-pal-su-internal.png has changed
418.1 Binary file compapp.help/javahelp/org/netbeans/modules/compapp/capshelp/images/button-pal-wsdlbinding.png has changed
419.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/ApplicationConfigurationsEditor.java Sat Jan 26 03:07:46 2008 +0000
419.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/ApplicationConfigurationsEditor.java Sat Jan 26 05:58:37 2008 +0000
419.3 @@ -44,7 +44,7 @@
419.4
419.5 import javax.management.openmbean.CompositeData;
419.6 import javax.management.openmbean.TabularType;
419.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
419.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
419.9
419.10
419.11 /**
419.12 @@ -67,7 +67,7 @@
419.13 */
419.14 public ApplicationConfigurationsEditor(String tableLabelText,
419.15 String tableLabelDescription, TabularType tabularType,
419.16 - String[] keys, OldJBIComponentConfigurationDescriptor descriptor,
419.17 + String[] keys, ComponentConfigurationDescriptor descriptor,
419.18 boolean isWritable){
419.19 super(tableLabelText, tableLabelDescription, tabularType, descriptor,
419.20 isWritable);
420.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/ComboBoxPropertyEditor.java Sat Jan 26 03:07:46 2008 +0000
420.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/ComboBoxPropertyEditor.java Sat Jan 26 05:58:37 2008 +0000
420.3 @@ -50,7 +50,6 @@
420.4 import java.beans.PropertyEditorSupport;
420.5 import java.util.Arrays;
420.6
420.7 -import java.util.List;
420.8 import org.openide.explorer.propertysheet.ExPropertyEditor;
420.9 import org.openide.explorer.propertysheet.PropertyEnv;
420.10
420.11 @@ -77,10 +76,6 @@
420.12 public ComboBoxPropertyEditor(String[] values) {
420.13 setValues(values);
420.14 }
420.15 -
420.16 - public ComboBoxPropertyEditor(List<String> values) {
420.17 - this(values.toArray(new String[]{}));
420.18 - }
420.19
420.20 /**
420.21 * Describe <code>setValues</code> method here.
421.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/EnvironmentVariablesCustomEditor.java Sat Jan 26 03:07:46 2008 +0000
421.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/EnvironmentVariablesCustomEditor.java Sat Jan 26 05:58:37 2008 +0000
421.3 @@ -52,7 +52,7 @@
421.4 import javax.swing.table.TableCellRenderer;
421.5 import javax.swing.table.TableColumn;
421.6 import javax.swing.table.TableColumnModel;
421.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
421.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
421.9 import org.openide.DialogDescriptor;
421.10 import org.openide.DialogDisplayer;
421.11
421.12 @@ -71,7 +71,7 @@
421.13
421.14 public EnvironmentVariablesCustomEditor(SimpleTabularDataEditor editor,
421.15 String tableLabelText, String tableLabelDescription,
421.16 - OldJBIComponentConfigurationDescriptor descriptor,
421.17 + ComponentConfigurationDescriptor descriptor,
421.18 boolean isWritable) {
421.19 super(editor, tableLabelText, tableLabelDescription,
421.20 descriptor, isWritable);
422.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/EnvironmentVariablesEditor.java Sat Jan 26 03:07:46 2008 +0000
422.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/EnvironmentVariablesEditor.java Sat Jan 26 05:58:37 2008 +0000
422.3 @@ -46,7 +46,7 @@
422.4 import java.util.List;
422.5 import javax.management.openmbean.CompositeData;
422.6 import javax.management.openmbean.TabularType;
422.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
422.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
422.9 import org.openide.util.NbBundle;
422.10
422.11 /**
422.12 @@ -65,7 +65,7 @@
422.13 * @param tabularType the type of the tabular data
422.14 */
422.15 public EnvironmentVariablesEditor(boolean isAppVar, TabularType tabularType,
422.16 - OldJBIComponentConfigurationDescriptor descriptor, boolean isWritable) {
422.17 + ComponentConfigurationDescriptor descriptor, boolean isWritable) {
422.18 super(NbBundle.getMessage(EnvironmentVariablesEditor.class,
422.19 isAppVar ? "LBL_APPLICATION_VARIABLES_TABLE" : // NOI18N
422.20 "LBL_ENVIRONMENT_VARIABLES_TABLE"), // NOI18N
423.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/SimpleTabularDataCustomEditor.java Sat Jan 26 03:07:46 2008 +0000
423.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/SimpleTabularDataCustomEditor.java Sat Jan 26 05:58:37 2008 +0000
423.3 @@ -71,7 +71,7 @@
423.4 import javax.swing.table.TableCellEditor;
423.5 import javax.swing.table.TableCellRenderer;
423.6 import javax.swing.table.TableColumn;
423.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
423.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
423.9 import org.openide.explorer.propertysheet.editors.EnhancedCustomPropertyEditor;
423.10 import org.openide.util.NbBundle;
423.11
423.12 @@ -99,14 +99,14 @@
423.13 private String tableLabelText;
423.14 private String tableLabelDescription;
423.15
423.16 - protected OldJBIComponentConfigurationDescriptor descriptor;
423.17 + protected ComponentConfigurationDescriptor descriptor;
423.18
423.19 protected boolean isWritable = true;
423.20
423.21 public SimpleTabularDataCustomEditor(TabularData tabularData,
423.22 String tableLabelText,
423.23 String tableLabelDescription,
423.24 - OldJBIComponentConfigurationDescriptor descriptor,
423.25 + ComponentConfigurationDescriptor descriptor,
423.26 boolean isWritable) {
423.27 this.tableLabelText = tableLabelText;
423.28 this.tableLabelDescription = tableLabelDescription;
423.29 @@ -120,7 +120,7 @@
423.30 public SimpleTabularDataCustomEditor(SimpleTabularDataEditor editor,
423.31 String tableLabelText,
423.32 String tableLabelDescription,
423.33 - OldJBIComponentConfigurationDescriptor descriptor,
423.34 + ComponentConfigurationDescriptor descriptor,
423.35 boolean isWritable) {
423.36 this.tableLabelText = tableLabelText;
423.37 this.tableLabelDescription = tableLabelDescription;
423.38 @@ -186,7 +186,7 @@
423.39 for (int col = 0; col < itemValues.length; col++) {
423.40 Object itemValue = itemValues[col];
423.41 String columnName = columnNames[col];
423.42 - OldJBIComponentConfigurationDescriptor childDescriptor =
423.43 + ComponentConfigurationDescriptor childDescriptor =
423.44 descriptor.getChild(columnName);
423.45 if (childDescriptor.isRequired()) {
423.46 if (itemValue == null ||
423.47 @@ -453,7 +453,7 @@
423.48 // Display name and description in the composite type
423.49 // definition will take precedence if there are any
423.50 // inconsistencies.
423.51 - OldJBIComponentConfigurationDescriptor childDescriptor =
423.52 + ComponentConfigurationDescriptor childDescriptor =
423.53 descriptor.getChild(value.toString());
423.54 columnTitle = childDescriptor.getDisplayName();
423.55 columnDescription = childDescriptor.getDescription();
424.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/SimpleTabularDataEditor.java Sat Jan 26 03:07:46 2008 +0000
424.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/SimpleTabularDataEditor.java Sat Jan 26 05:58:37 2008 +0000
424.3 @@ -56,7 +56,7 @@
424.4 import javax.management.openmbean.TabularData;
424.5 import javax.management.openmbean.TabularDataSupport;
424.6 import javax.management.openmbean.TabularType;
424.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
424.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
424.9 import org.openide.DialogDisplayer;
424.10 import org.openide.NotifyDescriptor;
424.11 import org.openide.explorer.propertysheet.ExPropertyEditor;
424.12 @@ -77,7 +77,7 @@
424.13
424.14 private TabularType tabularType;
424.15
424.16 - protected OldJBIComponentConfigurationDescriptor descriptor;
424.17 + protected ComponentConfigurationDescriptor descriptor;
424.18
424.19 protected SimpleTabularDataCustomEditor customEditor;
424.20
424.21 @@ -86,7 +86,7 @@
424.22 public SimpleTabularDataEditor(String tableLabelText,
424.23 String tableLabelDescription,
424.24 TabularType tabularType,
424.25 - OldJBIComponentConfigurationDescriptor descriptor,
424.26 + ComponentConfigurationDescriptor descriptor,
424.27 boolean isWritable){
424.28 this.tabularType = tabularType;
424.29 this.tableLabelText = tableLabelText;
425.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/TabularDataCellEditorFactory.java Sat Jan 26 03:07:46 2008 +0000
425.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/editors/TabularDataCellEditorFactory.java Sat Jan 26 05:58:37 2008 +0000
425.3 @@ -68,7 +68,7 @@
425.4 import javax.swing.border.LineBorder;
425.5 import javax.swing.event.CellEditorListener;
425.6 import javax.swing.table.TableCellEditor;
425.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
425.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
425.9 import org.netbeans.modules.sun.manager.jbi.util.StackTraceUtil;
425.10 import org.openide.DialogDisplayer;
425.11 import org.openide.NotifyDescriptor;
425.12 @@ -116,7 +116,7 @@
425.13 }
425.14
425.15 public static TableCellEditor getEditor(Class clazz,
425.16 - OldJBIComponentConfigurationDescriptor descriptor, boolean isWritable) {
425.17 + ComponentConfigurationDescriptor descriptor, boolean isWritable) {
425.18 if (clazz.equals(TabularData.class)) {
425.19 return new TabularDataActionTableCellEditor(
425.20 new TabularDataCellEditor(), descriptor, isWritable);
425.21 @@ -404,7 +404,7 @@
425.22 class TabularDataActionTableCellEditor
425.23 extends AbstractActionTableCellEditorDecorator {
425.24
425.25 - private OldJBIComponentConfigurationDescriptor descriptor;
425.26 + private ComponentConfigurationDescriptor descriptor;
425.27 private boolean isWritable;
425.28
425.29 public TabularDataActionTableCellEditor(TableCellEditor realEditor,
425.30 @@ -413,7 +413,7 @@
425.31 }
425.32
425.33 public TabularDataActionTableCellEditor(TableCellEditor realEditor,
425.34 - OldJBIComponentConfigurationDescriptor descriptor,
425.35 + ComponentConfigurationDescriptor descriptor,
425.36 boolean isWritable) {
425.37 super(realEditor);
425.38 this.descriptor = descriptor;
426.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
426.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/ConfigurationMBeanAttributeInfo.java Sat Jan 26 05:58:37 2008 +0000
426.3 @@ -0,0 +1,84 @@
426.4 +/*
426.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
426.6 + *
426.7 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
426.8 + *
426.9 + * The contents of this file are subject to the terms of either the GNU
426.10 + * General Public License Version 2 only ("GPL") or the Common
426.11 + * Development and Distribution License("CDDL") (collectively, the
426.12 + * "License"). You may not use this file except in compliance with the
426.13 + * License. You can obtain a copy of the License at
426.14 + * http://www.netbeans.org/cddl-gplv2.html
426.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
426.16 + * specific language governing permissions and limitations under the
426.17 + * License. When distributing the software, include this License Header
426.18 + * Notice in each file and include the License file at
426.19 + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
426.20 + * particular file as subject to the "Classpath" exception as provided
426.21 + * by Sun in the GPL Version 2 section of the License file that
426.22 + * accompanied this code. If applicable, add the following below the
426.23 + * License Header, with the fields enclosed by brackets [] replaced by
426.24 + * your own identifying information:
426.25 + * "Portions Copyrighted [year] [name of copyright owner]"
426.26 + *
426.27 + * Contributor(s):
426.28 + *
426.29 + * The Original Software is NetBeans. The Initial Developer of the Original
426.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
426.31 + * Microsystems, Inc. All Rights Reserved.
426.32 + *
426.33 + * If you wish your version of this file to be governed by only the CDDL
426.34 + * or only the GPL Version 2, indicate your decision by adding
426.35 + * "[Contributor] elects to include this software in this distribution
426.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
426.37 + * single choice of license, a recipient has the option to distribute
426.38 + * your version of this file under either the CDDL, the GPL Version 2 or
426.39 + * to extend the choice of license to its licensees as provided above.
426.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
426.41 + * Version 2 license, then the option applies only if the new code is
426.42 + * made subject to such option by the copyright holder.
426.43 + */
426.44 +package org.netbeans.modules.sun.manager.jbi.management;
426.45 +
426.46 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
426.47 +import javax.management.MBeanAttributeInfo;
426.48 +
426.49 +/**
426.50 + *
426.51 + * @author jqian
426.52 + */
426.53 +public class ConfigurationMBeanAttributeInfo extends MBeanAttributeInfo {
426.54 +
426.55 + private ComponentConfigurationDescriptor descriptor;
426.56 +
426.57 + public ConfigurationMBeanAttributeInfo(ComponentConfigurationDescriptor descriptor,
426.58 + String type,
426.59 + boolean isReadable,
426.60 + boolean isWritable,
426.61 + boolean isIs) {
426.62 + super(descriptor.getDisplayName(), type, descriptor.getDescription(),
426.63 + isReadable, isWritable, isIs);
426.64 +
426.65 + this.descriptor = descriptor;
426.66 + }
426.67 +
426.68 + public ComponentConfigurationDescriptor getDescriptor() {
426.69 + return descriptor;
426.70 + }
426.71 +
426.72 + public boolean isPassword() {
426.73 + return descriptor.isPassword();
426.74 + }
426.75 +
426.76 + public boolean isApplicationRestartRequired() {
426.77 + return descriptor.needsApplicationRestart();
426.78 + }
426.79 +
426.80 + public boolean isComponentRestartRequired() {
426.81 + return descriptor.needsComponentRestart();
426.82 + }
426.83 +
426.84 + public boolean isServerRestartRequired() {
426.85 + return descriptor.needsServerRestart();
426.86 + }
426.87 +}
427.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/OldConfigurationMBeanAttributeInfo.java Sat Jan 26 03:07:46 2008 +0000
427.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
427.3 @@ -1,84 +0,0 @@
427.4 -/*
427.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
427.6 - *
427.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
427.8 - *
427.9 - * The contents of this file are subject to the terms of either the GNU
427.10 - * General Public License Version 2 only ("GPL") or the Common
427.11 - * Development and Distribution License("CDDL") (collectively, the
427.12 - * "License"). You may not use this file except in compliance with the
427.13 - * License. You can obtain a copy of the License at
427.14 - * http://www.netbeans.org/cddl-gplv2.html
427.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
427.16 - * specific language governing permissions and limitations under the
427.17 - * License. When distributing the software, include this License Header
427.18 - * Notice in each file and include the License file at
427.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
427.20 - * particular file as subject to the "Classpath" exception as provided
427.21 - * by Sun in the GPL Version 2 section of the License file that
427.22 - * accompanied this code. If applicable, add the following below the
427.23 - * License Header, with the fields enclosed by brackets [] replaced by
427.24 - * your own identifying information:
427.25 - * "Portions Copyrighted [year] [name of copyright owner]"
427.26 - *
427.27 - * Contributor(s):
427.28 - *
427.29 - * The Original Software is NetBeans. The Initial Developer of the Original
427.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
427.31 - * Microsystems, Inc. All Rights Reserved.
427.32 - *
427.33 - * If you wish your version of this file to be governed by only the CDDL
427.34 - * or only the GPL Version 2, indicate your decision by adding
427.35 - * "[Contributor] elects to include this software in this distribution
427.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
427.37 - * single choice of license, a recipient has the option to distribute
427.38 - * your version of this file under either the CDDL, the GPL Version 2 or
427.39 - * to extend the choice of license to its licensees as provided above.
427.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
427.41 - * Version 2 license, then the option applies only if the new code is
427.42 - * made subject to such option by the copyright holder.
427.43 - */
427.44 -package org.netbeans.modules.sun.manager.jbi.management;
427.45 -
427.46 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
427.47 -import javax.management.MBeanAttributeInfo;
427.48 -
427.49 -/**
427.50 - * @deprecated to be removed
427.51 - * @author jqian
427.52 - */
427.53 -public class OldConfigurationMBeanAttributeInfo extends MBeanAttributeInfo {
427.54 -
427.55 - private OldJBIComponentConfigurationDescriptor descriptor;
427.56 -
427.57 - public OldConfigurationMBeanAttributeInfo(OldJBIComponentConfigurationDescriptor descriptor,
427.58 - String type,
427.59 - boolean isReadable,
427.60 - boolean isWritable,
427.61 - boolean isIs) {
427.62 - super(descriptor.getDisplayName(), type, descriptor.getDescription(),
427.63 - isReadable, isWritable, isIs);
427.64 -
427.65 - this.descriptor = descriptor;
427.66 - }
427.67 -
427.68 - public OldJBIComponentConfigurationDescriptor getDescriptor() {
427.69 - return descriptor;
427.70 - }
427.71 -
427.72 - public boolean isPassword() {
427.73 - return descriptor.isPassword();
427.74 - }
427.75 -
427.76 - public boolean isApplicationRestartRequired() {
427.77 - return descriptor.needsApplicationRestart();
427.78 - }
427.79 -
427.80 - public boolean isComponentRestartRequired() {
427.81 - return descriptor.needsComponentRestart();
427.82 - }
427.83 -
427.84 - public boolean isServerRestartRequired() {
427.85 - return descriptor.needsServerRestart();
427.86 - }
427.87 -}
428.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
428.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/ComponentActionDescriptor.java Sat Jan 26 05:58:37 2008 +0000
428.3 @@ -0,0 +1,300 @@
428.4 +/*
428.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
428.6 + *
428.7 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
428.8 + *
428.9 + * The contents of this file are subject to the terms of either the GNU
428.10 + * General Public License Version 2 only ("GPL") or the Common
428.11 + * Development and Distribution License("CDDL") (collectively, the
428.12 + * "License"). You may not use this file except in compliance with the
428.13 + * License. You can obtain a copy of the License at
428.14 + * http://www.netbeans.org/cddl-gplv2.html
428.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
428.16 + * specific language governing permissions and limitations under the
428.17 + * License. When distributing the software, include this License Header
428.18 + * Notice in each file and include the License file at
428.19 + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
428.20 + * particular file as subject to the "Classpath" exception as provided
428.21 + * by Sun in the GPL Version 2 section of the License file that
428.22 + * accompanied this code. If applicable, add the following below the
428.23 + * License Header, with the fields enclosed by brackets [] replaced by
428.24 + * your own identifying information:
428.25 + * "Portions Copyrighted [year] [name of copyright owner]"
428.26 + *
428.27 + * Contributor(s):
428.28 + *
428.29 + * The Original Software is NetBeans. The Initial Developer of the Original
428.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
428.31 + * Microsystems, Inc. All Rights Reserved.
428.32 + *
428.33 + * If you wish your version of this file to be governed by only the CDDL
428.34 + * or only the GPL Version 2, indicate your decision by adding
428.35 + * "[Contributor] elects to include this software in this distribution
428.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
428.37 + * single choice of license, a recipient has the option to distribute
428.38 + * your version of this file under either the CDDL, the GPL Version 2 or
428.39 + * to extend the choice of license to its licensees as provided above.
428.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
428.41 + * Version 2 license, then the option applies only if the new code is
428.42 + * made subject to such option by the copyright holder.
428.43 + */
428.44 +package org.netbeans.modules.sun.manager.jbi.management.model;
428.45 +
428.46 +import java.io.IOException;
428.47 +import java.io.StringReader;
428.48 +import java.util.LinkedList;
428.49 +import java.util.List;
428.50 +import javax.xml.parsers.DocumentBuilder;
428.51 +import javax.xml.parsers.DocumentBuilderFactory;
428.52 +import javax.xml.parsers.ParserConfigurationException;
428.53 +import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationAction;
428.54 +import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationGroupAction;
428.55 +import org.netbeans.modules.sun.manager.jbi.util.Utils;
428.56 +import org.openide.DialogDisplayer;
428.57 +import org.openide.NotifyDescriptor;
428.58 +import org.w3c.dom.Document;
428.59 +import org.w3c.dom.Element;
428.60 +import org.w3c.dom.Node;
428.61 +import org.w3c.dom.NodeList;
428.62 +import org.xml.sax.InputSource;
428.63 +import org.xml.sax.SAXException;
428.64 +
428.65 +/**
428.66 + * JBI Component action descriptor.
428.67 + *
428.68 + * @author jqian
428.69 + */
428.70 +public class ComponentActionDescriptor {
428.71 +
428.72 + private static final String ACTION_NAMESPACE = "http://sun.com/jbi/components/ActionableMBeans";
428.73 + private static final String ACTION = "Action"; // NOI18N
428.74 + private static final String DISPLAY_NAME = "DisplayName"; // NOI18N
428.75 + private static final String DESCRIPTION = "Description"; // NOI18N
428.76 + private static final String MBEAN_KEY = "MBeanKey"; // NOI18N
428.77 + private static final String OPERATION_NAME = "OperationName"; // NOI18N
428.78 + private static final String ENABLED = "Enabled"; // NOI18N
428.79 + private static final String IS_GROUP = "isGroup"; // NOI18N
428.80 +
428.81 + private String mBeanKey;
428.82 + private String displayName;
428.83 + private String description;
428.84 + private String operationName;
428.85 + private boolean enabled;
428.86 + private boolean isGroup;
428.87 + private List<ComponentActionDescriptor> children;
428.88 +
428.89 + /**
428.90 + * Creates a new group action descriptor.
428.91 + */
428.92 + private ComponentActionDescriptor(String displayName,
428.93 + String description) {
428.94 + this.displayName = displayName;
428.95 + this.description = description;
428.96 + isGroup = true;
428.97 + }
428.98 +
428.99 + /**
428.100 + * Creates a new leaf action descriptor.
428.101 + */
428.102 + private ComponentActionDescriptor(
428.103 + String displayName,
428.104 + String description,
428.105 + String mBeanKey,
428.106 + String operationName,
428.107 + boolean enabled) {
428.108 + this.displayName = displayName;
428.109 + this.description = description;
428.110 + this.mBeanKey = mBeanKey;
428.111 + this.operationName = operationName;
428.112 + this.enabled = enabled;
428.113 + isGroup = false;
428.114 + }
428.115 +
428.116 + public String getDisplayName() {
428.117 + return displayName;
428.118 + }
428.119 +
428.120 + public String getMBeanKey() {
428.121 + return mBeanKey;
428.122 + }
428.123 +
428.124 + public String getOperationName() {
428.125 + return operationName;
428.126 + }
428.127 +
428.128 + public boolean isEnabled() {
428.129 + return enabled;
428.130 + }
428.131 +
428.132 + public String getDescription() {
428.133 + return Utils.getTooltip(description);
428.134 + }
428.135 +
428.136 + public boolean isGroup() {
428.137 + return isGroup;
428.138 + }
428.139 +
428.140 + public void addChild(ComponentActionDescriptor descriptor) {
428.141 + if (children == null) {
428.142 + children = new LinkedList<ComponentActionDescriptor>();
428.143 + }
428.144 + children.add(descriptor);
428.145 + }
428.146 +
428.147 + public List<ComponentActionDescriptor> getChildren() {
428.148 + return children;
428.149 + }
428.150 +
428.151 + /**
428.152 + * Gets a list of node actions from the action XML.
428.153 + *
428.154 + * @param actionXML xml describing the component-specific actions
428.155 + *
428.156 + * @return a list of node actions
428.157 + */
428.158 + public static List<MBeanOperationAction> getActions(String actionXML) {
428.159 +
428.160 + ComponentActionDescriptor actionDescriptor = null;
428.161 +
428.162 + try {
428.163 + actionDescriptor = parse(actionXML);
428.164 + } catch (Exception e) {
428.165 + NotifyDescriptor d = new NotifyDescriptor.Message(
428.166 + e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
428.167 + DialogDisplayer.getDefault().notify(d);
428.168 + }
428.169 +
428.170 + // The root group action is a dummy one.
428.171 + MBeanOperationGroupAction dummyRootAction =
428.172 + (MBeanOperationGroupAction) getAction(actionDescriptor);
428.173 +
428.174 + return dummyRootAction.getActions();
428.175 + }
428.176 +
428.177 + private static MBeanOperationAction getAction(
428.178 + ComponentActionDescriptor actionDescriptor) {
428.179 +
428.180 + MBeanOperationAction action = null;
428.181 +
428.182 + if (actionDescriptor != null) {
428.183 + String displayName = actionDescriptor.getDisplayName();
428.184 + String description = actionDescriptor.getDescription();
428.185 +
428.186 + if (actionDescriptor.isGroup()) {
428.187 + MBeanOperationGroupAction groupAction =
428.188 + new MBeanOperationGroupAction(displayName, description);
428.189 + for (ComponentActionDescriptor childDescriptor : actionDescriptor.getChildren()) {
428.190 + MBeanOperationAction childAction = getAction(childDescriptor);
428.191 + groupAction.addAction(childAction);
428.192 + }
428.193 + action = groupAction;
428.194 + } else {
428.195 + String mBeanKey = actionDescriptor.getMBeanKey();
428.196 + String operationName = actionDescriptor.getOperationName();
428.197 + boolean isEnabled = actionDescriptor.isEnabled();
428.198 +
428.199 + action = new MBeanOperationAction(
428.200 + mBeanKey, operationName,
428.201 + displayName, description, isEnabled);
428.202 + }
428.203 + }
428.204 +
428.205 + return action;
428.206 + }
428.207 +
428.208 + /**
428.209 + * Parses the component action xml data.
428.210 + *
428.211 + * @return the top level action descriptor
428.212 + *
428.213 + * @throws javax.xml.parsers.ParserConfigurationException
428.214 + * @throws java.io.IOException
428.215 + * @throws org.xml.sax.SAXException
428.216 + */
428.217 + private static ComponentActionDescriptor parse(String actionXmlData)
428.218 + throws ParserConfigurationException, IOException, SAXException {
428.219 +
428.220 + if (actionXmlData == null) {
428.221 + return null;
428.222 + }
428.223 +
428.224 + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
428.225 + factory.setNamespaceAware(true);
428.226 + DocumentBuilder builder = factory.newDocumentBuilder();
428.227 + Document document = builder.parse(
428.228 + new InputSource(new StringReader(actionXmlData)));
428.229 +
428.230 + ComponentActionDescriptor dummyRootDescriptor =
428.231 + new ComponentActionDescriptor("", ""); // NOI18N
428.232 +
428.233 + Element root = document.getDocumentElement();
428.234 + NodeList children = root.getChildNodes();
428.235 +
428.236 + for (int i = 0; i < children.getLength(); i++) {
428.237 + Node child = children.item(i);
428.238 + if (child instanceof Element &&
428.239 + ((Element) child).getNamespaceURI().equals(ACTION_NAMESPACE) &&
428.240 + ((Element) child).getLocalName().equals(ACTION)) {
428.241 + dummyRootDescriptor.addChild(parseActionElement((Element) child));
428.242 + }
428.243 + }
428.244 +
428.245 + return dummyRootDescriptor;
428.246 + }
428.247 +
428.248 + private static ComponentActionDescriptor parseActionElement(
428.249 + Element actionElement) {
428.250 +
428.251 + ComponentActionDescriptor childDescriptor;
428.252 +
428.253 + String displayName =
428.254 + actionElement.getElementsByTagNameNS(
428.255 + ACTION_NAMESPACE, DISPLAY_NAME).
428.256 + item(0).getTextContent();
428.257 + String description =
428.258 + actionElement.getElementsByTagNameNS(
428.259 + ACTION_NAMESPACE, DESCRIPTION).
428.260 + item(0).getTextContent();
428.261 +
428.262 + String isGroup = actionElement.getAttribute(IS_GROUP);
428.263 + if (isGroup != null && isGroup.length() > 0 &&
428.264 + Boolean.parseBoolean(isGroup)) {
428.265 + childDescriptor =
428.266 + new ComponentActionDescriptor(displayName, description);
428.267 +
428.268 + NodeList children = actionElement.getChildNodes();
428.269 + for (int i = 0; i < children.getLength(); i++) {
428.270 + Node child = children.item(i);
428.271 + if (child instanceof Element &&
428.272 + ((Element) child).getNamespaceURI().equals(ACTION_NAMESPACE) &&
428.273 + ((Element) child).getLocalName().equals(ACTION)) {
428.274 + childDescriptor.addChild(parseActionElement((Element) child));
428.275 + }
428.276 + }
428.277 + } else {
428.278 + String mBeanKey =
428.279 + actionElement.getElementsByTagNameNS(
428.280 + ACTION_NAMESPACE, MBEAN_KEY).
428.281 + item(0).getTextContent();
428.282 + String operationName =
428.283 + actionElement.getElementsByTagNameNS(
428.284 + ACTION_NAMESPACE, OPERATION_NAME).
428.285 + item(0).getTextContent();
428.286 +
428.287 + boolean enabled = false; // default value
428.288 + Element enabledElement = (Element) actionElement.getElementsByTagNameNS(
428.289 + ACTION_NAMESPACE, ENABLED).item(0);
428.290 + if (enabledElement != null) { // this element is optional
428.291 + enabled = Boolean.parseBoolean(
428.292 + enabledElement.getTextContent());
428.293 + }
428.294 +
428.295 + childDescriptor =
428.296 + new ComponentActionDescriptor(
428.297 + displayName, description,
428.298 + mBeanKey, operationName, enabled);
428.299 + }
428.300 +
428.301 + return childDescriptor;
428.302 + }
428.303 +}
429.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
429.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/ComponentConfigurationDescriptor.java Sat Jan 26 05:58:37 2008 +0000
429.3 @@ -0,0 +1,222 @@
429.4 +/*
429.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
429.6 + *
429.7 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
429.8 + *
429.9 + * The contents of this file are subject to the terms of either the GNU
429.10 + * General Public License Version 2 only ("GPL") or the Common
429.11 + * Development and Distribution License("CDDL") (collectively, the
429.12 + * "License"). You may not use this file except in compliance with the
429.13 + * License. You can obtain a copy of the License at
429.14 + * http://www.netbeans.org/cddl-gplv2.html
429.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
429.16 + * specific language governing permissions and limitations under the
429.17 + * License. When distributing the software, include this License Header
429.18 + * Notice in each file and include the License file at
429.19 + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
429.20 + * particular file as subject to the "Classpath" exception as provided
429.21 + * by Sun in the GPL Version 2 section of the License file that
429.22 + * accompanied this code. If applicable, add the following below the
429.23 + * License Header, with the fields enclosed by brackets [] replaced by
429.24 + * your own identifying information:
429.25 + * "Portions Copyrighted [year] [name of copyright owner]"
429.26 + *
429.27 + * Contributor(s):
429.28 + *
429.29 + * The Original Software is NetBeans. The Initial Developer of the Original
429.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
429.31 + * Microsystems, Inc. All Rights Reserved.
429.32 + *
429.33 + * If you wish your version of this file to be governed by only the CDDL
429.34 + * or only the GPL Version 2, indicate your decision by adding
429.35 + * "[Contributor] elects to include this software in this distribution
429.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
429.37 + * single choice of license, a recipient has the option to distribute
429.38 + * your version of this file under either the CDDL, the GPL Version 2 or
429.39 + * to extend the choice of license to its licensees as provided above.
429.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
429.41 + * Version 2 license, then the option applies only if the new code is
429.42 + * made subject to such option by the copyright holder.
429.43 + */
429.44 +package org.netbeans.modules.sun.manager.jbi.management.model;
429.45 +
429.46 +import java.io.IOException;
429.47 +import java.io.StringReader;
429.48 +import java.util.HashSet;
429.49 +import java.util.LinkedHashMap;
429.50 +import java.util.Map;
429.51 +import java.util.Set;
429.52 +import javax.xml.parsers.DocumentBuilder;
429.53 +import javax.xml.parsers.DocumentBuilderFactory;
429.54 +import javax.xml.parsers.ParserConfigurationException;
429.55 +import org.netbeans.modules.sun.manager.jbi.util.Utils;
429.56 +import org.w3c.dom.Document;
429.57 +import org.w3c.dom.Element;
429.58 +import org.w3c.dom.NodeList;
429.59 +import org.xml.sax.InputSource;
429.60 +import org.xml.sax.SAXException;
429.61 +
429.62 +/**
429.63 + * JBI Component configuration property descriptor.
429.64 + *
429.65 + * @author jqian
429.66 + */
429.67 +public class ComponentConfigurationDescriptor {
429.68 +
429.69 + private static final String DISPLAY_NAME = "displayName"; // NOI18N
429.70 + private static final String DISPLAY_DESCRIPTION = "displayDescription"; // NOI18N
429.71 + private static final String IS_PASSWORD_FIELD = "isPasswordField"; // NOI18N
429.72 + private static final String NEEDS_APPLICATION_RESTART = "isApplicationRestartRequired"; // NOI18N
429.73 + private static final String NEEDS_COMPONENT_RESTART = "isComponentRestartRequired"; // NOI18N
429.74 + private static final String NEEDS_SERVER_RESTART = "isServerRestartRequired"; // NOI18N
429.75 + private static final String IS_REQUIRED_FIELD = "isRequiredField"; // NOI18N
429.76 +
429.77 + private String name;
429.78 + private String displayName;
429.79 + private String description;
429.80 + private boolean isPassword;
429.81 + private boolean needsApplicationRestart;
429.82 + private boolean needsComponentRestart;
429.83 + private boolean needsServerRestart;
429.84 + private boolean isRequired;
429.85 +
429.86 + private Map<String, ComponentConfigurationDescriptor> children;
429.87 +
429.88 + private ComponentConfigurationDescriptor() {
429.89 + }
429.90 +
429.91 + private ComponentConfigurationDescriptor(String name,
429.92 + String displayName,
429.93 + String description,
429.94 + boolean isPassword,
429.95 + boolean needsApplicationRestart,
429.96 + boolean needsComponentRestart,
429.97 + boolean needsServerRestart,
429.98 + boolean isRequired) {
429.99 + this.name = name;
429.100 + this.displayName = displayName;
429.101 + this.description = description;
429.102 + this.isPassword = isPassword;
429.103 + this.needsApplicationRestart = needsApplicationRestart;
429.104 + this.needsComponentRestart = needsComponentRestart;
429.105 + this.needsServerRestart = needsServerRestart;
429.106 + this.isRequired = isRequired;
429.107 + }
429.108 +
429.109 + public String getName() {
429.110 + return name;
429.111 + }
429.112 +
429.113 + public String getDisplayName() {
429.114 + return displayName;
429.115 + }
429.116 +
429.117 + public String getDescription() {
429.118 + return description; //Utils.getTooltip(description);
429.119 + }
429.120 +
429.121 + public boolean isPassword() {
429.122 + return isPassword;
429.123 + }
429.124 +
429.125 + public boolean needsApplicationRestart() {
429.126 + return needsApplicationRestart;
429.127 + }
429.128 +
429.129 + public boolean needsComponentRestart() {
429.130 + return needsComponentRestart;
429.131 + }
429.132 +
429.133 + public boolean needsServerRestart() {
429.134 + return needsServerRestart;
429.135 + }
429.136 +
429.137 + public boolean isRequired() {
429.138 + return isRequired;
429.139 + }
429.140 +
429.141 + public void addChild(ComponentConfigurationDescriptor descriptor) {
429.142 + if (children == null) {
429.143 + children = new LinkedHashMap<String, ComponentConfigurationDescriptor>();
429.144 + }
429.145 + children.put(descriptor.getName(), descriptor);
429.146 + }
429.147 +
429.148 + public Set<String> getChildNames() {
429.149 + return children == null ? new HashSet<String>() : children.keySet();
429.150 + }
429.151 +
429.152 + public ComponentConfigurationDescriptor getChild(String name) {
429.153 + return children == null ? null : children.get(name);
429.154 + }
429.155 +
429.156 + /**
429.157 + * Parses the component config xml data.
429.158 + *
429.159 + * @return the top level configuration descriptor
429.160 + *
429.161 + * @throws javax.xml.parsers.ParserConfigurationException
429.162 + * @throws java.io.IOException
429.163 + * @throws org.xml.sax.SAXException
429.164 + */
429.165 + public static ComponentConfigurationDescriptor parse(String configXmlData)
429.166 + throws ParserConfigurationException, IOException, SAXException {
429.167 +
429.168 + if (configXmlData == null) {
429.169 + return null;
429.170 + }
429.171 +
429.172 + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
429.173 + factory.setNamespaceAware(true);
429.174 + DocumentBuilder builder = factory.newDocumentBuilder();
429.175 + Document document = builder.parse(
429.176 + new InputSource(new StringReader(configXmlData)));
429.177 +
429.178 + ComponentConfigurationDescriptor descriptor = new ComponentConfigurationDescriptor();
429.179 +
429.180 + parseConfigurationElement(descriptor, document.getDocumentElement());
429.181 +
429.182 + return descriptor;
429.183 + }
429.184 +
429.185 + private static void parseConfigurationElement(
429.186 + ComponentConfigurationDescriptor descriptor,
429.187 + Element element) {
429.188 +
429.189 + NodeList children = element.getChildNodes();
429.190 + for (int i = 0; i < children.getLength(); i++) {
429.191 + if (children.item(i) instanceof Element) {
429.192 + Element childElement = (Element) children.item(i);
429.193 +
429.194 + String isPassword = childElement.getAttribute(IS_PASSWORD_FIELD);
429.195 + String needsApplicationRestart =
429.196 + childElement.getAttribute(NEEDS_APPLICATION_RESTART);
429.197 + String needsComponentRestart =
429.198 + childElement.getAttribute(NEEDS_COMPONENT_RESTART);
429.199 + String needsServerRestart =
429.200 + childElement.getAttribute(NEEDS_SERVER_RESTART);
429.201 + String isRequired =
429.202 + childElement.getAttribute(IS_REQUIRED_FIELD);
429.203 +
429.204 + ComponentConfigurationDescriptor childDescriptor =
429.205 + new ComponentConfigurationDescriptor(
429.206 + childElement.getLocalName(),
429.207 + childElement.getAttribute(DISPLAY_NAME),
429.208 + childElement.getAttribute(DISPLAY_DESCRIPTION),
429.209 + isPassword != null &&
429.210 + Boolean.valueOf(isPassword),
429.211 + needsApplicationRestart != null &&
429.212 + Boolean.valueOf(needsApplicationRestart),
429.213 + needsComponentRestart != null &&
429.214 + Boolean.valueOf(needsComponentRestart),
429.215 + needsServerRestart != null &&
429.216 + Boolean.valueOf(needsServerRestart),
429.217 + isRequired != null &&
429.218 + Boolean.valueOf(isRequired));
429.219 + descriptor.addChild(childDescriptor);
429.220 +
429.221 + parseConfigurationElement(childDescriptor, childElement);
429.222 + }
429.223 + }
429.224 + }
429.225 +}
430.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentActionDescriptor.java Sat Jan 26 03:07:46 2008 +0000
430.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
430.3 @@ -1,300 +0,0 @@
430.4 -/*
430.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
430.6 - *
430.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
430.8 - *
430.9 - * The contents of this file are subject to the terms of either the GNU
430.10 - * General Public License Version 2 only ("GPL") or the Common
430.11 - * Development and Distribution License("CDDL") (collectively, the
430.12 - * "License"). You may not use this file except in compliance with the
430.13 - * License. You can obtain a copy of the License at
430.14 - * http://www.netbeans.org/cddl-gplv2.html
430.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
430.16 - * specific language governing permissions and limitations under the
430.17 - * License. When distributing the software, include this License Header
430.18 - * Notice in each file and include the License file at
430.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
430.20 - * particular file as subject to the "Classpath" exception as provided
430.21 - * by Sun in the GPL Version 2 section of the License file that
430.22 - * accompanied this code. If applicable, add the following below the
430.23 - * License Header, with the fields enclosed by brackets [] replaced by
430.24 - * your own identifying information:
430.25 - * "Portions Copyrighted [year] [name of copyright owner]"
430.26 - *
430.27 - * Contributor(s):
430.28 - *
430.29 - * The Original Software is NetBeans. The Initial Developer of the Original
430.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
430.31 - * Microsystems, Inc. All Rights Reserved.
430.32 - *
430.33 - * If you wish your version of this file to be governed by only the CDDL
430.34 - * or only the GPL Version 2, indicate your decision by adding
430.35 - * "[Contributor] elects to include this software in this distribution
430.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
430.37 - * single choice of license, a recipient has the option to distribute
430.38 - * your version of this file under either the CDDL, the GPL Version 2 or
430.39 - * to extend the choice of license to its licensees as provided above.
430.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
430.41 - * Version 2 license, then the option applies only if the new code is
430.42 - * made subject to such option by the copyright holder.
430.43 - */
430.44 -package org.netbeans.modules.sun.manager.jbi.management.model;
430.45 -
430.46 -import java.io.IOException;
430.47 -import java.io.StringReader;
430.48 -import java.util.LinkedList;
430.49 -import java.util.List;
430.50 -import javax.xml.parsers.DocumentBuilder;
430.51 -import javax.xml.parsers.DocumentBuilderFactory;
430.52 -import javax.xml.parsers.ParserConfigurationException;
430.53 -import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationAction;
430.54 -import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationGroupAction;
430.55 -import org.netbeans.modules.sun.manager.jbi.util.Utils;
430.56 -import org.openide.DialogDisplayer;
430.57 -import org.openide.NotifyDescriptor;
430.58 -import org.w3c.dom.Document;
430.59 -import org.w3c.dom.Element;
430.60 -import org.w3c.dom.Node;
430.61 -import org.w3c.dom.NodeList;
430.62 -import org.xml.sax.InputSource;
430.63 -import org.xml.sax.SAXException;
430.64 -
430.65 -/**
430.66 - * JBI Component action descriptor.
430.67 - *
430.68 - * @author jqian
430.69 - */
430.70 -public class JBIComponentActionDescriptor {
430.71 -
430.72 - private static final String ACTION_NAMESPACE = "http://sun.com/jbi/components/ActionableMBeans";
430.73 - private static final String ACTION = "Action"; // NOI18N
430.74 - private static final String DISPLAY_NAME = "DisplayName"; // NOI18N
430.75 - private static final String DESCRIPTION = "Description"; // NOI18N
430.76 - private static final String MBEAN_KEY = "MBeanKey"; // NOI18N
430.77 - private static final String OPERATION_NAME = "OperationName"; // NOI18N
430.78 - private static final String ENABLED = "Enabled"; // NOI18N
430.79 - private static final String IS_GROUP = "isGroup"; // NOI18N
430.80 -
430.81 - private String mBeanKey;
430.82 - private String displayName;
430.83 - private String description;
430.84 - private String operationName;
430.85 - private boolean enabled;
430.86 - private boolean isGroup;
430.87 - private List<JBIComponentActionDescriptor> children;
430.88 -
430.89 - /**
430.90 - * Creates a new group action descriptor.
430.91 - */
430.92 - private JBIComponentActionDescriptor(String displayName,
430.93 - String description) {
430.94 - this.displayName = displayName;
430.95 - this.description = description;
430.96 - isGroup = true;
430.97 - }
430.98 -
430.99 - /**
430.100 - * Creates a new leaf action descriptor.
430.101 - */
430.102 - private JBIComponentActionDescriptor(
430.103 - String displayName,
430.104 - String description,
430.105 - String mBeanKey,
430.106 - String operationName,
430.107 - boolean enabled) {
430.108 - this.displayName = displayName;
430.109 - this.description = description;
430.110 - this.mBeanKey = mBeanKey;
430.111 - this.operationName = operationName;
430.112 - this.enabled = enabled;
430.113 - isGroup = false;
430.114 - }
430.115 -
430.116 - public String getDisplayName() {
430.117 - return displayName;
430.118 - }
430.119 -
430.120 - public String getMBeanKey() {
430.121 - return mBeanKey;
430.122 - }
430.123 -
430.124 - public String getOperationName() {
430.125 - return operationName;
430.126 - }
430.127 -
430.128 - public boolean isEnabled() {
430.129 - return enabled;
430.130 - }
430.131 -
430.132 - public String getDescription() {
430.133 - return Utils.getTooltip(description);
430.134 - }
430.135 -
430.136 - public boolean isGroup() {
430.137 - return isGroup;
430.138 - }
430.139 -
430.140 - public void addChild(JBIComponentActionDescriptor descriptor) {
430.141 - if (children == null) {
430.142 - children = new LinkedList<JBIComponentActionDescriptor>();
430.143 - }
430.144 - children.add(descriptor);
430.145 - }
430.146 -
430.147 - public List<JBIComponentActionDescriptor> getChildren() {
430.148 - return children;
430.149 - }
430.150 -
430.151 - /**
430.152 - * Gets a list of node actions from the action XML.
430.153 - *
430.154 - * @param actionXML xml describing the component-specific actions
430.155 - *
430.156 - * @return a list of node actions
430.157 - */
430.158 - public static List<MBeanOperationAction> getActions(String actionXML) {
430.159 -
430.160 - JBIComponentActionDescriptor actionDescriptor = null;
430.161 -
430.162 - try {
430.163 - actionDescriptor = parse(actionXML);
430.164 - } catch (Exception e) {
430.165 - NotifyDescriptor d = new NotifyDescriptor.Message(
430.166 - e.getMessage(), NotifyDescriptor.ERROR_MESSAGE);
430.167 - DialogDisplayer.getDefault().notify(d);
430.168 - }
430.169 -
430.170 - // The root group action is a dummy one.
430.171 - MBeanOperationGroupAction dummyRootAction =
430.172 - (MBeanOperationGroupAction) getAction(actionDescriptor);
430.173 -
430.174 - return dummyRootAction.getActions();
430.175 - }
430.176 -
430.177 - private static MBeanOperationAction getAction(
430.178 - JBIComponentActionDescriptor actionDescriptor) {
430.179 -
430.180 - MBeanOperationAction action = null;
430.181 -
430.182 - if (actionDescriptor != null) {
430.183 - String displayName = actionDescriptor.getDisplayName();
430.184 - String description = actionDescriptor.getDescription();
430.185 -
430.186 - if (actionDescriptor.isGroup()) {
430.187 - MBeanOperationGroupAction groupAction =
430.188 - new MBeanOperationGroupAction(displayName, description);
430.189 - for (JBIComponentActionDescriptor childDescriptor : actionDescriptor.getChildren()) {
430.190 - MBeanOperationAction childAction = getAction(childDescriptor);
430.191 - groupAction.addAction(childAction);
430.192 - }
430.193 - action = groupAction;
430.194 - } else {
430.195 - String mBeanKey = actionDescriptor.getMBeanKey();
430.196 - String operationName = actionDescriptor.getOperationName();
430.197 - boolean isEnabled = actionDescriptor.isEnabled();
430.198 -
430.199 - action = new MBeanOperationAction(
430.200 - mBeanKey, operationName,
430.201 - displayName, description, isEnabled);
430.202 - }
430.203 - }
430.204 -
430.205 - return action;
430.206 - }
430.207 -
430.208 - /**
430.209 - * Parses the component action xml data.
430.210 - *
430.211 - * @return the top level action descriptor
430.212 - *
430.213 - * @throws javax.xml.parsers.ParserConfigurationException
430.214 - * @throws java.io.IOException
430.215 - * @throws org.xml.sax.SAXException
430.216 - */
430.217 - private static JBIComponentActionDescriptor parse(String actionXmlData)
430.218 - throws ParserConfigurationException, IOException, SAXException {
430.219 -
430.220 - if (actionXmlData == null) {
430.221 - return null;
430.222 - }
430.223 -
430.224 - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
430.225 - factory.setNamespaceAware(true);
430.226 - DocumentBuilder builder = factory.newDocumentBuilder();
430.227 - Document document = builder.parse(
430.228 - new InputSource(new StringReader(actionXmlData)));
430.229 -
430.230 - JBIComponentActionDescriptor dummyRootDescriptor =
430.231 - new JBIComponentActionDescriptor("", ""); // NOI18N
430.232 -
430.233 - Element root = document.getDocumentElement();
430.234 - NodeList children = root.getChildNodes();
430.235 -
430.236 - for (int i = 0; i < children.getLength(); i++) {
430.237 - Node child = children.item(i);
430.238 - if (child instanceof Element &&
430.239 - ((Element) child).getNamespaceURI().equals(ACTION_NAMESPACE) &&
430.240 - ((Element) child).getLocalName().equals(ACTION)) {
430.241 - dummyRootDescriptor.addChild(parseActionElement((Element) child));
430.242 - }
430.243 - }
430.244 -
430.245 - return dummyRootDescriptor;
430.246 - }
430.247 -
430.248 - private static JBIComponentActionDescriptor parseActionElement(
430.249 - Element actionElement) {
430.250 -
430.251 - JBIComponentActionDescriptor childDescriptor;
430.252 -
430.253 - String displayName =
430.254 - actionElement.getElementsByTagNameNS(
430.255 - ACTION_NAMESPACE, DISPLAY_NAME).
430.256 - item(0).getTextContent();
430.257 - String description =
430.258 - actionElement.getElementsByTagNameNS(
430.259 - ACTION_NAMESPACE, DESCRIPTION).
430.260 - item(0).getTextContent();
430.261 -
430.262 - String isGroup = actionElement.getAttribute(IS_GROUP);
430.263 - if (isGroup != null && isGroup.length() > 0 &&
430.264 - Boolean.parseBoolean(isGroup)) {
430.265 - childDescriptor =
430.266 - new JBIComponentActionDescriptor(displayName, description);
430.267 -
430.268 - NodeList children = actionElement.getChildNodes();
430.269 - for (int i = 0; i < children.getLength(); i++) {
430.270 - Node child = children.item(i);
430.271 - if (child instanceof Element &&
430.272 - ((Element) child).getNamespaceURI().equals(ACTION_NAMESPACE) &&
430.273 - ((Element) child).getLocalName().equals(ACTION)) {
430.274 - childDescriptor.addChild(parseActionElement((Element) child));
430.275 - }
430.276 - }
430.277 - } else {
430.278 - String mBeanKey =
430.279 - actionElement.getElementsByTagNameNS(
430.280 - ACTION_NAMESPACE, MBEAN_KEY).
430.281 - item(0).getTextContent();
430.282 - String operationName =
430.283 - actionElement.getElementsByTagNameNS(
430.284 - ACTION_NAMESPACE, OPERATION_NAME).
430.285 - item(0).getTextContent();
430.286 -
430.287 - boolean enabled = false; // default value
430.288 - Element enabledElement = (Element) actionElement.getElementsByTagNameNS(
430.289 - ACTION_NAMESPACE, ENABLED).item(0);
430.290 - if (enabledElement != null) { // this element is optional
430.291 - enabled = Boolean.parseBoolean(
430.292 - enabledElement.getTextContent());
430.293 - }
430.294 -
430.295 - childDescriptor =
430.296 - new JBIComponentActionDescriptor(
430.297 - displayName, description,
430.298 - mBeanKey, operationName, enabled);
430.299 - }
430.300 -
430.301 - return childDescriptor;
430.302 - }
430.303 -}
431.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentConfigurationDescriptor.java Sat Jan 26 03:07:46 2008 +0000
431.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
431.3 @@ -1,293 +0,0 @@
431.4 -/*
431.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
431.6 - *
431.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
431.8 - *
431.9 - * The contents of this file are subject to the terms of either the GNU
431.10 - * General Public License Version 2 only ("GPL") or the Common
431.11 - * Development and Distribution License("CDDL") (collectively, the
431.12 - * "License"). You may not use this file except in compliance with the
431.13 - * License. You can obtain a copy of the License at
431.14 - * http://www.netbeans.org/cddl-gplv2.html
431.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
431.16 - * specific language governing permissions and limitations under the
431.17 - * License. When distributing the software, include this License Header
431.18 - * Notice in each file and include the License file at
431.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
431.20 - * particular file as subject to the "Classpath" exception as provided
431.21 - * by Sun in the GPL Version 2 section of the License file that
431.22 - * accompanied this code. If applicable, add the following below the
431.23 - * License Header, with the fields enclosed by brackets [] replaced by
431.24 - * your own identifying information:
431.25 - * "Portions Copyrighted [year] [name of copyright owner]"
431.26 - *
431.27 - * Contributor(s):
431.28 - *
431.29 - * The Original Software is NetBeans. The Initial Developer of the Original
431.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
431.31 - * Microsystems, Inc. All Rights Reserved.
431.32 - *
431.33 - * If you wish your version of this file to be governed by only the CDDL
431.34 - * or only the GPL Version 2, indicate your decision by adding
431.35 - * "[Contributor] elects to include this software in this distribution
431.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
431.37 - * single choice of license, a recipient has the option to distribute
431.38 - * your version of this file under either the CDDL, the GPL Version 2 or
431.39 - * to extend the choice of license to its licensees as provided above.
431.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
431.41 - * Version 2 license, then the option applies only if the new code is
431.42 - * made subject to such option by the copyright holder.
431.43 - */
431.44 -package org.netbeans.modules.sun.manager.jbi.management.model;
431.45 -
431.46 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.JBIComponentConfigurationConstraint;
431.47 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.CompositeConstraint;
431.48 -import java.util.ArrayList;
431.49 -import java.util.Collection;
431.50 -import java.util.HashSet;
431.51 -import java.util.LinkedHashMap;
431.52 -import java.util.List;
431.53 -import java.util.Map;
431.54 -import java.util.Set;
431.55 -import javax.xml.namespace.QName;
431.56 -
431.57 -/**
431.58 - * JBI Component configuration property descriptor.
431.59 - *
431.60 - * This can represents a regular property, a property group (compound property),
431.61 - * application variable or application configuration.
431.62 - *
431.63 - * @author jqian
431.64 - */
431.65 -public class JBIComponentConfigurationDescriptor {
431.66 -
431.67 - // currently supported xsd types
431.68 - public static final QName XSD_INT =
431.69 - new QName("http://www.w3.org/2001/XMLSchema", "int"); // NOI18N
431.70 - public static final QName XSD_POSITIVE_INTEGER =
431.71 - new QName("http://www.w3.org/2001/XMLSchema", "positiveInteger"); // NOI18N
431.72 - public static final QName XSD_NEGATIVE_INTEGER =
431.73 - new QName("http://www.w3.org/2001/XMLSchema", "negativeInteger"); // NOI18N
431.74 - public static final QName XSD_NON_POSITIVE_INTEGER =
431.75 - new QName("http://www.w3.org/2001/XMLSchema", "nonPositiveInteger"); // NOI18N
431.76 - public static final QName XSD_NON_NEGATIVE_INTEGER =
431.77 - new QName("http://www.w3.org/2001/XMLSchema", "nonNegativeInteger"); // NOI18N
431.78 - public static final QName XSD_STRING =
431.79 - new QName("http://www.w3.org/2001/XMLSchema", "string"); // NOI18N
431.80 - public static final QName XSD_BOOLEAN =
431.81 - new QName("http://www.w3.org/2001/XMLSchema", "boolean"); // NOI18N
431.82 -
431.83 - private static final String SHOWDISPLAY_INSTALLATION = "install"; // NOI18N
431.84 - private static final String SHOWDISPLAY_RUNTIME = "runtime"; // NOI18N
431.85 - private static final String SHOWDISPLAY_ALL = "all"; // NOI18N
431.86 -
431.87 - private static final String PROPERTY = "Property"; // NOI18N
431.88 - private static final String PROPERTY_GROUP = "PropertyGroup"; // NOI18N
431.89 - private static final String APPLICATION_VARIABLE = "ApplicationVariable"; // NOI18N
431.90 - private static final String APPLICATION_CONFIGURATION = "ApplicationConfiguration"; // NOI18N
431.91 -
431.92 -
431.93 - private String name;
431.94 - private String displayName;
431.95 - private String description;
431.96 - private boolean encrypted = false;
431.97 - private boolean applicationRestartRequired;
431.98 - private boolean componentRestartRequired;
431.99 - private boolean serverRestartRequired;
431.100 - private boolean required = false;
431.101 - private String showDisplay = SHOWDISPLAY_RUNTIME;
431.102 - private String onChangeMessage;
431.103 - private QName typeQName;
431.104 - private String defaultValue;
431.105 - private String propertyType;
431.106 - private JBIComponentConfigurationConstraint constraint;
431.107 - private Map<String, JBIComponentConfigurationDescriptor> children;
431.108 -
431.109 - public JBIComponentConfigurationDescriptor() {
431.110 - }
431.111 -
431.112 - public String getName() {
431.113 - return name;
431.114 - }
431.115 -
431.116 - public String getDefaultValue() {
431.117 - return defaultValue;
431.118 - }
431.119 -
431.120 - public QName getTypeQName() {
431.121 - return typeQName;
431.122 - }
431.123 -
431.124 - public String getDisplayName() {
431.125 - if (isApplicationVariable()) {
431.126 - return "Application Variables";
431.127 - } else if (isApplicationConfiguration()) {
431.128 - return "Application Configuration";
431.129 - } else {
431.130 - return displayName;
431.131 - }
431.132 - }
431.133 -
431.134 - public String getDescription() {
431.135 - return description; //Utils.getTooltip(description);
431.136 - }
431.137 -
431.138 - /**
431.139 - * Gets all configuration constraints. Composite constraints are de-composed.
431.140 - * @return
431.141 - */
431.142 - public List<JBIComponentConfigurationConstraint> getConstraints() {
431.143 - List<JBIComponentConfigurationConstraint> ret =
431.144 - new ArrayList<JBIComponentConfigurationConstraint>();
431.145 -
431.146 - addConstraint(ret, constraint);
431.147 -
431.148 - return ret;
431.149 - }
431.150 -
431.151 - private void addConstraint(List<JBIComponentConfigurationConstraint> list,
431.152 - JBIComponentConfigurationConstraint constraint) {
431.153 - if (constraint instanceof CompositeConstraint) {
431.154 - for (JBIComponentConfigurationConstraint childConstraint :
431.155 - ((CompositeConstraint)constraint).getConstraints()) {
431.156 - addConstraint(list, childConstraint);
431.157 - }
431.158 - } else {
431.159 - list.add(constraint);
431.160 - }
431.161 - }
431.162 -
431.163 - public boolean showDisplayAtInstallation() {
431.164 - return SHOWDISPLAY_INSTALLATION.equals(showDisplay) ||
431.165 - SHOWDISPLAY_ALL.equals(showDisplay);
431.166 - }
431.167 -
431.168 - public boolean showDisplayAtRuntime() {
431.169 - return SHOWDISPLAY_RUNTIME.equals(showDisplay) ||
431.170 - SHOWDISPLAY_ALL.equals(showDisplay);
431.171 - }
431.172 -
431.173 - public String getOnChangeMessage() {
431.174 - return onChangeMessage;
431.175 - }
431.176 -
431.177 - public boolean isEncrypted() {
431.178 - return encrypted;
431.179 - }
431.180 -
431.181 - public boolean isApplicationRestartRequired() {
431.182 - return applicationRestartRequired;
431.183 - }
431.184 -
431.185 - public boolean isComponentRestartRequired() {
431.186 - return componentRestartRequired;
431.187 - }
431.188 -
431.189 - public boolean isServerRestartRequired() {
431.190 - return serverRestartRequired;
431.191 - }
431.192 -
431.193 - public boolean isRequired() {
431.194 - return required;
431.195 - }
431.196 -
431.197 - public boolean isApplicationVariable() {
431.198 - return APPLICATION_VARIABLE.equals(propertyType);
431.199 - }
431.200 -
431.201 - public boolean isApplicationConfiguration() {
431.202 - return APPLICATION_CONFIGURATION.equals(propertyType);
431.203 - }
431.204 -
431.205 - public boolean isProperty() {
431.206 - return PROPERTY.equals(propertyType);
431.207 - }
431.208 -
431.209 - public boolean isPropertyGroup() {
431.210 - return PROPERTY_GROUP.equals(propertyType);
431.211 - }
431.212 -
431.213 - public void addChild(JBIComponentConfigurationDescriptor descriptor) {
431.214 - if (children == null) {
431.215 - children = new LinkedHashMap<String, JBIComponentConfigurationDescriptor>();
431.216 - }
431.217 - children.put(descriptor.getName(), descriptor);
431.218 - }
431.219 -
431.220 - public Set<String> getChildNames() {
431.221 - return children == null ? new HashSet<String>() : children.keySet();
431.222 - }
431.223 -
431.224 - public JBIComponentConfigurationDescriptor getChild(String name) {
431.225 - return children == null ? null : children.get(name);
431.226 - }
431.227 -
431.228 - public Collection<JBIComponentConfigurationDescriptor> getChildren(){
431.229 - return children.values();
431.230 - }
431.231 -
431.232 - public void setApplicationRestartRequired(boolean applicationRestartRequired) {
431.233 - this.applicationRestartRequired = applicationRestartRequired;
431.234 - }
431.235 -
431.236 - public void setComponentRestartRequired(boolean componentRestartRequired) {
431.237 - this.componentRestartRequired = componentRestartRequired;
431.238 - }
431.239 -
431.240 - public void setConstraint(JBIComponentConfigurationConstraint constraint) {
431.241 - this.constraint = constraint;
431.242 - }
431.243 -
431.244 - public void setDefaultValue(String defaultValue) {
431.245 - this.defaultValue = defaultValue;
431.246 - }
431.247 -
431.248 - public void setDescription(String description) {
431.249 - this.description = description;
431.250 - }
431.251 -
431.252 - public void setDisplayName(String displayName) {
431.253 - this.displayName = displayName;
431.254 - }
431.255 -
431.256 - public void setEncrypted(boolean encrypted) {
431.257 - this.encrypted = encrypted;
431.258 - }
431.259 -
431.260 - public void setName(String name) {
431.261 - this.name = name;
431.262 - }
431.263 -
431.264 - public void setOnChangeMessage(String onChangeMessage) {
431.265 - this.onChangeMessage = onChangeMessage;
431.266 - }
431.267 -
431.268 - /**
431.269 - * @param propertyType property type: PROPERTY, APPLICATION_VARIABLE or
431.270 - * APPLICATION_CONFIGURATION.
431.271 - */
431.272 - public void setPropertyType(String propertyType) {
431.273 - this.propertyType = propertyType;
431.274 - }
431.275 -
431.276 - public void setRequired(boolean required) {
431.277 - this.required = required;
431.278 - }
431.279 -
431.280 - public void setServerRestartRequired(boolean serverRestartRequired) {
431.281 - this.serverRestartRequired = serverRestartRequired;
431.282 - }
431.283 -
431.284 - public void setShowDisplay(String showDisplay) {
431.285 - this.showDisplay = showDisplay;
431.286 - }
431.287 -
431.288 - public void setTypeQName(QName typeQName) {
431.289 - this.typeQName = typeQName;
431.290 - }
431.291 -
431.292 - public String validate(Object value) {
431.293 - return constraint.validate(value);
431.294 - }
431.295 -
431.296 -}
431.297 \ No newline at end of file
432.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentConfigurationMBeanAttributeInfo.java Sat Jan 26 03:07:46 2008 +0000
432.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
432.3 @@ -1,84 +0,0 @@
432.4 -/*
432.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
432.6 - *
432.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
432.8 - *
432.9 - * The contents of this file are subject to the terms of either the GNU
432.10 - * General Public License Version 2 only ("GPL") or the Common
432.11 - * Development and Distribution License("CDDL") (collectively, the
432.12 - * "License"). You may not use this file except in compliance with the
432.13 - * License. You can obtain a copy of the License at
432.14 - * http://www.netbeans.org/cddl-gplv2.html
432.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
432.16 - * specific language governing permissions and limitations under the
432.17 - * License. When distributing the software, include this License Header
432.18 - * Notice in each file and include the License file at
432.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
432.20 - * particular file as subject to the "Classpath" exception as provided
432.21 - * by Sun in the GPL Version 2 section of the License file that
432.22 - * accompanied this code. If applicable, add the following below the
432.23 - * License Header, with the fields enclosed by brackets [] replaced by
432.24 - * your own identifying information:
432.25 - * "Portions Copyrighted [year] [name of copyright owner]"
432.26 - *
432.27 - * Contributor(s):
432.28 - *
432.29 - * The Original Software is NetBeans. The Initial Developer of the Original
432.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
432.31 - * Microsystems, Inc. All Rights Reserved.
432.32 - *
432.33 - * If you wish your version of this file to be governed by only the CDDL
432.34 - * or only the GPL Version 2, indicate your decision by adding
432.35 - * "[Contributor] elects to include this software in this distribution
432.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
432.37 - * single choice of license, a recipient has the option to distribute
432.38 - * your version of this file under either the CDDL, the GPL Version 2 or
432.39 - * to extend the choice of license to its licensees as provided above.
432.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
432.41 - * Version 2 license, then the option applies only if the new code is
432.42 - * made subject to such option by the copyright holder.
432.43 - */
432.44 -package org.netbeans.modules.sun.manager.jbi.management.model;
432.45 -
432.46 -import javax.management.MBeanAttributeInfo;
432.47 -
432.48 -/**
432.49 - * @author jqian
432.50 - */
432.51 -public class JBIComponentConfigurationMBeanAttributeInfo
432.52 - extends MBeanAttributeInfo {
432.53 -
432.54 - private JBIComponentConfigurationDescriptor descriptor;
432.55 -
432.56 - public JBIComponentConfigurationMBeanAttributeInfo(
432.57 - JBIComponentConfigurationDescriptor descriptor,
432.58 - String type,
432.59 - boolean isReadable,
432.60 - boolean isWritable,
432.61 - boolean isIs) {
432.62 - super(descriptor.getDisplayName(), type, descriptor.getDescription(),
432.63 - isReadable, isWritable, isIs);
432.64 -
432.65 - this.descriptor = descriptor;
432.66 - }
432.67 -
432.68 - public JBIComponentConfigurationDescriptor getDescriptor() {
432.69 - return descriptor;
432.70 - }
432.71 -
432.72 - public boolean isEncrypted() {
432.73 - return descriptor.isEncrypted();
432.74 - }
432.75 -
432.76 - public boolean isApplicationRestartRequired() {
432.77 - return descriptor.isApplicationRestartRequired();
432.78 - }
432.79 -
432.80 - public boolean isComponentRestartRequired() {
432.81 - return descriptor.isComponentRestartRequired();
432.82 - }
432.83 -
432.84 - public boolean isServerRestartRequired() {
432.85 - return descriptor.isServerRestartRequired();
432.86 - }
432.87 -}
433.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentConfigurationParser.java Sat Jan 26 03:07:46 2008 +0000
433.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
433.3 @@ -1,242 +0,0 @@
433.4 -/*
433.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
433.6 - *
433.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
433.8 - *
433.9 - * The contents of this file are subject to the terms of either the GNU
433.10 - * General Public License Version 2 only ("GPL") or the Common
433.11 - * Development and Distribution License("CDDL") (collectively, the
433.12 - * "License"). You may not use this file except in compliance with the
433.13 - * License. You can obtain a copy of the License at
433.14 - * http://www.netbeans.org/cddl-gplv2.html
433.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
433.16 - * specific language governing permissions and limitations under the
433.17 - * License. When distributing the software, include this License Header
433.18 - * Notice in each file and include the License file at
433.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
433.20 - * particular file as subject to the "Classpath" exception as provided
433.21 - * by Sun in the GPL Version 2 section of the License file that
433.22 - * accompanied this code. If applicable, add the following below the
433.23 - * License Header, with the fields enclosed by brackets [] replaced by
433.24 - * your own identifying information:
433.25 - * "Portions Copyrighted [year] [name of copyright owner]"
433.26 - *
433.27 - * If you wish your version of this file to be governed by only the CDDL
433.28 - * or only the GPL Version 2, indicate your decision by adding
433.29 - * "[Contributor] elects to include this software in this distribution
433.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
433.31 - * single choice of license, a recipient has the option to distribute
433.32 - * your version of this file under either the CDDL, the GPL Version 2 or
433.33 - * to extend the choice of license to its licensees as provided above.
433.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
433.35 - * Version 2 license, then the option applies only if the new code is
433.36 - * made subject to such option by the copyright holder.
433.37 - *
433.38 - * Contributor(s):
433.39 - *
433.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
433.41 - */
433.42 -package org.netbeans.modules.sun.manager.jbi.management.model;
433.43 -
433.44 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.JBIComponentConfigurationConstraint;
433.45 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.CompositeConstraint;
433.46 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.JBIComponentConfigurationConstraintFactory;
433.47 -import java.io.IOException;
433.48 -import java.io.StringReader;
433.49 -import java.util.ArrayList;
433.50 -import java.util.List;
433.51 -import javax.xml.namespace.QName;
433.52 -import javax.xml.parsers.DocumentBuilder;
433.53 -import javax.xml.parsers.DocumentBuilderFactory;
433.54 -import javax.xml.parsers.ParserConfigurationException;
433.55 -import org.netbeans.modules.sun.manager.jbi.util.XmlUtil;
433.56 -import org.w3c.dom.Document;
433.57 -import org.w3c.dom.Element;
433.58 -import org.w3c.dom.NodeList;
433.59 -import org.xml.sax.InputSource;
433.60 -import org.xml.sax.SAXException;
433.61 -
433.62 -/**
433.63 - * JBI Component configuration parser.
433.64 - *
433.65 - * @author jqian
433.66 - */
433.67 -public class JBIComponentConfigurationParser {
433.68 -
433.69 - private static final String CONFIGURATION_NAMESPACE = "http://www.sun.com/jbi/Configuration/V1.0"; // NOI18N
433.70 - // element names
433.71 - private static final String PROPERTY = "Property";
433.72 - private static final String PROPERTY_GROUP = "PropertyGroup";
433.73 - private static final String APPLICATION_CONFIGURATION = "ApplicationConfiguration";
433.74 - private static final String APPLICATION_VARIABLE = "ApplicationVariable";
433.75 - private static final String CONFIGURATION = "Configuration"; // NOI18N
433.76 - private static final String CONSTRAINT = "Constraint"; // NOI18N
433.77 - // attribute names
433.78 - private static final String NAME = "name"; // NOI18N
433.79 - private static final String DISPLAY_NAME = "displayName"; // NOI18N
433.80 - private static final String DISPLAY_DESCRIPTION = "displayDescription"; // NOI18N
433.81 - private static final String ENCRYPTED = "encrypted"; // NOI18N
433.82 - private static final String IS_APPLICATION_RESTART_REQUIRED = "isApplicationRestartRequired"; // NOI18N
433.83 - private static final String IS_COMPONENT_RESTART_REQUIRED = "isComponentRestartRequired"; // NOI18N
433.84 - private static final String IS_SERVER_RESTART_REQUIRED = "isServerRestartRequired"; // NOI18N
433.85 - private static final String REQUIRED = "required"; // NOI18N
433.86 - private static final String SHOW_DISPLAY = "showDisplay"; // NOI18N
433.87 - private static final String ON_CHANGE_MESSAGE = "onChangeMessage"; // NOI18N
433.88 - private static final String TYPE = "type"; // NOI18N
433.89 - private static final String DEFAULT_VALUE = "defaultValue"; // NOI18N
433.90 - private static final String FACET = "facet"; // NOI18N
433.91 - private static final String FACET_VALUE = "value"; // NOI18N
433.92 -
433.93 - /**
433.94 - * Parses component jbi.xml and gets the component configuration
433.95 - * meta data.
433.96 - *
433.97 - * @return the top level configuration descriptor
433.98 - *
433.99 - * @throws javax.xml.parsers.ParserConfigurationException
433.100 - * @throws java.io.IOException
433.101 - * @throws org.xml.sax.SAXException
433.102 - */
433.103 - public static JBIComponentConfigurationDescriptor parse(String configXmlData)
433.104 - throws ParserConfigurationException, IOException, SAXException {
433.105 -
433.106 - JBIComponentConfigurationDescriptor ret = null;
433.107 -
433.108 - if (configXmlData != null) {
433.109 - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
433.110 - factory.setNamespaceAware(true);
433.111 - DocumentBuilder builder = factory.newDocumentBuilder();
433.112 - Document jbiDoc = builder.parse(
433.113 - new InputSource(new StringReader(configXmlData)));
433.114 - ret = parse(jbiDoc);
433.115 - }
433.116 -
433.117 - return ret;
433.118 - }
433.119 -
433.120 - public static JBIComponentConfigurationDescriptor parse(Document jbiDoc)
433.121 - throws ParserConfigurationException, IOException, SAXException {
433.122 -
433.123 - JBIComponentConfigurationDescriptor ret = null;
433.124 -
433.125 - NodeList configNodeList = jbiDoc.getElementsByTagNameNS(
433.126 - CONFIGURATION_NAMESPACE, CONFIGURATION);
433.127 - if (configNodeList != null && configNodeList.getLength() == 1) {
433.128 - Element configRootElement = (Element) configNodeList.item(0);
433.129 - ret = new JBIComponentConfigurationDescriptor();
433.130 - parseConfigurationElement(ret, configRootElement);
433.131 - }
433.132 -
433.133 - return ret;
433.134 - }
433.135 -
433.136 - private static void parseConfigurationElement(
433.137 - JBIComponentConfigurationDescriptor descriptor,
433.138 - Element element) {
433.139 -
433.140 - NodeList children = element.getChildNodes();
433.141 - for (int i = 0; i < children.getLength(); i++) {
433.142 - if (children.item(i) instanceof Element) {
433.143 - Element childElement = (Element) children.item(i);
433.144 -
433.145 - String elementName = childElement.getLocalName();
433.146 - if (!elementName.equals(PROPERTY) &&
433.147 - !elementName.equals(PROPERTY_GROUP) &&
433.148 - !elementName.equals(APPLICATION_VARIABLE) &&
433.149 - !elementName.equals(APPLICATION_CONFIGURATION)) {
433.150 - continue;
433.151 - }
433.152 -
433.153 - JBIComponentConfigurationDescriptor childDescriptor =
433.154 - new JBIComponentConfigurationDescriptor();
433.155 -
433.156 - // The following are equired fields.
433.157 - childDescriptor.setName(childElement.getAttribute(NAME));
433.158 - childDescriptor.setDisplayName(childElement.getAttribute(DISPLAY_NAME));
433.159 - childDescriptor.setDescription(childElement.getAttribute(DISPLAY_DESCRIPTION));
433.160 - childDescriptor.setTypeQName(XmlUtil.getAttributeNSName(childElement, TYPE));
433.161 - childDescriptor.setPropertyType(elementName); // not really required, but mandatory
433.162 -
433.163 - // The following are not required.
433.164 - String required = childElement.getAttribute(REQUIRED);
433.165 - if (required.length() != 0) {
433.166 - childDescriptor.setRequired(Boolean.valueOf(required));
433.167 - }
433.168 - String showDisplay = childElement.getAttribute(SHOW_DISPLAY);
433.169 - if (showDisplay.length() != 0) {
433.170 - childDescriptor.setShowDisplay(showDisplay);
433.171 - }
433.172 - String encrypted = childElement.getAttribute(ENCRYPTED);
433.173 - if (encrypted.length() != 0) {
433.174 - childDescriptor.setEncrypted(Boolean.valueOf(encrypted));
433.175 - }
433.176 - String isApplicationRestartRequired =
433.177 - childElement.getAttribute(IS_APPLICATION_RESTART_REQUIRED);
433.178 - if (isApplicationRestartRequired.length() != 0) {
433.179 - childDescriptor.setApplicationRestartRequired(
433.180 - Boolean.valueOf(isApplicationRestartRequired));
433.181 - }
433.182 - String isComponentRestartRequired =
433.183 - childElement.getAttribute(IS_COMPONENT_RESTART_REQUIRED);
433.184 - if (isComponentRestartRequired.length() != 0) {
433.185 - childDescriptor.setComponentRestartRequired(
433.186 - Boolean.valueOf(isComponentRestartRequired));
433.187 - }
433.188 - String isServerRestartRequired =
433.189 - childElement.getAttribute(IS_SERVER_RESTART_REQUIRED);
433.190 - if (isServerRestartRequired.length() != 0) {
433.191 - childDescriptor.setServerRestartRequired(
433.192 - Boolean.valueOf(isServerRestartRequired));
433.193 - }
433.194 -
433.195 - String onChangeMessage = childElement.getAttribute(ON_CHANGE_MESSAGE);
433.196 - if (onChangeMessage.length() != 0) {
433.197 - childDescriptor.setOnChangeMessage(onChangeMessage);
433.198 - }
433.199 -
433.200 - String defaultValue = childElement.getAttribute(DEFAULT_VALUE);
433.201 - if (defaultValue.length() != 0) {
433.202 - childDescriptor.setDefaultValue(defaultValue);
433.203 - }
433.204 -
433.205 - CompositeConstraint compositeConstraint = new CompositeConstraint();
433.206 - List<String> enumerationOptions = null;
433.207 -
433.208 - NodeList constraintNodes = childElement.getElementsByTagNameNS(
433.209 - CONFIGURATION_NAMESPACE, CONSTRAINT);
433.210 -
433.211 - for (int j = 0; j < constraintNodes.getLength(); j++) {
433.212 - Element constraintElement = (Element) constraintNodes.item(j);
433.213 - String facet = constraintElement.getAttribute(FACET);
433.214 - String facetValue = constraintElement.getAttribute(FACET_VALUE);
433.215 - if (facet.equals(JBIComponentConfigurationConstraintFactory.ENUMERATION)) {
433.216 - if (enumerationOptions == null) {
433.217 - enumerationOptions = new ArrayList<String>();
433.218 - }
433.219 - enumerationOptions.add(facetValue);
433.220 - } else {
433.221 - JBIComponentConfigurationConstraint constraint =
433.222 - JBIComponentConfigurationConstraintFactory.newConstraint(
433.223 - facet, facetValue);
433.224 - compositeConstraint.addConstraint(constraint);
433.225 - }
433.226 - }
433.227 -
433.228 - if (enumerationOptions != null) {
433.229 - JBIComponentConfigurationConstraint constraint =
433.230 - JBIComponentConfigurationConstraintFactory.newConstraint(
433.231 - JBIComponentConfigurationConstraintFactory.ENUMERATION,
433.232 - enumerationOptions);
433.233 - compositeConstraint.addConstraint(constraint);
433.234 - }
433.235 -
433.236 - childDescriptor.setConstraint(compositeConstraint);
433.237 -
433.238 - descriptor.addChild(childDescriptor);
433.239 -
433.240 - parseConfigurationElement(childDescriptor, childElement);
433.241 - }
433.242 - }
433.243 - }
433.244 -}
433.245 -
434.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/management/model/OldJBIComponentConfigurationDescriptor.java Sat Jan 26 03:07:46 2008 +0000
434.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
434.3 @@ -1,223 +0,0 @@
434.4 -/*
434.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
434.6 - *
434.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
434.8 - *
434.9 - * The contents of this file are subject to the terms of either the GNU
434.10 - * General Public License Version 2 only ("GPL") or the Common
434.11 - * Development and Distribution License("CDDL") (collectively, the
434.12 - * "License"). You may not use this file except in compliance with the
434.13 - * License. You can obtain a copy of the License at
434.14 - * http://www.netbeans.org/cddl-gplv2.html
434.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
434.16 - * specific language governing permissions and limitations under the
434.17 - * License. When distributing the software, include this License Header
434.18 - * Notice in each file and include the License file at
434.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
434.20 - * particular file as subject to the "Classpath" exception as provided
434.21 - * by Sun in the GPL Version 2 section of the License file that
434.22 - * accompanied this code. If applicable, add the following below the
434.23 - * License Header, with the fields enclosed by brackets [] replaced by
434.24 - * your own identifying information:
434.25 - * "Portions Copyrighted [year] [name of copyright owner]"
434.26 - *
434.27 - * Contributor(s):
434.28 - *
434.29 - * The Original Software is NetBeans. The Initial Developer of the Original
434.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
434.31 - * Microsystems, Inc. All Rights Reserved.
434.32 - *
434.33 - * If you wish your version of this file to be governed by only the CDDL
434.34 - * or only the GPL Version 2, indicate your decision by adding
434.35 - * "[Contributor] elects to include this software in this distribution
434.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
434.37 - * single choice of license, a recipient has the option to distribute
434.38 - * your version of this file under either the CDDL, the GPL Version 2 or
434.39 - * to extend the choice of license to its licensees as provided above.
434.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
434.41 - * Version 2 license, then the option applies only if the new code is
434.42 - * made subject to such option by the copyright holder.
434.43 - */
434.44 -package org.netbeans.modules.sun.manager.jbi.management.model;
434.45 -
434.46 -import java.io.IOException;
434.47 -import java.io.StringReader;
434.48 -import java.util.HashSet;
434.49 -import java.util.LinkedHashMap;
434.50 -import java.util.Map;
434.51 -import java.util.Set;
434.52 -import javax.xml.parsers.DocumentBuilder;
434.53 -import javax.xml.parsers.DocumentBuilderFactory;
434.54 -import javax.xml.parsers.ParserConfigurationException;
434.55 -import org.netbeans.modules.sun.manager.jbi.util.Utils;
434.56 -import org.w3c.dom.Document;
434.57 -import org.w3c.dom.Element;
434.58 -import org.w3c.dom.NodeList;
434.59 -import org.xml.sax.InputSource;
434.60 -import org.xml.sax.SAXException;
434.61 -
434.62 -/**
434.63 - * JBI Component configuration property descriptor.
434.64 - *
434.65 - * @deprecated to be removed
434.66 - * @author jqian
434.67 - */
434.68 -public class OldJBIComponentConfigurationDescriptor {
434.69 -
434.70 - private static final String DISPLAY_NAME = "displayName"; // NOI18N
434.71 - private static final String DISPLAY_DESCRIPTION = "displayDescription"; // NOI18N
434.72 - private static final String IS_PASSWORD_FIELD = "isPasswordField"; // NOI18N
434.73 - private static final String NEEDS_APPLICATION_RESTART = "isApplicationRestartRequired"; // NOI18N
434.74 - private static final String NEEDS_COMPONENT_RESTART = "isComponentRestartRequired"; // NOI18N
434.75 - private static final String NEEDS_SERVER_RESTART = "isServerRestartRequired"; // NOI18N
434.76 - private static final String IS_REQUIRED_FIELD = "isRequiredField"; // NOI18N
434.77 -
434.78 - private String name;
434.79 - private String displayName;
434.80 - private String description;
434.81 - private boolean isPassword;
434.82 - private boolean needsApplicationRestart;
434.83 - private boolean needsComponentRestart;
434.84 - private boolean needsServerRestart;
434.85 - private boolean isRequired;
434.86 -
434.87 - private Map<String, OldJBIComponentConfigurationDescriptor> children;
434.88 -
434.89 - private OldJBIComponentConfigurationDescriptor() {
434.90 - }
434.91 -
434.92 - private OldJBIComponentConfigurationDescriptor(String name,
434.93 - String displayName,
434.94 - String description,
434.95 - boolean isPassword,
434.96 - boolean needsApplicationRestart,
434.97 - boolean needsComponentRestart,
434.98 - boolean needsServerRestart,
434.99 - boolean isRequired) {
434.100 - this.name = name;
434.101 - this.displayName = displayName;
434.102 - this.description = description;
434.103 - this.isPassword = isPassword;
434.104 - this.needsApplicationRestart = needsApplicationRestart;
434.105 - this.needsComponentRestart = needsComponentRestart;
434.106 - this.needsServerRestart = needsServerRestart;
434.107 - this.isRequired = isRequired;
434.108 - }
434.109 -
434.110 - public String getName() {
434.111 - return name;
434.112 - }
434.113 -
434.114 - public String getDisplayName() {
434.115 - return displayName;
434.116 - }
434.117 -
434.118 - public String getDescription() {
434.119 - return description; //Utils.getTooltip(description);
434.120 - }
434.121 -
434.122 - public boolean isPassword() {
434.123 - return isPassword;
434.124 - }
434.125 -
434.126 - public boolean needsApplicationRestart() {
434.127 - return needsApplicationRestart;
434.128 - }
434.129 -
434.130 - public boolean needsComponentRestart() {
434.131 - return needsComponentRestart;
434.132 - }
434.133 -
434.134 - public boolean needsServerRestart() {
434.135 - return needsServerRestart;
434.136 - }
434.137 -
434.138 - public boolean isRequired() {
434.139 - return isRequired;
434.140 - }
434.141 -
434.142 - public void addChild(OldJBIComponentConfigurationDescriptor descriptor) {
434.143 - if (children == null) {
434.144 - children = new LinkedHashMap<String, OldJBIComponentConfigurationDescriptor>();
434.145 - }
434.146 - children.put(descriptor.getName(), descriptor);
434.147 - }
434.148 -
434.149 - public Set<String> getChildNames() {
434.150 - return children == null ? new HashSet<String>() : children.keySet();
434.151 - }
434.152 -
434.153 - public OldJBIComponentConfigurationDescriptor getChild(String name) {
434.154 - return children == null ? null : children.get(name);
434.155 - }
434.156 -
434.157 - /**
434.158 - * Parses the component config xml data.
434.159 - *
434.160 - * @return the top level configuration descriptor
434.161 - *
434.162 - * @throws javax.xml.parsers.ParserConfigurationException
434.163 - * @throws java.io.IOException
434.164 - * @throws org.xml.sax.SAXException
434.165 - */
434.166 - public static OldJBIComponentConfigurationDescriptor parse(String configXmlData)
434.167 - throws ParserConfigurationException, IOException, SAXException {
434.168 -
434.169 - if (configXmlData == null) {
434.170 - return null;
434.171 - }
434.172 -
434.173 - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
434.174 - factory.setNamespaceAware(true);
434.175 - DocumentBuilder builder = factory.newDocumentBuilder();
434.176 - Document document = builder.parse(
434.177 - new InputSource(new StringReader(configXmlData)));
434.178 -
434.179 - OldJBIComponentConfigurationDescriptor descriptor = new OldJBIComponentConfigurationDescriptor();
434.180 -
434.181 - parseConfigurationElement(descriptor, document.getDocumentElement());
434.182 -
434.183 - return descriptor;
434.184 - }
434.185 -
434.186 - private static void parseConfigurationElement(
434.187 - OldJBIComponentConfigurationDescriptor descriptor,
434.188 - Element element) {
434.189 -
434.190 - NodeList children = element.getChildNodes();
434.191 - for (int i = 0; i < children.getLength(); i++) {
434.192 - if (children.item(i) instanceof Element) {
434.193 - Element childElement = (Element) children.item(i);
434.194 -
434.195 - String isPassword = childElement.getAttribute(IS_PASSWORD_FIELD);
434.196 - String needsApplicationRestart =
434.197 - childElement.getAttribute(NEEDS_APPLICATION_RESTART);
434.198 - String needsComponentRestart =
434.199 - childElement.getAttribute(NEEDS_COMPONENT_RESTART);
434.200 - String needsServerRestart =
434.201 - childElement.getAttribute(NEEDS_SERVER_RESTART);
434.202 - String isRequired =
434.203 - childElement.getAttribute(IS_REQUIRED_FIELD);
434.204 -
434.205 - OldJBIComponentConfigurationDescriptor childDescriptor =
434.206 - new OldJBIComponentConfigurationDescriptor(
434.207 - childElement.getLocalName(),
434.208 - childElement.getAttribute(DISPLAY_NAME),
434.209 - childElement.getAttribute(DISPLAY_DESCRIPTION),
434.210 - isPassword != null &&
434.211 - Boolean.valueOf(isPassword),
434.212 - needsApplicationRestart != null &&
434.213 - Boolean.valueOf(needsApplicationRestart),
434.214 - needsComponentRestart != null &&
434.215 - Boolean.valueOf(needsComponentRestart),
434.216 - needsServerRestart != null &&
434.217 - Boolean.valueOf(needsServerRestart),
434.218 - isRequired != null &&
434.219 - Boolean.valueOf(isRequired));
434.220 - descriptor.addChild(childDescriptor);
434.221 -
434.222 - parseConfigurationElement(childDescriptor, childElement);
434.223 - }
434.224 - }
434.225 - }
434.226 -}
435.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/AppserverJBIMgmtNode.java Sat Jan 26 03:07:46 2008 +0000
435.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/AppserverJBIMgmtNode.java Sat Jan 26 05:58:37 2008 +0000
435.3 @@ -53,7 +53,6 @@
435.4 import org.netbeans.modules.sun.manager.jbi.management.AppserverJBIMgmtController;
435.5 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.RuntimeManagementServiceWrapper;
435.6 import org.netbeans.modules.sun.manager.jbi.nodes.property.JBIPropertySupportFactory;
435.7 -import org.netbeans.modules.sun.manager.jbi.nodes.property.PropertySheetOwner;
435.8 import org.openide.DialogDisplayer;
435.9 import org.openide.NotifyDescriptor;
435.10 import org.openide.nodes.AbstractNode;
435.11 @@ -67,8 +66,7 @@
435.12 *
435.13 * @author jqian
435.14 */
435.15 -public abstract class AppserverJBIMgmtNode extends AbstractNode
435.16 - implements PropertySheetOwner {
435.17 +public abstract class AppserverJBIMgmtNode extends AbstractNode {
435.18
435.19 protected static final String GENERAL_SHEET_SET_NAME = "GENERAL"; // NOI18N
435.20
435.21 @@ -266,18 +264,18 @@
435.22 return null;
435.23 }
435.24
435.25 -// /**
435.26 -// * Sets the property as an attribute to the underlying AMX mbeans. It
435.27 -// * usually will delegate to the controller object which is responsible for
435.28 -// * finding the correct AMX mbean objectname in order to execute a
435.29 -// * JMX setAttribute.
435.30 -// *
435.31 -// * @param attrName The name of the property to be set.
435.32 -// * @param value The value retrieved from the property sheet to be set in the
435.33 -// * backend.
435.34 -// * @returns the updated Attribute accessed from the Sheet.
435.35 -// */
435.36 -// public abstract Attribute setSheetProperty(String attrName, Object value);
435.37 + /**
435.38 + * Sets the property as an attribute to the underlying AMX mbeans. It
435.39 + * usually will delegate to the controller object which is responsible for
435.40 + * finding the correct AMX mbean objectname in order to execute a
435.41 + * JMX setAttribute.
435.42 + *
435.43 + * @param attrName The name of the property to be set.
435.44 + * @param value The value retrieved from the property sheet to be set in the
435.45 + * backend.
435.46 + * @returns the updated Attribute accessed from the Sheet.
435.47 + */
435.48 + public abstract Attribute setSheetProperty(String attrName, Object value);
435.49
435.50 /**
435.51 * Returns the logger for all nodes.
436.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties Sat Jan 26 03:07:46 2008 +0000
436.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties Sat Jan 26 05:58:37 2008 +0000
436.3 @@ -124,8 +124,3 @@
436.4
436.5 LBL_SERVICE_UNIT_STATISTICS_PROPERTIES=Statistics
436.6 DSC_SERVICE_UNIT_STATISTICS_PROPERTIES=Statistics of this Service Unit
436.7 -JBIComponentInstallationConfigurationDialog.title=Installation Configuration for {0}
436.8 -JBIComponentInstallationConfigurationDialog.jLabel1.text=The following configurations are customizable at installation time:
436.9 -JBIComponentInstallationConfigurationDialog.cancelButton.text=Cancel
436.10 -JBIComponentInstallationConfigurationDialog.restoreDefaultButton.text=Restore Default
436.11 -JBIComponentInstallationConfigurationDialog.installButton.text=Install
437.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBIComponentContainerNode.java Sat Jan 26 03:07:46 2008 +0000
437.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBIComponentContainerNode.java Sat Jan 26 05:58:37 2008 +0000
437.3 @@ -41,25 +41,15 @@
437.4 package org.netbeans.modules.sun.manager.jbi.nodes;
437.5
437.6 import com.sun.esb.management.api.installation.InstallationService;
437.7 +import com.sun.esb.management.api.runtime.RuntimeManagementService;
437.8 import com.sun.esb.management.common.ManagementRemoteException;
437.9 -import java.awt.Frame;
437.10 -import java.io.IOException;
437.11 import org.netbeans.modules.sun.manager.jbi.management.JBIComponentType;
437.12 import java.awt.Image;
437.13 -import java.io.BufferedReader;
437.14 import java.io.File;
437.15 -import java.io.FileReader;
437.16 -import java.io.InputStream;
437.17 -import java.io.InputStreamReader;
437.18 -import java.io.StringReader;
437.19 import java.util.ArrayList;
437.20 import java.util.List;
437.21 import java.util.Map;
437.22 -import java.util.Properties;
437.23 import java.util.ResourceBundle;
437.24 -import java.util.jar.JarFile;
437.25 -import java.util.logging.Logger;
437.26 -import java.util.zip.ZipEntry;
437.27 import javax.management.Attribute;
437.28 import javax.management.MBeanAttributeInfo;
437.29 import javax.swing.Action;
437.30 @@ -74,37 +64,24 @@
437.31 import org.netbeans.modules.sun.manager.jbi.actions.InstallAction;
437.32 import org.netbeans.modules.sun.manager.jbi.actions.RefreshAction;
437.33 import org.netbeans.modules.sun.manager.jbi.management.AppserverJBIMgmtController;
437.34 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationDescriptor;
437.35 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationParser;
437.36 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.RuntimeManagementServiceWrapper;
437.37 import org.netbeans.modules.sun.manager.jbi.util.FileFilters;
437.38 import org.netbeans.modules.sun.manager.jbi.util.Utils;
437.39 import org.openide.DialogDisplayer;
437.40 import org.openide.NotifyDescriptor;
437.41 -import org.openide.util.Exceptions;
437.42 import org.openide.util.NbBundle;
437.43 import org.openide.util.actions.SystemAction;
437.44 import org.openide.util.HelpCtx;
437.45 -import org.openide.windows.WindowManager;
437.46 -import org.w3c.dom.Document;
437.47 -import org.w3c.dom.Element;
437.48 -import org.w3c.dom.NodeList;
437.49 -import org.xml.sax.InputSource;
437.50 -import org.xml.sax.SAXException;
437.51
437.52 /**
437.53 - * Container node for all the JBI Components (SE, BC, or Shared Library)
437.54 - * of the same type.
437.55 + * Container node for all JBI Components of the same type.
437.56 *
437.57 * @author jqian
437.58 */
437.59 -public abstract class JBIComponentContainerNode
437.60 - extends AppserverJBIMgmtContainerNode implements Installable {
437.61 +public abstract class JBIComponentContainerNode extends AppserverJBIMgmtContainerNode
437.62 + implements Installable {
437.63
437.64 private boolean busy;
437.65 -
437.66 - private static Logger logger = Logger.getLogger("org.netbeans.modules.sun.manager.jbi.node.JBIComponentContainerNode"); // NOI18N
437.67 -
437.68
437.69 public JBIComponentContainerNode(final AppserverJBIMgmtController controller,
437.70 NodeType type, String name) {
437.71 @@ -183,7 +160,6 @@
437.72 final ProgressUI progressUI = new ProgressUI(message, false);
437.73
437.74 SwingUtilities.invokeLater(new Runnable() {
437.75 -
437.76 public void run() {
437.77 setBusy(true);
437.78 progressUI.start();
437.79 @@ -194,41 +170,40 @@
437.80 final String jarFilePath = file.getAbsolutePath();
437.81
437.82 try {
437.83 - String result = installComponent(jarFilePath);
437.84 + String result = installJBIComponent(jarFilePath);
437.85 + assert result != null;
437.86
437.87 - if (result != null) {
437.88 - String lowerCaseResult = result.toLowerCase();
437.89 - if (!lowerCaseResult.contains("error") && // NOI18N
437.90 - !lowerCaseResult.contains("warning") && // NOI18N
437.91 - !lowerCaseResult.contains("exception") &&// NOI18N
437.92 - !lowerCaseResult.contains("info")) { // NOI18N
437.93 - if (start) {
437.94 - // Start component automatically only upon
437.95 - // successful installation.
437.96 - // The successful installation result is the
437.97 - // component ID.
437.98 - try {
437.99 - String componentID = result;
437.100 - RuntimeManagementServiceWrapper mgmtService =
437.101 - getRuntimeManagementServiceWrapper();
437.102 - result = mgmtService.startComponent(
437.103 - componentID, SERVER_TARGET);
437.104 + String lowerCaseResult = result.toLowerCase();
437.105 + if (!lowerCaseResult.contains("error") && // NOI18N
437.106 + !lowerCaseResult.contains("warning") && // NOI18N
437.107 + !lowerCaseResult.contains("exception") &&// NOI18N
437.108 + !lowerCaseResult.contains("info")) { // NOI18N
437.109 + if (start) {
437.110 + // Start component automatically only upon
437.111 + // successful installation.
437.112 + // The successful installation result is the
437.113 + // component ID.
437.114 + try {
437.115 + String componentID = result;
437.116 + RuntimeManagementServiceWrapper mgmtService =
437.117 + getRuntimeManagementServiceWrapper();
437.118 + result = mgmtService.startComponent(
437.119 + componentID, SERVER_TARGET);
437.120
437.121 - JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.122 - GenericConstants.START_COMPONENT_OPERATION_NAME,
437.123 - componentID, result);
437.124 - } catch (ManagementRemoteException e) {
437.125 - JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.126 - GenericConstants.START_COMPONENT_OPERATION_NAME,
437.127 - jarFilePath, e.getMessage());
437.128 - }
437.129 + JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.130 + GenericConstants.START_COMPONENT_OPERATION_NAME,
437.131 + componentID, result);
437.132 + } catch (ManagementRemoteException e) {
437.133 + JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.134 + GenericConstants.START_COMPONENT_OPERATION_NAME,
437.135 + jarFilePath, e.getMessage());
437.136 }
437.137 - } else {
437.138 - // Failed to install
437.139 - JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.140 - GenericConstants.INSTALL_COMPONENT_OPERATION_NAME,
437.141 - jarFilePath, result);
437.142 }
437.143 + } else {
437.144 + // Failed to install
437.145 + JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.146 + GenericConstants.INSTALL_COMPONENT_OPERATION_NAME,
437.147 + jarFilePath, result);
437.148 }
437.149 } catch (ManagementRemoteException e) {
437.150 JBIMBeanTaskResultHandler.showRemoteInvokationResult(
437.151 @@ -238,7 +213,6 @@
437.152 }
437.153
437.154 SwingUtilities.invokeLater(new Runnable() {
437.155 -
437.156 public void run() {
437.157 progressUI.finish();
437.158 setBusy(false);
437.159 @@ -314,16 +288,7 @@
437.160 return chooser;
437.161 }
437.162
437.163 - /**
437.164 - * Installs the given JBI Component or Shared Library.
437.165 - *
437.166 - * @param jarFilePath absolute path for the component jar file
437.167 - * @return the component ID if the installation is successful;
437.168 - * or the error string in XML if the installation is failed;
437.169 - * or <code>null</code> if the component installation is cancelled.
437.170 - * @throws com.sun.esb.management.common.ManagementRemoteException
437.171 - */
437.172 - protected abstract String installComponent(String jarFilePath)
437.173 + protected abstract String installJBIComponent(String jarFilePath)
437.174 throws ManagementRemoteException;
437.175
437.176 protected abstract String getFileChooserTitleLabel();
437.177 @@ -340,14 +305,15 @@
437.178
437.179 //==========================================================================
437.180 /**
437.181 - * Container node for all Service Engines or Binding Components.
437.182 + * Container node for all JBI Service Engines.
437.183 */
437.184 - static abstract class RealJBIComponentContainerNode
437.185 - extends JBIComponentContainerNode {
437.186 + public static class ServiceEngines extends JBIComponentContainerNode {
437.187
437.188 - RealJBIComponentContainerNode(final AppserverJBIMgmtController controller,
437.189 - NodeType type, String name) {
437.190 - super(controller, type, name);
437.191 + public ServiceEngines(final AppserverJBIMgmtController controller) {
437.192 + super(controller,
437.193 + NodeType.SERVICE_ENGINES,
437.194 + NbBundle.getMessage(JBIComponentContainerNode.class,
437.195 + "SERVICE_ENGINES")); // NOI18N
437.196 }
437.197
437.198 @Override
437.199 @@ -359,129 +325,12 @@
437.200 SystemAction.get(RefreshAction.class)
437.201 };
437.202 }
437.203 -
437.204 - protected String installComponent(String jarFilePath)
437.205 +
437.206 + protected String installJBIComponent(String jarFilePath)
437.207 throws ManagementRemoteException {
437.208 - Properties properties = new Properties();
437.209 -
437.210 - InstallationService installationService = getInstallationService();
437.211 -
437.212 - try {
437.213 - // Get jbi.xml from component jar file
437.214 - JarFile jarFile = new JarFile(jarFilePath);
437.215 - ZipEntry jbiEntry = jarFile.getEntry("META-INF/jbi.xml");
437.216 - InputStream is = jarFile.getInputStream(jbiEntry);
437.217 - String jbiXml = getContent(is);
437.218 -
437.219 - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
437.220 - factory.setNamespaceAware(true);
437.221 - DocumentBuilder builder = factory.newDocumentBuilder();
437.222 - Document jbiDoc = builder.parse(
437.223 - new InputSource(new StringReader(jbiXml)));
437.224 -
437.225 -// // TMP
437.226 -// File tmpJbiFile = new File("C:\\Temp\\sun-http-binding-jbi.xml");
437.227 -// jbiXml = getContent(tmpJbiFile);
437.228 -
437.229 - // Get configuration descriptor from jbi.xml
437.230 - final JBIComponentConfigurationDescriptor rootDescriptor =
437.231 - JBIComponentConfigurationParser.parse(jbiDoc);
437.232 - if (rootDescriptor != null) {
437.233 - String componentName = getComponentIDFromJbiDoc(jbiDoc);
437.234 -
437.235 - // Show installation configuration dialog.
437.236 - JBIComponentInstallationConfigurationDialog dialog =
437.237 - new JBIComponentInstallationConfigurationDialog(
437.238 - componentName, rootDescriptor);
437.239 - dialog.pack();
437.240 - dialog.setLocationRelativeTo(null);
437.241 - dialog.setVisible(true);
437.242 - if (dialog.isCancelled()) {
437.243 - return null;
437.244 - }
437.245 -
437.246 - properties = dialog.getProperties();
437.247 -
437.248 - logger.info("Install " + componentName + // NOI18N
437.249 - " with these properties:" + properties); // NOI18N
437.250 - }
437.251 - } catch (Exception ex) {
437.252 - logger.severe(ex.getMessage());
437.253 - }
437.254 -
437.255 - return installationService.installComponent(
437.256 - jarFilePath, properties, SERVER_TARGET);
437.257 - }
437.258 -
437.259 - private String getComponentIDFromJbiDoc(Document jbiDoc) {
437.260 - NodeList ns = jbiDoc.getElementsByTagName("component"); // NOI18N
437.261 - if (ns.getLength() > 0) {
437.262 - Element e = (Element) ns.item(0);
437.263 - NodeList ids = e.getElementsByTagName("identification"); // NOI18N
437.264 - if (ids.getLength() > 0) {
437.265 - Element id = (Element) ids.item(0);
437.266 - NodeList names = id.getElementsByTagName("name"); // NOI18N
437.267 - if (names.getLength() > 0) {
437.268 - Element n = (Element) names.item(0);
437.269 - return n.getFirstChild().getNodeValue();
437.270 - }
437.271 - }
437.272 - }
437.273 -
437.274 - return null;
437.275 - }
437.276 -
437.277 - private String getContent(InputStream is) {
437.278 - try {
437.279 - BufferedReader in = new BufferedReader(new InputStreamReader(is));
437.280 - StringBuffer buffer = new StringBuffer();
437.281 - String line;
437.282 - while ((line = in.readLine()) != null) {
437.283 - buffer.append(line);
437.284 - }
437.285 - return buffer.toString();
437.286 - } catch (IOException ex) {
437.287 - Exceptions.printStackTrace(ex);
437.288 - }
437.289 - return null;
437.290 - }
437.291 -
437.292 - private String getContent(File file) {
437.293 - String ret = "";
437.294 -
437.295 - BufferedReader is = null;
437.296 - try {
437.297 - is = new BufferedReader(new FileReader(file));
437.298 - String inputLine;
437.299 - while ((inputLine = is.readLine()) != null) {
437.300 - ret += inputLine;
437.301 - }
437.302 - } catch (IOException e) {
437.303 - System.out.println("IOException: " + e);
437.304 - } finally {
437.305 - if (is != null) {
437.306 - try {
437.307 - is.close();
437.308 - } catch (Exception e) {
437.309 - }
437.310 - }
437.311 - }
437.312 -
437.313 - return ret;
437.314 - }
437.315 - }
437.316 -
437.317 - /**
437.318 - * Container node for all JBI Service Engines.
437.319 - */
437.320 - static class ServiceEngines extends RealJBIComponentContainerNode {
437.321 -
437.322 - ServiceEngines(final AppserverJBIMgmtController controller) {
437.323 - super(controller,
437.324 - NodeType.SERVICE_ENGINES,
437.325 - NbBundle.getMessage(JBIComponentContainerNode.class,
437.326 - "SERVICE_ENGINES")); // NOI18N
437.327 - }
437.328 + InstallationService installationService = getInstallationService();
437.329 + return installationService.installComponent(jarFilePath, SERVER_TARGET);
437.330 + }
437.331
437.332 protected JBIArtifactValidator getValidator() {
437.333 return JBIArtifactValidator.getServiceEngineValidator(null);
437.334 @@ -516,15 +365,31 @@
437.335 /**
437.336 * Container node for all JBI Binding Components.
437.337 */
437.338 - static class BindingComponents extends RealJBIComponentContainerNode {
437.339 + public static class BindingComponents extends JBIComponentContainerNode {
437.340
437.341 - BindingComponents(final AppserverJBIMgmtController controller) {
437.342 + public BindingComponents(final AppserverJBIMgmtController controller) {
437.343 super(controller,
437.344 NodeType.BINDING_COMPONENTS,
437.345 NbBundle.getMessage(JBIComponentContainerNode.class,
437.346 "BINDING_COMPONENTS")); // NOI18N
437.347 }
437.348
437.349 + @Override
437.350 + public Action[] getActions(boolean flag) {
437.351 + return new SystemAction[]{
437.352 + SystemAction.get(InstallAction.InstallOnly.class),
437.353 + SystemAction.get(InstallAction.InstallAndStart.class),
437.354 + null,
437.355 + SystemAction.get(RefreshAction.class)
437.356 + };
437.357 + }
437.358 +
437.359 + protected String installJBIComponent(String jarFilePath)
437.360 + throws ManagementRemoteException {
437.361 + InstallationService installationService = getInstallationService();
437.362 + return installationService.installComponent(jarFilePath, SERVER_TARGET);
437.363 + }
437.364 +
437.365 protected JBIArtifactValidator getValidator() {
437.366 return JBIArtifactValidator.getBindingComponentValidator(null);
437.367 }
437.368 @@ -558,9 +423,9 @@
437.369 /**
437.370 * Container node for all JBI Shared Libraries.
437.371 */
437.372 - static class SharedLibraries extends JBIComponentContainerNode {
437.373 + public static class SharedLibraries extends JBIComponentContainerNode {
437.374
437.375 - SharedLibraries(final AppserverJBIMgmtController controller) {
437.376 + public SharedLibraries(final AppserverJBIMgmtController controller) {
437.377 super(controller,
437.378 NodeType.SHARED_LIBRARIES,
437.379 NbBundle.getMessage(JBIComponentContainerNode.class,
437.380 @@ -576,17 +441,17 @@
437.381 };
437.382 }
437.383
437.384 - protected String installComponent(
437.385 - String jarFilePath)
437.386 + protected String installJBIComponent(
437.387 + String jarFilePath)
437.388 throws ManagementRemoteException {
437.389 - InstallationService installationService = getInstallationService();
437.390 + InstallationService installationService = getInstallationService();
437.391 return installationService.installSharedLibrary(jarFilePath, SERVER_TARGET);
437.392 - }
437.393 -
437.394 + }
437.395 +
437.396 protected JBIArtifactValidator getValidator() {
437.397 return JBIArtifactValidator.getSharedLibraryValidator();
437.398 }
437.399 -
437.400 +
437.401 protected String getFileChooserTitleLabel() {
437.402 return "LBL_Install_Shared_Library_Chooser_Name"; // NOI18N
437.403 }
438.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBIComponentInstallationConfigurationDialog.form Sat Jan 26 03:07:46 2008 +0000
438.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
438.3 @@ -1,107 +0,0 @@
438.4 -<?xml version="1.0" encoding="UTF-8" ?>
438.5 -
438.6 -<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JDialogFormInfo">
438.7 - <Properties>
438.8 - <Property name="defaultCloseOperation" type="int" value="2"/>
438.9 - <Property name="title" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
438.10 - <ResourceString bundle="org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties" key="JBIComponentInstallationConfigurationDialog.title" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}", {arguments})">
438.11 - <Argument index="0" javacode="componentName"/>
438.12 - </ResourceString>
438.13 - </Property>
438.14 - </Properties>
438.15 - <SyntheticProperties>
438.16 - <SyntheticProperty name="formSizePolicy" type="int" value="1"/>
438.17 - </SyntheticProperties>
438.18 - <AuxValues>
438.19 - <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
438.20 - <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
438.21 - <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
438.22 - <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
438.23 - <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
438.24 - <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
438.25 - <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
438.26 - <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
438.27 - </AuxValues>
438.28 -
438.29 - <Layout>
438.30 - <DimensionLayout dim="0">
438.31 - <Group type="103" groupAlignment="0" attributes="0">
438.32 - <Group type="102" alignment="1" attributes="0">
438.33 - <EmptySpace max="-2" attributes="0"/>
438.34 - <Group type="103" groupAlignment="1" attributes="0">
438.35 - <Component id="jScrollPane1" alignment="0" pref="481" max="32767" attributes="0"/>
438.36 - <Component id="jLabel1" alignment="0" pref="481" max="32767" attributes="0"/>
438.37 - <Group type="102" alignment="1" attributes="0">
438.38 - <Component id="installButton" min="-2" max="-2" attributes="0"/>
438.39 - <EmptySpace max="-2" attributes="0"/>
438.40 - <Component id="restoreDefaultButton" min="-2" max="-2" attributes="0"/>
438.41 - <EmptySpace max="-2" attributes="0"/>
438.42 - <Component id="cancelButton" min="-2" max="-2" attributes="0"/>
438.43 - </Group>
438.44 - </Group>
438.45 - <EmptySpace max="-2" attributes="0"/>
438.46 - </Group>
438.47 - </Group>
438.48 - </DimensionLayout>
438.49 - <DimensionLayout dim="1">
438.50 - <Group type="103" groupAlignment="0" attributes="0">
438.51 - <Group type="102" alignment="0" attributes="0">
438.52 - <EmptySpace min="-2" pref="11" max="-2" attributes="0"/>
438.53 - <Component id="jLabel1" min="-2" pref="23" max="-2" attributes="0"/>
438.54 - <EmptySpace max="-2" attributes="0"/>
438.55 - <Component id="jScrollPane1" pref="217" max="32767" attributes="0"/>
438.56 - <EmptySpace type="unrelated" max="-2" attributes="0"/>
438.57 - <Group type="103" groupAlignment="3" attributes="0">
438.58 - <Component id="cancelButton" alignment="3" min="-2" max="-2" attributes="0"/>
438.59 - <Component id="restoreDefaultButton" alignment="3" min="-2" max="-2" attributes="0"/>
438.60 - <Component id="installButton" alignment="3" min="-2" max="-2" attributes="0"/>
438.61 - </Group>
438.62 - <EmptySpace min="-2" max="-2" attributes="0"/>
438.63 - </Group>
438.64 - </Group>
438.65 - </DimensionLayout>
438.66 - </Layout>
438.67 - <SubComponents>
438.68 - <Component class="javax.swing.JLabel" name="jLabel1">
438.69 - <Properties>
438.70 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
438.71 - <ResourceString bundle="org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties" key="JBIComponentInstallationConfigurationDialog.jLabel1.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
438.72 - </Property>
438.73 - </Properties>
438.74 - </Component>
438.75 - <Component class="javax.swing.JButton" name="installButton">
438.76 - <Properties>
438.77 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
438.78 - <ResourceString bundle="org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties" key="JBIComponentInstallationConfigurationDialog.installButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
438.79 - </Property>
438.80 - </Properties>
438.81 - <Events>
438.82 - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="installButtonActionPerformed"/>
438.83 - </Events>
438.84 - </Component>
438.85 - <Component class="javax.swing.JButton" name="restoreDefaultButton">
438.86 - <Properties>
438.87 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
438.88 - <ResourceString bundle="org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties" key="JBIComponentInstallationConfigurationDialog.restoreDefaultButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
438.89 - </Property>
438.90 - </Properties>
438.91 - <Events>
438.92 - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="restoreDefaultButtonActionPerformed"/>
438.93 - </Events>
438.94 - </Component>
438.95 - <Component class="javax.swing.JButton" name="cancelButton">
438.96 - <Properties>
438.97 - <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
438.98 - <ResourceString bundle="org/netbeans/modules/sun/manager/jbi/nodes/Bundle.properties" key="JBIComponentInstallationConfigurationDialog.cancelButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
438.99 - </Property>
438.100 - </Properties>
438.101 - <Events>
438.102 - <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="cancelButtonActionPerformed"/>
438.103 - </Events>
438.104 - </Component>
438.105 - <Container class="javax.swing.JScrollPane" name="jScrollPane1">
438.106 -
438.107 - <Layout class="org.netbeans.modules.form.compat2.layouts.support.JScrollPaneSupportLayout"/>
438.108 - </Container>
438.109 - </SubComponents>
438.110 -</Form>
439.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBIComponentInstallationConfigurationDialog.java Sat Jan 26 03:07:46 2008 +0000
439.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
439.3 @@ -1,302 +0,0 @@
439.4 -/*
439.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
439.6 - *
439.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
439.8 - *
439.9 - * The contents of this file are subject to the terms of either the GNU
439.10 - * General Public License Version 2 only ("GPL") or the Common
439.11 - * Development and Distribution License("CDDL") (collectively, the
439.12 - * "License"). You may not use this file except in compliance with the
439.13 - * License. You can obtain a copy of the License at
439.14 - * http://www.netbeans.org/cddl-gplv2.html
439.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
439.16 - * specific language governing permissions and limitations under the
439.17 - * License. When distributing the software, include this License Header
439.18 - * Notice in each file and include the License file at
439.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
439.20 - * particular file as subject to the "Classpath" exception as provided
439.21 - * by Sun in the GPL Version 2 section of the License file that
439.22 - * accompanied this code. If applicable, add the following below the
439.23 - * License Header, with the fields enclosed by brackets [] replaced by
439.24 - * your own identifying information:
439.25 - * "Portions Copyrighted [year] [name of copyright owner]"
439.26 - *
439.27 - * Contributor(s):
439.28 - *
439.29 - * The Original Software is NetBeans. The Initial Developer of the Original
439.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
439.31 - * Microsystems, Inc. All Rights Reserved.
439.32 - *
439.33 - * If you wish your version of this file to be governed by only the CDDL
439.34 - * or only the GPL Version 2, indicate your decision by adding
439.35 - * "[Contributor] elects to include this software in this distribution
439.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
439.37 - * single choice of license, a recipient has the option to distribute
439.38 - * your version of this file under either the CDDL, the GPL Version 2 or
439.39 - * to extend the choice of license to its licensees as provided above.
439.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
439.41 - * Version 2 license, then the option applies only if the new code is
439.42 - * made subject to such option by the copyright holder.
439.43 - */
439.44 -package org.netbeans.modules.sun.manager.jbi.nodes;
439.45 -
439.46 -import java.awt.Frame;
439.47 -import java.util.ArrayList;
439.48 -import java.util.List;
439.49 -import java.util.Properties;
439.50 -import javax.management.Attribute;
439.51 -import javax.swing.SwingUtilities;
439.52 -import javax.xml.namespace.QName;
439.53 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationDescriptor;
439.54 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationMBeanAttributeInfo;
439.55 -import org.netbeans.modules.sun.manager.jbi.nodes.property.NewSchemaBasedConfigPropertySupportFactory;
439.56 -import org.netbeans.modules.sun.manager.jbi.nodes.property.PropertySheetOwner;
439.57 -import org.openide.explorer.propertysheet.PropertySheetView;
439.58 -import org.openide.nodes.AbstractNode;
439.59 -import org.openide.nodes.Children;
439.60 -import org.openide.nodes.Node;
439.61 -import org.openide.nodes.PropertySupport;
439.62 -import org.openide.nodes.Sheet;
439.63 -
439.64 -/**
439.65 - *
439.66 - * @author jqian
439.67 - */
439.68 -public class JBIComponentInstallationConfigurationDialog
439.69 - extends javax.swing.JDialog implements PropertySheetOwner {
439.70 -
439.71 - private String componentName;
439.72 - private JBIComponentConfigurationDescriptor rootDescriptor;
439.73 - private Properties defaultProperties;
439.74 - private Properties properties;
439.75 - private boolean cancelled = false;
439.76 -
439.77 - /** Creates new form JBIComponentInstallationConfigurationDialog */
439.78 - public JBIComponentInstallationConfigurationDialog(String componentName,
439.79 - JBIComponentConfigurationDescriptor rootDescriptor) {
439.80 - super((Frame) null, true);
439.81 - this.componentName = componentName;
439.82 - initComponents();
439.83 -
439.84 - this.rootDescriptor = rootDescriptor;
439.85 - initPropertyTable();
439.86 - }
439.87 -
439.88 - public boolean isCancelled() {
439.89 - return cancelled;
439.90 - }
439.91 -
439.92 - public Properties getProperties() {
439.93 - return properties;
439.94 - }
439.95 -
439.96 - private void initPropertyTable() {
439.97 -
439.98 - final PropertySheetView propertySheetView = new PropertySheetView();
439.99 - jScrollPane1.setViewportView(propertySheetView);
439.100 -
439.101 - List<PropertySupport> propertySupports = new ArrayList<PropertySupport>();
439.102 - defaultProperties = new Properties();
439.103 - addPropertySupport(propertySupports, rootDescriptor, defaultProperties);
439.104 -
439.105 - properties = new Properties(defaultProperties);
439.106 -
439.107 - final Sheet sheet = new Sheet();
439.108 - Sheet.Set sheetSet = new Sheet.Set();
439.109 - sheetSet.setName("Component Configuration");
439.110 - if (propertySupports != null) {
439.111 - sheetSet.put(propertySupports.toArray(new PropertySupport[]{}));
439.112 - sheet.put(sheetSet);
439.113 - }
439.114 -
439.115 - final Node fakeNode = new AbstractNode(Children.LEAF) {
439.116 -
439.117 - @Override
439.118 - public Node.PropertySet[] getPropertySets() {
439.119 - return sheet.toArray();
439.120 - }
439.121 - };
439.122 -
439.123 - SwingUtilities.invokeLater(new Runnable() {
439.124 -
439.125 - public void run() {
439.126 - propertySheetView.setNodes(new Node[]{fakeNode});
439.127 - jScrollPane1.validate();
439.128 - }
439.129 - });
439.130 - }
439.131 -
439.132 - private void addPropertySupport(List<PropertySupport> propertySupports,
439.133 - JBIComponentConfigurationDescriptor configDescriptor,
439.134 - Properties properties) {
439.135 -
439.136 - if (configDescriptor.isApplicationConfiguration() ||
439.137 - configDescriptor.isApplicationVariable()) {
439.138 - // do nothing
439.139 - } else if (configDescriptor.isProperty()) {
439.140 -
439.141 - if (!configDescriptor.showDisplayAtInstallation()) {
439.142 - return;
439.143 - }
439.144 -
439.145 - String name = configDescriptor.getName();
439.146 - String value = configDescriptor.getDefaultValue();
439.147 - QName typeQName = configDescriptor.getTypeQName();
439.148 -
439.149 - properties.setProperty(name, value);
439.150 -
439.151 - Object attrValue = null;
439.152 - if (JBIComponentConfigurationDescriptor.XSD_INT.equals(typeQName) ||
439.153 - JBIComponentConfigurationDescriptor.XSD_POSITIVE_INTEGER.equals(typeQName) ||
439.154 - JBIComponentConfigurationDescriptor.XSD_NEGATIVE_INTEGER.equals(typeQName) ||
439.155 - JBIComponentConfigurationDescriptor.XSD_NON_POSITIVE_INTEGER.equals(typeQName) ||
439.156 - JBIComponentConfigurationDescriptor.XSD_NON_NEGATIVE_INTEGER.equals(typeQName)) {
439.157 - attrValue = Integer.parseInt(value);
439.158 - } else if (JBIComponentConfigurationDescriptor.XSD_STRING.equals(typeQName)) {
439.159 - attrValue = value;
439.160 - } else if (JBIComponentConfigurationDescriptor.XSD_BOOLEAN.equals(typeQName)) {
439.161 - attrValue = Boolean.parseBoolean(value);
439.162 - } else {
439.163 - throw new RuntimeException("Type not supported: " + typeQName);
439.164 - }
439.165 -
439.166 - Attribute attr = new Attribute(name, attrValue);
439.167 -
439.168 - JBIComponentConfigurationMBeanAttributeInfo attrInfo =
439.169 - new JBIComponentConfigurationMBeanAttributeInfo(
439.170 - configDescriptor,
439.171 - attrValue.getClass().getName(),
439.172 - true, true, false);
439.173 -
439.174 - propertySupports.add(
439.175 - NewSchemaBasedConfigPropertySupportFactory.getPropertySupport(
439.176 - this, attr, attrInfo));
439.177 -
439.178 - } else { // PropertyGroup or root descriptor
439.179 - for (JBIComponentConfigurationDescriptor childDescriptor :
439.180 - configDescriptor.getChildren()) {
439.181 - addPropertySupport(propertySupports, childDescriptor, properties);
439.182 - }
439.183 - }
439.184 - }
439.185 -
439.186 - public Attribute setSheetProperty(String attrName, Object value) {
439.187 - properties.setProperty(attrName, value.toString());
439.188 - return new Attribute(attrName, value);
439.189 - }
439.190 -
439.191 - /** This method is called from within the constructor to
439.192 - * initialize the form.
439.193 - * WARNING: Do NOT modify this code. The content of this method is
439.194 - * always regenerated by the Form Editor.
439.195 - */
439.196 - // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
439.197 - private void initComponents() {
439.198 -
439.199 - jLabel1 = new javax.swing.JLabel();
439.200 - installButton = new javax.swing.JButton();
439.201 - restoreDefaultButton = new javax.swing.JButton();
439.202 - cancelButton = new javax.swing.JButton();
439.203 - jScrollPane1 = new javax.swing.JScrollPane();
439.204 -
439.205 - setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);
439.206 - setTitle(org.openide.util.NbBundle.getMessage(JBIComponentInstallationConfigurationDialog.class, "JBIComponentInstallationConfigurationDialog.title", new Object[] {componentName})); // NOI18N
439.207 -
439.208 - jLabel1.setText(org.openide.util.NbBundle.getMessage(JBIComponentInstallationConfigurationDialog.class, "JBIComponentInstallationConfigurationDialog.jLabel1.text")); // NOI18N
439.209 -
439.210 - installButton.setText(org.openide.util.NbBundle.getMessage(JBIComponentInstallationConfigurationDialog.class, "JBIComponentInstallationConfigurationDialog.installButton.text")); // NOI18N
439.211 - installButton.addActionListener(new java.awt.event.ActionListener() {
439.212 - public void actionPerformed(java.awt.event.ActionEvent evt) {
439.213 - installButtonActionPerformed(evt);
439.214 - }
439.215 - });
439.216 -
439.217 - restoreDefaultButton.setText(org.openide.util.NbBundle.getMessage(JBIComponentInstallationConfigurationDialog.class, "JBIComponentInstallationConfigurationDialog.restoreDefaultButton.text")); // NOI18N
439.218 - restoreDefaultButton.addActionListener(new java.awt.event.ActionListener() {
439.219 - public void actionPerformed(java.awt.event.ActionEvent evt) {
439.220 - restoreDefaultButtonActionPerformed(evt);
439.221 - }
439.222 - });
439.223 -
439.224 - cancelButton.setText(org.openide.util.NbBundle.getMessage(JBIComponentInstallationConfigurationDialog.class, "JBIComponentInstallationConfigurationDialog.cancelButton.text")); // NOI18N
439.225 - cancelButton.addActionListener(new java.awt.event.ActionListener() {
439.226 - public void actionPerformed(java.awt.event.ActionEvent evt) {
439.227 - cancelButtonActionPerformed(evt);
439.228 - }
439.229 - });
439.230 -
439.231 - org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(getContentPane());
439.232 - getContentPane().setLayout(layout);
439.233 - layout.setHorizontalGroup(
439.234 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
439.235 - .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
439.236 - .addContainerGap()
439.237 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
439.238 - .add(org.jdesktop.layout.GroupLayout.LEADING, jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 481, Short.MAX_VALUE)
439.239 - .add(org.jdesktop.layout.GroupLayout.LEADING, jLabel1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 481, Short.MAX_VALUE)
439.240 - .add(layout.createSequentialGroup()
439.241 - .add(installButton)
439.242 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
439.243 - .add(restoreDefaultButton)
439.244 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
439.245 - .add(cancelButton)))
439.246 - .addContainerGap())
439.247 - );
439.248 - layout.setVerticalGroup(
439.249 - layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
439.250 - .add(layout.createSequentialGroup()
439.251 - .add(11, 11, 11)
439.252 - .add(jLabel1, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, 23, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE)
439.253 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
439.254 - .add(jScrollPane1, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 217, Short.MAX_VALUE)
439.255 - .addPreferredGap(org.jdesktop.layout.LayoutStyle.UNRELATED)
439.256 - .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
439.257 - .add(cancelButton)
439.258 - .add(restoreDefaultButton)
439.259 - .add(installButton))
439.260 - .addContainerGap())
439.261 - );
439.262 -
439.263 - pack();
439.264 - }// </editor-fold>//GEN-END:initComponents
439.265 - private void restoreDefaultButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_restoreDefaultButtonActionPerformed
439.266 - properties = new Properties(defaultProperties);
439.267 - initPropertyTable();
439.268 -}//GEN-LAST:event_restoreDefaultButtonActionPerformed
439.269 -
439.270 - private void cancelButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_cancelButtonActionPerformed
439.271 - cancelled = true;
439.272 - this.dispose();
439.273 -}//GEN-LAST:event_cancelButtonActionPerformed
439.274 -
439.275 - private void installButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_installButtonActionPerformed
439.276 - this.dispose();
439.277 - }//GEN-LAST:event_installButtonActionPerformed
439.278 -
439.279 - /**
439.280 - * @param args the command line arguments
439.281 - */
439.282 - public static void main(String args[]) {
439.283 - java.awt.EventQueue.invokeLater(new Runnable() {
439.284 -
439.285 - public void run() {
439.286 - JBIComponentInstallationConfigurationDialog dialog =
439.287 - new JBIComponentInstallationConfigurationDialog("FOO", null);
439.288 - dialog.addWindowListener(new java.awt.event.WindowAdapter() {
439.289 -
439.290 - public void windowClosing(java.awt.event.WindowEvent e) {
439.291 - System.exit(0);
439.292 - }
439.293 - });
439.294 - dialog.setVisible(true);
439.295 - }
439.296 - });
439.297 - }
439.298 - // Variables declaration - do not modify//GEN-BEGIN:variables
439.299 - private javax.swing.JButton cancelButton;
439.300 - private javax.swing.JButton installButton;
439.301 - private javax.swing.JLabel jLabel1;
439.302 - private javax.swing.JScrollPane jScrollPane1;
439.303 - private javax.swing.JButton restoreDefaultButton;
439.304 - // End of variables declaration//GEN-END:variables
439.305 -}
440.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBIComponentNode.java Sat Jan 26 03:07:46 2008 +0000
440.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBIComponentNode.java Sat Jan 26 05:58:37 2008 +0000
440.3 @@ -51,7 +51,8 @@
440.4 import java.awt.Image;
440.5 import java.io.BufferedReader;
440.6 import java.io.File;
440.7 -import java.io.FileReader;
440.8 +import java.io.InputStream;
440.9 +import java.io.InputStreamReader;
440.10 import java.io.StringReader;
440.11 import java.util.ArrayList;
440.12 import java.util.Collections;
440.13 @@ -85,19 +86,15 @@
440.14 import org.netbeans.modules.sun.manager.jbi.actions.UndeployAction;
440.15 import org.netbeans.modules.sun.manager.jbi.actions.UninstallAction;
440.16 import org.netbeans.modules.sun.manager.jbi.actions.UpgradeAction;
440.17 -import org.netbeans.modules.sun.manager.jbi.nodes.property.OldSchemaBasedConfigPropertySupportFactory;
440.18 +import org.netbeans.modules.sun.manager.jbi.nodes.property.SchemaBasedConfigPropertySupportFactory;
440.19 import org.netbeans.modules.sun.manager.jbi.management.AppserverJBIMgmtController;
440.20 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentActionDescriptor;
440.21 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
440.22 -import org.netbeans.modules.sun.manager.jbi.management.OldConfigurationMBeanAttributeInfo;
440.23 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentActionDescriptor;
440.24 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
440.25 +import org.netbeans.modules.sun.manager.jbi.management.ConfigurationMBeanAttributeInfo;
440.26 import org.netbeans.modules.sun.manager.jbi.management.JBIComponentType;
440.27 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationDescriptor;
440.28 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationMBeanAttributeInfo;
440.29 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationParser;
440.30 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.PerformanceMeasurementServiceWrapper;
440.31 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.RuntimeManagementServiceWrapper;
440.32 import org.netbeans.modules.sun.manager.jbi.nodes.property.JBIPropertySupportFactory;
440.33 -import org.netbeans.modules.sun.manager.jbi.nodes.property.NewSchemaBasedConfigPropertySupportFactory;
440.34 import org.netbeans.modules.sun.manager.jbi.util.ComparableAttribute;
440.35 import org.netbeans.modules.sun.manager.jbi.util.DoNotShowAgainConfirmation;
440.36 import org.netbeans.modules.sun.manager.jbi.util.FileFilters;
440.37 @@ -141,8 +138,7 @@
440.38 private boolean busy;
440.39 private JBIComponentType compType;
440.40 // Cached component configuration schema
440.41 - private String configSchema; // REMOVE ME
440.42 - private JBIComponentConfigurationDescriptor rootConfigDescriptor;
440.43 + private String configSchema;
440.44 // Whether the component's configuration schema has been checked or not.
440.45 private boolean hasConfigSchemaBeenChecked;
440.46 // This is not persistent across sessions.
440.47 @@ -151,8 +147,10 @@
440.48 private static boolean confirmComponentShutdownDuringUpgrade = true;
440.49 // This is not persistent across sessions.
440.50 private static boolean confirmForServiceAssembliesUndeployment = true;
440.51 +
440.52 private static Logger logger = Logger.getLogger("org.netbeans.modules.sun.manager.jbi.nodes.JBIComponentNode"); // NOI18N
440.53
440.54 +
440.55 public JBIComponentNode(final AppserverJBIMgmtController controller,
440.56 JBIComponentType compType, NodeType nodeType,
440.57 String name, String description) {
440.58 @@ -211,29 +209,21 @@
440.59 }
440.60 if (isStarted) {
440.61 if (!hasConfigSchemaBeenChecked) {
440.62 + ConfigurationService configService = getConfigurationService();
440.63 String compName = getName();
440.64 -// ConfigurationService configService = getConfigurationService();
440.65 -// configSchema = configService.retrieveConfigurationDisplaySchema(
440.66 -// compName, SERVER_TARGET);
440.67 - AdministrationService adminService = getAdministrationService();
440.68 - String jbiXml = adminService.getComponentInstallationDescriptor(compName);
440.69 - rootConfigDescriptor = JBIComponentConfigurationParser.parse(jbiXml);
440.70 + configSchema = configService.retrieveConfigurationDisplaySchema(
440.71 + compName, SERVER_TARGET);
440.72 hasConfigSchemaBeenChecked = true;
440.73 }
440.74 }
440.75
440.76 Map<Attribute, ? extends MBeanAttributeInfo> configPropertyMap =
440.77 -// getOldConfigurationSheetSetProperties();
440.78 getConfigurationSheetSetProperties();
440.79
440.80 Sheet.Set sheetSet = null;
440.81 -// if (configSchema != null && configSchema.trim().length() > 0) {
440.82 - if (rootConfigDescriptor != null) {
440.83 + if (configSchema != null && configSchema.trim().length() > 0) {
440.84 PropertySupport[] propertySupports =
440.85 -// oldCreatePropertySupportArrayWithSchema(
440.86 -// configPropertyMap);
440.87 - createPropertySupportArrayWithSchema(
440.88 - (Map<Attribute, JBIComponentConfigurationMBeanAttributeInfo>)configPropertyMap);
440.89 + createPropertySupportArrayWithSchema(configPropertyMap);
440.90 sheetSet = createSheetSet(CONFIGURATION_SHEET_SET_NAME,
440.91 "LBL_CONFIG_PROPERTIES", // NOI18N
440.92 "DSC_CONFIG_PROPERTIES", // NOI18N
440.93 @@ -287,7 +277,7 @@
440.94 return Utils.getIntrospectedPropertyMap(statistics, true);
440.95 }
440.96
440.97 - protected PropertySupport[] oldCreatePropertySupportArrayWithSchema(
440.98 + protected PropertySupport[] createPropertySupportArrayWithSchema(
440.99 final Map<Attribute, ? extends MBeanAttributeInfo> attrMap) {
440.100
440.101 assert configSchema != null;
440.102 @@ -300,8 +290,7 @@
440.103 for (Attribute attr : attrMap.keySet()) {
440.104 MBeanAttributeInfo info = attrMap.get(attr);
440.105
440.106 - PropertySupport support =
440.107 - OldSchemaBasedConfigPropertySupportFactory.
440.108 + PropertySupport support = SchemaBasedConfigPropertySupportFactory.
440.109 getPropertySupport(configSchema, compName, this, attr, info);
440.110
440.111 if (support == null) {
440.112 @@ -331,104 +320,6 @@
440.113
440.114 return supports.toArray(new PropertySupport[0]);
440.115 }
440.116 -
440.117 - /*
440.118 - private void addPropertySupport(List<PropertySupport> propertySupports,
440.119 - JBIComponentConfigurationDescriptor configDescriptor,
440.120 - Map<Attribute, ? extends MBeanAttributeInfo> attrMap) {
440.121 -
440.122 - if (configDescriptor.isApplicationConfiguration() ||
440.123 - configDescriptor.isApplicationVariable()) {
440.124 - // do nothing
440.125 - } else if (configDescriptor.isProperty()) {
440.126 -
440.127 - if (!configDescriptor.showDisplayAtInstallation()) {
440.128 - return;
440.129 - }
440.130 -
440.131 - String name = configDescriptor.getName();
440.132 -// String value = configDescriptor.getDefaultValue();
440.133 -// QName typeQName = configDescriptor.getTypeQName();
440.134 -
440.135 -
440.136 -// Object attrValue = null;
440.137 -// if (JBIComponentConfigurationDescriptor.XSD_INT.equals(typeQName) ||
440.138 -// JBIComponentConfigurationDescriptor.XSD_POSITIVE_INTEGER.equals(typeQName) ||
440.139 -// JBIComponentConfigurationDescriptor.XSD_NEGATIVE_INTEGER.equals(typeQName) ||
440.140 -// JBIComponentConfigurationDescriptor.XSD_NON_POSITIVE_INTEGER.equals(typeQName) ||
440.141 -// JBIComponentConfigurationDescriptor.XSD_NON_NEGATIVE_INTEGER.equals(typeQName)) {
440.142 -// attrValue = Integer.parseInt(value);
440.143 -// } else if (JBIComponentConfigurationDescriptor.XSD_STRING.equals(typeQName)) {
440.144 -// attrValue = value;
440.145 -// } else if (JBIComponentConfigurationDescriptor.XSD_BOOLEAN.equals(typeQName)) {
440.146 -// attrValue = Boolean.parseBoolean(value);
440.147 -// } else {
440.148 -// throw new RuntimeException("Type not supported: " + typeQName);
440.149 -// }
440.150 -
440.151 - Attribute attr = new Attribute(name, attrValue);
440.152 -
440.153 - JBIComponentConfigurationMBeanAttributeInfo attrInfo =
440.154 - new JBIComponentConfigurationMBeanAttributeInfo(
440.155 - configDescriptor,
440.156 - attrValue.getClass().getName(),
440.157 - true, true, false);
440.158 -
440.159 - propertySupports.add(
440.160 - NewSchemaBasedConfigPropertySupportFactory.getPropertySupport(
440.161 - this, attr, attrInfo));
440.162 -
440.163 - } else { // PropertyGroup or root descriptor
440.164 - for (JBIComponentConfigurationDescriptor childDescriptor :
440.165 - configDescriptor.getChildren()) {
440.166 - addPropertySupport(propertySupports, childDescriptor);
440.167 - }
440.168 - }
440.169 - }
440.170 - */
440.171 -
440.172 -
440.173 - protected PropertySupport[] createPropertySupportArrayWithSchema(
440.174 - final Map<Attribute, JBIComponentConfigurationMBeanAttributeInfo> attrMap) {
440.175 -
440.176 - List<PropertySupport> supports = new ArrayList<PropertySupport>();
440.177 -
440.178 - try {
440.179 - String compName = getName();
440.180 -
440.181 - for (Attribute attr : attrMap.keySet()) {
440.182 - JBIComponentConfigurationMBeanAttributeInfo info = attrMap.get(attr);
440.183 -
440.184 - PropertySupport support = NewSchemaBasedConfigPropertySupportFactory.
440.185 - getPropertySupport(this, attr, info);
440.186 -
440.187 - if (support == null) {
440.188 -
440.189 -// if (attr.getValue() instanceof TabularData) {
440.190 -// // There is no schema support for tabular data.
440.191 -// support = JBIPropertySupportFactory.getPropertySupport(
440.192 -// this, attr, info);
440.193 -// supports.add(support);
440.194 -// continue;
440.195 -// }
440.196 -
440.197 - String msg = "Failed to get property support for " +
440.198 - compName + ":" + attr.getName() + ". " +
440.199 - "Missing definition in configuration schema.";
440.200 - NotifyDescriptor d = new NotifyDescriptor.Message(
440.201 - msg, NotifyDescriptor.WARNING_MESSAGE);
440.202 - DialogDisplayer.getDefault().notify(d);
440.203 - } else {
440.204 - supports.add(support);
440.205 - }
440.206 - }
440.207 -
440.208 - } catch (Exception e) {
440.209 - e.printStackTrace();
440.210 - }
440.211 -
440.212 - return supports.toArray(new PropertySupport[0]);
440.213 - }
440.214
440.215 private Map<Attribute, MBeanAttributeInfo> getGeneralSheetSetProperties() {
440.216 JBIComponentInfo componentInfo = getJBIComponentInfo();
440.217 @@ -446,10 +337,10 @@
440.218 * all the attributes will be sorted based on the sequence definition
440.219 * in the schema.
440.220 *
440.221 - * @deprecated to be removed
440.222 * @return
440.223 */
440.224 - private Map<Attribute, ? extends MBeanAttributeInfo> getOldConfigurationSheetSetProperties()
440.225 + private Map<Attribute, ? extends MBeanAttributeInfo>
440.226 + getConfigurationSheetSetProperties()
440.227 throws ManagementRemoteException {
440.228
440.229 Map<Attribute, MBeanAttributeInfo> ret =
440.230 @@ -466,8 +357,8 @@
440.231 String configXmlData = configService.retrieveConfigurationDisplayData(
440.232 compName, SERVER_TARGET);
440.233
440.234 - OldJBIComponentConfigurationDescriptor rootDescriptor =
440.235 - OldJBIComponentConfigurationDescriptor.parse(configXmlData);
440.236 + ComponentConfigurationDescriptor rootDescriptor =
440.237 + ComponentConfigurationDescriptor.parse(configXmlData);
440.238
440.239 if (rootDescriptor == null) {
440.240 // Fallback on regular attributes if the component does not have
440.241 @@ -536,10 +427,10 @@
440.242
440.243 Attribute attr = new Attribute(name, value);
440.244
440.245 - OldJBIComponentConfigurationDescriptor childDescriptor =
440.246 + ComponentConfigurationDescriptor childDescriptor =
440.247 rootDescriptor.getChild(name);
440.248 MBeanAttributeInfo attrInfo =
440.249 - new OldConfigurationMBeanAttributeInfo(
440.250 + new ConfigurationMBeanAttributeInfo(
440.251 childDescriptor,
440.252 value.getClass().getName(),
440.253 true, true, false);
440.254 @@ -555,165 +446,6 @@
440.255 }
440.256
440.257 /**
440.258 - * Gets the property map mapping from Attribute to MBeanAttributeInfo.
440.259 - *
440.260 - * If there is no schema defined for the component configurations, then
440.261 - * all the attributes will be sorted based on their names (not display names).
440.262 - *
440.263 - * If there is a schema defined for the component configurations, then
440.264 - * all the attributes will be sorted based on the sequence definition
440.265 - * in the schema.
440.266 - *
440.267 - * @return
440.268 - */
440.269 - private Map<Attribute, ? extends MBeanAttributeInfo> getConfigurationSheetSetProperties()
440.270 - throws ManagementRemoteException {
440.271 -
440.272 - Map<Attribute, MBeanAttributeInfo> ret =
440.273 - new LinkedHashMap<Attribute, MBeanAttributeInfo>();
440.274 -
440.275 - ConfigurationService configService = getConfigurationService();
440.276 - AdministrationService adminService = getAdministrationService();
440.277 - String compName = getName();
440.278 -
440.279 - Map<String, Object> configMap =
440.280 - configService.getComponentConfigurationAsMap(
440.281 - compName, SERVER_TARGET);
440.282 -
440.283 - try {
440.284 -// String jbiXML = adminService.getComponentInstallationDescriptor(
440.285 -// SERVER_TARGET);
440.286 -// // TMP
440.287 -// File tmpJbiFile = new File("C:\\Temp\\sun-http-binding-jbi.xml");
440.288 -// jbiXML = getContent(tmpJbiFile);
440.289 -//
440.290 -// JBIComponentConfigurationDescriptor rootDescriptor =
440.291 -// JBIComponentConfigurationParser.parse(jbiXML);
440.292 -
440.293 - if (rootConfigDescriptor == null) {
440.294 - // Fallback on regular attributes if the component does not have
440.295 - // configuration schema defined yet.
440.296 - List<String> keys = new ArrayList<String>();
440.297 - keys.addAll(configMap.keySet());
440.298 - Collections.sort(keys);
440.299 -
440.300 - for (String key : keys) {
440.301 - Object value = configMap.get(key);
440.302 - Attribute attr = new Attribute(key, value);
440.303 - MBeanAttributeInfo attrInfo = new MBeanAttributeInfo(
440.304 - key,
440.305 - value.getClass().getName(),
440.306 - key, // need acess to MBeanAttributeInfo
440.307 - true, true, false);
440.308 - ret.put(attr, attrInfo);
440.309 - }
440.310 -
440.311 - try {
440.312 - TabularData appVars =
440.313 - configService.getApplicationVariablesAsTabularData(
440.314 - getName(), SERVER_TARGET);
440.315 - Attribute attr =
440.316 - new Attribute(APPLICATION_VARIABLES_NAME, appVars);
440.317 - MBeanAttributeInfo attrInfo =
440.318 - new MBeanAttributeInfo(APPLICATION_VARIABLES_NAME,
440.319 - "javax.management.openmbean.TabularData", // NOI18N
440.320 - "Application variables",
440.321 - true, true, false);
440.322 - ret.put(attr, attrInfo);
440.323 - } catch (Exception e) {
440.324 - e.printStackTrace();
440.325 - }
440.326 -
440.327 - try {
440.328 - TabularData appConfigs =
440.329 - configService.getApplicationConfigurationsAsTabularData(
440.330 - getName(), SERVER_TARGET);
440.331 - Attribute attr =
440.332 - new Attribute(APPLICATION_CONFIGURATIONS_NAME, appConfigs);
440.333 - MBeanAttributeInfo attrInfo =
440.334 - new MBeanAttributeInfo(APPLICATION_CONFIGURATIONS_NAME,
440.335 - "javax.management.openmbean.TabularData", // NOI18N
440.336 - "Application configurations",
440.337 - true, true, false);
440.338 - ret.put(attr, attrInfo);
440.339 - } catch (Exception e) {
440.340 - e.printStackTrace();
440.341 - }
440.342 -
440.343 - } else {
440.344 - // Attributes are ordered based on schema definition.
440.345 - addProperty(ret, rootConfigDescriptor, configService, configMap);
440.346 - }
440.347 - } catch (Exception e) {
440.348 - e.printStackTrace();
440.349 - }
440.350 -
440.351 - return ret;
440.352 - }
440.353 -
440.354 - private void addProperty(Map<Attribute, MBeanAttributeInfo> attrMap,
440.355 - JBIComponentConfigurationDescriptor configDescriptor,
440.356 - ConfigurationService configService,
440.357 - Map<String, Object> configMap) throws ManagementRemoteException {
440.358 -
440.359 - String name = configDescriptor.getName();
440.360 - Object value = null;
440.361 -
440.362 - if (configDescriptor.isApplicationConfiguration()) {
440.363 - value = configService.getApplicationConfigurationsAsTabularData(
440.364 - getName(), SERVER_TARGET);
440.365 - } else if (configDescriptor.isApplicationVariable()) {
440.366 - value = configService.getApplicationVariablesAsTabularData(
440.367 - getName(), SERVER_TARGET);
440.368 - } else if (configDescriptor.isProperty()) {
440.369 - if (!configDescriptor.showDisplayAtRuntime()) {
440.370 - return;
440.371 - }
440.372 - value = configMap.get(name);
440.373 - } else { // PropertyGroup or root descriptor
440.374 - for (JBIComponentConfigurationDescriptor childDescriptor : configDescriptor.getChildren()) {
440.375 - addProperty(attrMap, childDescriptor, configService, configMap);
440.376 - }
440.377 - }
440.378 -
440.379 - if (value != null) {
440.380 - Attribute attr = new Attribute(name, value);
440.381 -
440.382 - JBIComponentConfigurationMBeanAttributeInfo attrInfo =
440.383 - new JBIComponentConfigurationMBeanAttributeInfo(
440.384 - configDescriptor,
440.385 - value.getClass().getName(),
440.386 - true, true, false);
440.387 -
440.388 - attrMap.put(attr, attrInfo);
440.389 - }
440.390 - }
440.391 -
440.392 - private String getContent(File file) {
440.393 - String ret = "";
440.394 -
440.395 - BufferedReader is = null;
440.396 - try {
440.397 - is = new BufferedReader(new FileReader(file));
440.398 - String inputLine;
440.399 - while ((inputLine = is.readLine()) != null) {
440.400 - ret += inputLine;
440.401 - }
440.402 - } catch (IOException e) {
440.403 - System.out.println("IOException: " + e);
440.404 - } finally {
440.405 - if (is != null) {
440.406 - try {
440.407 - is.close();
440.408 - } catch (Exception e) {
440.409 - }
440.410 - }
440.411 - }
440.412 -
440.413 - return ret;
440.414 - }
440.415 -
440.416 - /**
440.417 * Gets the logger properties to be displayed for this JBI Component.
440.418 *
440.419 * @return A java.util.Map containing all logger properties.
440.420 @@ -733,7 +465,8 @@
440.421 for (String loggerCustomName : loggerMap.keySet()) {
440.422 Level logLevel = loggerMap.get(loggerCustomName);
440.423 int lastDotIndex = loggerCustomName.lastIndexOf("."); // NOI18N
440.424 - String shortName = lastDotIndex == -1 ? loggerCustomName : loggerCustomName.substring(lastDotIndex + 1);
440.425 + String shortName = lastDotIndex == -1 ? loggerCustomName :
440.426 + loggerCustomName.substring(lastDotIndex + 1);
440.427
440.428 Attribute attr = new Attribute(loggerCustomName, logLevel);
440.429 MBeanAttributeInfo info = new MBeanAttributeInfo(
440.430 @@ -1000,7 +733,6 @@
440.431 final ProgressUI progressUI = new ProgressUI(title, false);
440.432
440.433 SwingUtilities.invokeLater(new Runnable() {
440.434 -
440.435 public void run() {
440.436 setBusy(true);
440.437 progressUI.start();
440.438 @@ -1009,17 +741,16 @@
440.439
440.440 String result = null;
440.441 try {
440.442 - result = mgmtService.startComponent(componentName, SERVER_TARGET);
440.443 + result = mgmtService.startComponent(componentName, SERVER_TARGET);
440.444 } catch (ManagementRemoteException e) {
440.445 result = e.getMessage();
440.446 } finally {
440.447 JBIMBeanTaskResultHandler.showRemoteInvokationResult(
440.448 - GenericConstants.START_COMPONENT_OPERATION_NAME,
440.449 - componentName, result);
440.450 + GenericConstants.START_COMPONENT_OPERATION_NAME,
440.451 + componentName, result);
440.452 }
440.453 -
440.454 +
440.455 SwingUtilities.invokeLater(new Runnable() {
440.456 -
440.457 public void run() {
440.458 clearJBIComponentStatusCache(compType);
440.459 progressUI.finish();
440.460 @@ -1049,7 +780,6 @@
440.461 final ProgressUI progressUI = new ProgressUI(title, false);
440.462
440.463 SwingUtilities.invokeLater(new Runnable() {
440.464 -
440.465 public void run() {
440.466 setBusy(true);
440.467 progressUI.start();
440.468 @@ -1062,13 +792,12 @@
440.469 } catch (ManagementRemoteException e) {
440.470 result = e.getMessage();
440.471 } finally {
440.472 - JBIMBeanTaskResultHandler.showRemoteInvokationResult(
440.473 + JBIMBeanTaskResultHandler.showRemoteInvokationResult(
440.474 GenericConstants.STOP_COMPONENT_OPERATION_NAME,
440.475 componentName, result);
440.476 }
440.477 -
440.478 +
440.479 SwingUtilities.invokeLater(new Runnable() {
440.480 -
440.481 public void run() {
440.482 clearJBIComponentStatusCache(compType);
440.483 progressUI.finish();
440.484 @@ -1104,7 +833,6 @@
440.485 final ProgressUI progressUI = new ProgressUI(title, false);
440.486
440.487 SwingUtilities.invokeLater(new Runnable() {
440.488 -
440.489 public void run() {
440.490 setBusy(true);
440.491 progressUI.start();
440.492 @@ -1123,7 +851,6 @@
440.493 }
440.494
440.495 SwingUtilities.invokeLater(new Runnable() {
440.496 -
440.497 public void run() {
440.498 clearJBIComponentStatusCache(compType);
440.499 progressUI.finish();
440.500 @@ -1174,7 +901,6 @@
440.501 final ProgressUI progressUI = new ProgressUI(title, false);
440.502
440.503 SwingUtilities.invokeLater(new Runnable() {
440.504 -
440.505 public void run() {
440.506 progressUI.start();
440.507 }
440.508 @@ -1192,7 +918,6 @@
440.509 }
440.510
440.511 SwingUtilities.invokeLater(new Runnable() {
440.512 -
440.513 public void run() {
440.514 clearJBIComponentStatusCache(compType);
440.515 progressUI.finish();
440.516 @@ -1265,7 +990,6 @@
440.517 final ProgressUI progressUI = new ProgressUI(message, false);
440.518
440.519 SwingUtilities.invokeLater(new Runnable() {
440.520 -
440.521 public void run() {
440.522 setBusy(true);
440.523 progressUI.start();
440.524 @@ -1278,14 +1002,13 @@
440.525 result = installationService.upgradeComponent(
440.526 componentName, jarFilePath);
440.527 } catch (ManagementRemoteException e) {
440.528 - result = e.getMessage();
440.529 + result = e.getMessage();
440.530 return;
440.531 - } finally {
440.532 + } finally {
440.533 JBIMBeanTaskResultHandler.showRemoteInvokationResult(
440.534 GenericConstants.UPGRADE_COMPONENT_OPERATION_NAME,
440.535 jarFilePath, result);
440.536 SwingUtilities.invokeLater(new Runnable() {
440.537 -
440.538 public void run() {
440.539 progressUI.finish();
440.540 setBusy(false);
440.541 @@ -1456,7 +1179,8 @@
440.542 /**
440.543 * Gets the identification properties of a JBI component or a shared library.
440.544 */
440.545 - private static Map<Attribute, MBeanAttributeInfo> getIdentificationSheetSetProperties(
440.546 + private static Map<Attribute, MBeanAttributeInfo>
440.547 + getIdentificationSheetSetProperties(
440.548 String descriptor)
440.549 throws ParserConfigurationException, SAXException, IOException {
440.550
440.551 @@ -1544,15 +1268,18 @@
440.552 throws ManagementRemoteException;
440.553
440.554 //==========================================================================
440.555 + //========================= Concrete Nodes =================================
440.556 /**
440.557 - * Abstract node class for Service Engine or Binding Component.
440.558 + * Node class for a Service Engine.
440.559 */
440.560 - abstract static class RealJBIComponentNode extends JBIComponentNode {
440.561 + public static class ServiceEngine extends JBIComponentNode {
440.562
440.563 - RealJBIComponentNode(final AppserverJBIMgmtController controller,
440.564 - JBIComponentType compType, NodeType nodeType,
440.565 + public ServiceEngine(final AppserverJBIMgmtController controller,
440.566 String name, String description) {
440.567 - super(controller, compType, nodeType, name, description);
440.568 + super(controller,
440.569 + JBIComponentType.SERVICE_ENGINE,
440.570 + NodeType.SERVICE_ENGINE,
440.571 + name, description);
440.572 }
440.573
440.574 @Override
440.575 @@ -1587,40 +1314,7 @@
440.576 /**
440.577 * Gets a non-null list of actions that are specific to this component.
440.578 */
440.579 - protected List<Action> getExtraActions() {
440.580 - return null;
440.581 - }
440.582 -
440.583 - protected String uninstallComponent(
440.584 - InstallationService installationService,
440.585 - String componentName,
440.586 - boolean force) throws ManagementRemoteException {
440.587 - return installationService.uninstallComponent(componentName,
440.588 - force, SERVER_TARGET);
440.589 - }
440.590 -
440.591 - protected String getInstallationDescriptor()
440.592 - throws ManagementRemoteException {
440.593 - AdministrationService adminService = getAdministrationService();
440.594 - return adminService.getComponentInstallationDescriptor(getName());
440.595 - }
440.596 - }
440.597 - //========================= Concrete Nodes =================================
440.598 - /**
440.599 - * Node class for a Service Engine.
440.600 - */
440.601 - static class ServiceEngine extends RealJBIComponentNode {
440.602 -
440.603 - ServiceEngine(final AppserverJBIMgmtController controller,
440.604 - String name, String description) {
440.605 - super(controller,
440.606 - JBIComponentType.SERVICE_ENGINE,
440.607 - NodeType.SERVICE_ENGINE,
440.608 - name, description);
440.609 - }
440.610 -
440.611 - @Override
440.612 - protected List<Action> getExtraActions() {
440.613 + private List<Action> getExtraActions() {
440.614 List<Action> extraActions = new ArrayList<Action>();
440.615
440.616 ConfigurationService configService = getConfigurationService();
440.617 @@ -1632,8 +1326,8 @@
440.618
440.619 try {
440.620 actionXML = (String) configService.invokeExtensionMBeanOperation(
440.621 - componentName, ACTIONABLE_MBEAN_NAME,
440.622 - ACTIONABLE_MBEAN_GET_ACTIONS_OPERATION_NAME,
440.623 + componentName, ACTIONABLE_MBEAN_NAME,
440.624 + ACTIONABLE_MBEAN_GET_ACTIONS_OPERATION_NAME,
440.625 new Object[]{}, new String[]{},
440.626 SERVER_TARGET, null);
440.627 } catch (ManagementRemoteException e) {
440.628 @@ -1644,12 +1338,30 @@
440.629
440.630 if (actionXML != null) {
440.631 extraActions.addAll(
440.632 - JBIComponentActionDescriptor.getActions(actionXML));
440.633 + ComponentActionDescriptor.getActions(actionXML));
440.634 }
440.635
440.636 return extraActions;
440.637 }
440.638
440.639 + private String getString(InputStream is) throws IOException {
440.640 + BufferedReader in = new BufferedReader(new InputStreamReader(is));
440.641 + String line;
440.642 + StringBuffer buffer = new StringBuffer();
440.643 + while ((line = in.readLine()) != null) {
440.644 + buffer.append(line);
440.645 + }
440.646 + return buffer.toString();
440.647 + }
440.648 +
440.649 + protected String uninstallComponent(
440.650 + InstallationService installationService,
440.651 + String componentName,
440.652 + boolean force) throws ManagementRemoteException {
440.653 + return installationService.uninstallComponent(componentName,
440.654 + force, SERVER_TARGET);
440.655 + }
440.656 +
440.657 protected JBIArtifactValidator getValidator() {
440.658 return JBIArtifactValidator.getServiceEngineValidator(getName());
440.659 }
440.660 @@ -1681,15 +1393,21 @@
440.661 protected String getUpgradeProgressMessageLabel() {
440.662 return "LBL_Upgrading_Service_Engine"; // NOI18N
440.663 }
440.664 +
440.665 + protected String getInstallationDescriptor()
440.666 + throws ManagementRemoteException {
440.667 + AdministrationService adminService = getAdministrationService();
440.668 + return adminService.getComponentInstallationDescriptor(getName());
440.669 + }
440.670 }
440.671
440.672 //==========================================================================
440.673 /**
440.674 * Node class for a Binding Component.
440.675 */
440.676 - static class BindingComponent extends RealJBIComponentNode {
440.677 + public static class BindingComponent extends JBIComponentNode {
440.678
440.679 - BindingComponent(final AppserverJBIMgmtController controller,
440.680 + public BindingComponent(final AppserverJBIMgmtController controller,
440.681 String name, String description) {
440.682 super(controller,
440.683 JBIComponentType.BINDING_COMPONENT,
440.684 @@ -1697,6 +1415,34 @@
440.685 name, description);
440.686 }
440.687
440.688 + @Override
440.689 + public Action[] getActions(boolean flag) {
440.690 + return new SystemAction[]{
440.691 + SystemAction.get(StartAction.class),
440.692 + SystemAction.get(StopAction.class),
440.693 + SystemAction.get(ShutdownAction.Normal.class),
440.694 + SystemAction.get(UninstallAction.Normal.class),
440.695 + SystemAction.get(UpgradeAction.class),
440.696 + null,
440.697 + SystemAction.get(AdvancedAction.class),
440.698 + null,
440.699 + SystemAction.get(UndeployAction.Normal.class),
440.700 + null,
440.701 + SystemAction.get(PropertiesAction.class),
440.702 + SystemAction.get(RefreshAction.class),
440.703 + null,
440.704 + SystemAction.get(ShowComponentEndpointsStatisticsAction.class)
440.705 + };
440.706 + }
440.707 +
440.708 + protected String uninstallComponent(
440.709 + InstallationService installationService,
440.710 + String componentName,
440.711 + boolean force) throws ManagementRemoteException {
440.712 + return installationService.uninstallComponent(componentName,
440.713 + force, SERVER_TARGET);
440.714 + }
440.715 +
440.716 protected JBIArtifactValidator getValidator() {
440.717 return JBIArtifactValidator.getBindingComponentValidator(getName());
440.718 }
440.719 @@ -1728,15 +1474,22 @@
440.720 protected String getUpgradeProgressMessageLabel() {
440.721 return "LBL_Upgrading_Binding_Component"; // NOI18N
440.722 }
440.723 +
440.724 + @Override
440.725 + protected String getInstallationDescriptor()
440.726 + throws ManagementRemoteException {
440.727 + AdministrationService adminService = getAdministrationService();
440.728 + return adminService.getComponentInstallationDescriptor(getName());
440.729 + }
440.730 }
440.731
440.732 //==========================================================================
440.733 /**
440.734 * Node class for a Shared Library.
440.735 */
440.736 - static class SharedLibrary extends JBIComponentNode {
440.737 + public static class SharedLibrary extends JBIComponentNode {
440.738
440.739 - SharedLibrary(final AppserverJBIMgmtController controller,
440.740 + public SharedLibrary(final AppserverJBIMgmtController controller,
440.741 String name, String description) {
440.742 super(controller,
440.743 JBIComponentType.SHARED_LIBRARY,
441.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBINode.java Sat Jan 26 03:07:46 2008 +0000
441.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/JBINode.java Sat Jan 26 05:58:37 2008 +0000
441.3 @@ -64,7 +64,7 @@
441.4 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.PerformanceMeasurementServiceWrapper;
441.5 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.RuntimeManagementServiceWrapper;
441.6 import org.netbeans.modules.sun.manager.jbi.nodes.property.JBIPropertySupportFactory;
441.7 -import org.netbeans.modules.sun.manager.jbi.nodes.property.OldSchemaBasedConfigPropertySupportFactory;
441.8 +import org.netbeans.modules.sun.manager.jbi.nodes.property.SchemaBasedConfigPropertySupportFactory;
441.9 import org.netbeans.modules.sun.manager.jbi.util.ComparableAttribute;
441.10 import org.netbeans.modules.sun.manager.jbi.util.Utils;
441.11 import org.openide.DialogDisplayer;
441.12 @@ -245,7 +245,7 @@
441.13
441.14 PropertySupport property;
441.15 if (minValue != null && maxValue != null) {
441.16 - property = OldSchemaBasedConfigPropertySupportFactory.
441.17 + property = SchemaBasedConfigPropertySupportFactory.
441.18 getIntegerPropertySupport(
441.19 this, attr, attrInfo,
441.20 Integer.parseInt(minValue),
441.21 @@ -257,7 +257,7 @@
441.22 if (enumValue.endsWith("}")) {
441.23 enumValue = enumValue.substring(0, enumValue.length() - 2);
441.24 }
441.25 - property = OldSchemaBasedConfigPropertySupportFactory.
441.26 + property = SchemaBasedConfigPropertySupportFactory.
441.27 getEnumeratedStringPropertySupport(
441.28 this, attr, attrInfo,
441.29 enumValue.split("\\s*,\\s*")); // NOI18N
442.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/AbstractTabularPropertySupport.java Sat Jan 26 03:07:46 2008 +0000
442.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/AbstractTabularPropertySupport.java Sat Jan 26 05:58:37 2008 +0000
442.3 @@ -70,11 +70,11 @@
442.4 private TabularType tabularType;
442.5
442.6 AbstractTabularPropertySupport(
442.7 - PropertySheetOwner propertySheetOwner,
442.8 + JBIComponentNode parent,
442.9 Attribute attr,
442.10 MBeanAttributeInfo info,
442.11 String[] keys) {
442.12 - super(propertySheetOwner, TabularDataSupport.class, attr, info);
442.13 + super(parent, TabularDataSupport.class, attr, info);
442.14 this.keys = keys;
442.15
442.16 TabularData tabularData = (TabularData) attr.getValue();
443.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/ApplicationConfigurationsPropertySupport.java Sat Jan 26 03:07:46 2008 +0000
443.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/ApplicationConfigurationsPropertySupport.java Sat Jan 26 05:58:37 2008 +0000
443.3 @@ -42,7 +42,7 @@
443.4
443.5 import com.sun.esb.management.api.configuration.ConfigurationService;
443.6 import com.sun.esb.management.common.ManagementRemoteException;
443.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
443.8 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
443.9 import java.beans.PropertyEditor;
443.10 import javax.management.Attribute;
443.11 import javax.management.MBeanAttributeInfo;
443.12 @@ -52,7 +52,7 @@
443.13 import org.netbeans.modules.sun.manager.jbi.editors.EnvironmentVariablesEditor;
443.14 import org.netbeans.modules.sun.manager.jbi.management.AppserverJBIMgmtController;
443.15 import org.netbeans.modules.sun.manager.jbi.nodes.JBIComponentNode;
443.16 -import org.netbeans.modules.sun.manager.jbi.management.OldConfigurationMBeanAttributeInfo;
443.17 +import org.netbeans.modules.sun.manager.jbi.management.ConfigurationMBeanAttributeInfo;
443.18 import org.openide.util.NbBundle;
443.19
443.20 /**
443.21 @@ -65,10 +65,10 @@
443.22 private static final String APPLICATION_CONFIGURATION_NAME = "configurationName"; // NOI18N
443.23
443.24 ApplicationConfigurationsPropertySupport(
443.25 - PropertySheetOwner propertySheetOwner,
443.26 + JBIComponentNode parent,
443.27 Attribute attr,
443.28 MBeanAttributeInfo info) {
443.29 - super(propertySheetOwner, attr, info,
443.30 + super(parent, attr, info,
443.31 new String[]{APPLICATION_CONFIGURATION_NAME});
443.32 }
443.33
443.34 @@ -81,9 +81,9 @@
443.35 EnvironmentVariablesEditor.class,
443.36 "ACS_APPLICATION_CONFIGURATIONS_TABLE"); // NOI18N
443.37
443.38 - OldJBIComponentConfigurationDescriptor descriptor =
443.39 - (info instanceof OldConfigurationMBeanAttributeInfo) ?
443.40 - ((OldConfigurationMBeanAttributeInfo) info).getDescriptor() : null;
443.41 + ComponentConfigurationDescriptor descriptor =
443.42 + (info instanceof ConfigurationMBeanAttributeInfo) ?
443.43 + ((ConfigurationMBeanAttributeInfo) info).getDescriptor() : null;
443.44
443.45 return new ApplicationConfigurationsEditor(
443.46 tableLabelText, tableLabelDescription, getTabularType(),
444.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/ApplicationVariablesPropertySupport.java Sat Jan 26 03:07:46 2008 +0000
444.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/ApplicationVariablesPropertySupport.java Sat Jan 26 05:58:37 2008 +0000
444.3 @@ -51,8 +51,8 @@
444.4 import org.netbeans.modules.sun.manager.jbi.editors.EnvironmentVariablesEditor;
444.5 import org.netbeans.modules.sun.manager.jbi.management.AppserverJBIMgmtController;
444.6 import org.netbeans.modules.sun.manager.jbi.nodes.JBIComponentNode;
444.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
444.8 -import org.netbeans.modules.sun.manager.jbi.management.OldConfigurationMBeanAttributeInfo;
444.9 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
444.10 +import org.netbeans.modules.sun.manager.jbi.management.ConfigurationMBeanAttributeInfo;
444.11
444.12 /**
444.13 * Property support for Application Variables.
444.14 @@ -65,18 +65,18 @@
444.15 private static final String APPLICATION_VARIABLE_TYPE = "type"; // NOI18N
444.16
444.17 ApplicationVariablesPropertySupport(
444.18 - PropertySheetOwner propertySheetOwner,
444.19 + JBIComponentNode parent,
444.20 Attribute attr,
444.21 MBeanAttributeInfo info) {
444.22 - super(propertySheetOwner, attr, info,
444.23 + super(parent, attr, info,
444.24 new String[] {APPLICATION_VARIABLE_NAME, APPLICATION_VARIABLE_TYPE});
444.25 }
444.26
444.27 @Override
444.28 public PropertyEditor getPropertyEditor() {
444.29 - OldJBIComponentConfigurationDescriptor descriptor =
444.30 - (info instanceof OldConfigurationMBeanAttributeInfo) ?
444.31 - ((OldConfigurationMBeanAttributeInfo)info).getDescriptor() : null;
444.32 + ComponentConfigurationDescriptor descriptor =
444.33 + (info instanceof ConfigurationMBeanAttributeInfo) ?
444.34 + ((ConfigurationMBeanAttributeInfo)info).getDescriptor() : null;
444.35
444.36 return new EnvironmentVariablesEditor(true, getTabularType(),
444.37 descriptor, info.isWritable());
445.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/JBIPropertySupportFactory.java Sat Jan 26 03:07:46 2008 +0000
445.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/JBIPropertySupportFactory.java Sat Jan 26 05:58:37 2008 +0000
445.3 @@ -78,7 +78,7 @@
445.4 */
445.5 @SuppressWarnings("unchecked")
445.6 public static PropertySupport getPropertySupport(
445.7 - final PropertySheetOwner parent,
445.8 + final AppserverJBIMgmtNode parent,
445.9 final Attribute attr,
445.10 final MBeanAttributeInfo info) {
445.11
445.12 @@ -89,9 +89,8 @@
445.13 support = new MyPropertySupport(parent, Boolean.class, attr, info);
445.14 } else if (attrValue instanceof Integer) {
445.15 support = new MyPropertySupport(parent, Integer.class, attr, info);
445.16 - } else if (attrValue instanceof Level &&
445.17 - parent instanceof AppserverJBIMgmtNode) {
445.18 - support = createLogLevelProperty((AppserverJBIMgmtNode)parent, attr, info);
445.19 + } else if (attrValue instanceof Level) {
445.20 + support = createLogLevelProperty(parent, attr, info);
445.21 } else if (attrValue instanceof TabularData) {
445.22 support = createTabularDataProperty((JBIComponentNode)parent, attr, info);
445.23 } else { // default
445.24 @@ -202,10 +201,10 @@
445.25
445.26 class MyPropertySupport<T> extends PropertySupport<T> {
445.27
445.28 - protected PropertySheetOwner parent;
445.29 + protected AppserverJBIMgmtNode parent;
445.30 protected Attribute attribute;
445.31
445.32 - MyPropertySupport(PropertySheetOwner parent,
445.33 + MyPropertySupport(AppserverJBIMgmtNode parent,
445.34 Class<T> type,
445.35 Attribute attr,
445.36 MBeanAttributeInfo info) {
446.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/NewSchemaBasedConfigPropertySupportFactory.java Sat Jan 26 03:07:46 2008 +0000
446.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
446.3 @@ -1,229 +0,0 @@
446.4 -/*
446.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
446.6 - *
446.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
446.8 - *
446.9 - * The contents of this file are subject to the terms of either the GNU
446.10 - * General Public License Version 2 only ("GPL") or the Common
446.11 - * Development and Distribution License("CDDL") (collectively, the
446.12 - * "License"). You may not use this file except in compliance with the
446.13 - * License. You can obtain a copy of the License at
446.14 - * http://www.netbeans.org/cddl-gplv2.html
446.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
446.16 - * specific language governing permissions and limitations under the
446.17 - * License. When distributing the software, include this License Header
446.18 - * Notice in each file and include the License file at
446.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
446.20 - * particular file as subject to the "Classpath" exception as provided
446.21 - * by Sun in the GPL Version 2 section of the License file that
446.22 - * accompanied this code. If applicable, add the following below the
446.23 - * License Header, with the fields enclosed by brackets [] replaced by
446.24 - * your own identifying information:
446.25 - * "Portions Copyrighted [year] [name of copyright owner]"
446.26 - *
446.27 - * If you wish your version of this file to be governed by only the CDDL
446.28 - * or only the GPL Version 2, indicate your decision by adding
446.29 - * "[Contributor] elects to include this software in this distribution
446.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
446.31 - * single choice of license, a recipient has the option to distribute
446.32 - * your version of this file under either the CDDL, the GPL Version 2 or
446.33 - * to extend the choice of license to its licensees as provided above.
446.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
446.35 - * Version 2 license, then the option applies only if the new code is
446.36 - * made subject to such option by the copyright holder.
446.37 - *
446.38 - * Contributor(s):
446.39 - *
446.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
446.41 - */
446.42 -package org.netbeans.modules.sun.manager.jbi.nodes.property;
446.43 -
446.44 -import java.beans.PropertyEditor;
446.45 -import java.util.List;
446.46 -import javax.management.Attribute;
446.47 -import javax.management.MBeanAttributeInfo;
446.48 -import javax.xml.namespace.QName;
446.49 -import org.netbeans.modules.sun.manager.jbi.editors.ComboBoxPropertyEditor;
446.50 -import org.netbeans.modules.sun.manager.jbi.editors.PasswordEditor;
446.51 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.JBIComponentConfigurationConstraint;
446.52 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationDescriptor;
446.53 -import org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationMBeanAttributeInfo;
446.54 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.EnumerationConstraint;
446.55 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.MaxExclusiveConstraint;
446.56 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.MaxInclusiveConstraint;
446.57 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.MinExclusiveConstraint;
446.58 -import org.netbeans.modules.sun.manager.jbi.management.model.constraint.MinInclusiveConstraint;
446.59 -import org.openide.DialogDisplayer;
446.60 -import org.openide.NotifyDescriptor;
446.61 -import org.openide.nodes.PropertySupport;
446.62 -import org.openide.util.NbBundle;
446.63 -
446.64 -/**
446.65 - *
446.66 - * @author jqian
446.67 - */
446.68 -public class NewSchemaBasedConfigPropertySupportFactory {
446.69 -
446.70 - public static PropertySupport getPropertySupport(
446.71 - final PropertySheetOwner propertySheetOwner,
446.72 - final Attribute attr,
446.73 - final JBIComponentConfigurationMBeanAttributeInfo info) {
446.74 -
446.75 - JBIComponentConfigurationDescriptor descriptor = info.getDescriptor();
446.76 - QName typeQName = descriptor.getTypeQName();
446.77 -
446.78 - List<JBIComponentConfigurationConstraint> constraints =
446.79 - descriptor.getConstraints();
446.80 -
446.81 - if (descriptor.isApplicationConfiguration()) {
446.82 - return new ApplicationConfigurationsPropertySupport(
446.83 - propertySheetOwner, attr, info);
446.84 - } else if (descriptor.isApplicationVariable()) {
446.85 - return new ApplicationVariablesPropertySupport(
446.86 - propertySheetOwner, attr, info);
446.87 - } else if (JBIComponentConfigurationDescriptor.XSD_STRING.equals(typeQName)) {
446.88 - if (constraints.size() == 0) {
446.89 - return getSimpleStringPropertySupport(propertySheetOwner, attr, info);
446.90 - } else if (constraints.size() == 1 &&
446.91 - constraints.get(0) instanceof EnumerationConstraint) {
446.92 - List<String> options =
446.93 - ((EnumerationConstraint) constraints.get(0)).getOptions();
446.94 - return getEnumeratedStringPropertySupport(
446.95 - propertySheetOwner, attr, info, options);
446.96 - }
446.97 - } else if (JBIComponentConfigurationDescriptor.XSD_INT.equals(typeQName) ||
446.98 - JBIComponentConfigurationDescriptor.XSD_POSITIVE_INTEGER.equals(typeQName) ||
446.99 - JBIComponentConfigurationDescriptor.XSD_NEGATIVE_INTEGER.equals(typeQName) ||
446.100 - JBIComponentConfigurationDescriptor.XSD_NON_POSITIVE_INTEGER.equals(typeQName) ||
446.101 - JBIComponentConfigurationDescriptor.XSD_NON_NEGATIVE_INTEGER.equals(typeQName)) {
446.102 -
446.103 - int minInc, maxInc;
446.104 -
446.105 - if (JBIComponentConfigurationDescriptor.XSD_INT.equals(typeQName)) {
446.106 - minInc = Integer.MIN_VALUE;
446.107 - maxInc = Integer.MAX_VALUE;
446.108 - } else if (JBIComponentConfigurationDescriptor.XSD_POSITIVE_INTEGER.equals(typeQName)) {
446.109 - minInc = 1;
446.110 - maxInc = Integer.MAX_VALUE;
446.111 - } else if (JBIComponentConfigurationDescriptor.XSD_NEGATIVE_INTEGER.equals(typeQName)) {
446.112 - minInc = Integer.MIN_VALUE;
446.113 - maxInc = -1;
446.114 - } else if (JBIComponentConfigurationDescriptor.XSD_NON_POSITIVE_INTEGER.equals(typeQName)) {
446.115 - minInc = Integer.MIN_VALUE;
446.116 - maxInc = 0;
446.117 - } else { //if (JBIComponentConfigurationDescriptor.XSD_NON_NEGATIVE_INTEGER.equals(typeQName)) {
446.118 - minInc = 0;
446.119 - maxInc = Integer.MAX_VALUE;
446.120 - }
446.121 -
446.122 - for (JBIComponentConfigurationConstraint constraint : constraints) {
446.123 - if (constraint instanceof MinInclusiveConstraint) {
446.124 - minInc = Math.max(minInc,
446.125 - (int) ((MinInclusiveConstraint) constraint).getValue());
446.126 - } else if (constraint instanceof MaxInclusiveConstraint) {
446.127 - maxInc = Math.min(maxInc,
446.128 - (int) ((MaxInclusiveConstraint) constraint).getValue());
446.129 - } else if (constraint instanceof MinExclusiveConstraint) {
446.130 - minInc = Math.max(minInc,
446.131 - (int) ((MinInclusiveConstraint) constraint).getValue() + 1);
446.132 - } else if (constraint instanceof MaxExclusiveConstraint) {
446.133 - maxInc = Math.min(maxInc,
446.134 - (int) ((MaxInclusiveConstraint) constraint).getValue() - 1);
446.135 - } else {
446.136 - throw new RuntimeException("Constraint not supported yet: " +
446.137 - constraint.getClass().getName());
446.138 - }
446.139 - }
446.140 - return getIntegerPropertySupport(propertySheetOwner, attr, info, minInc, maxInc);
446.141 - } else if (JBIComponentConfigurationDescriptor.XSD_BOOLEAN.equals(typeQName)) {
446.142 - return getBooleanPropertySupport(propertySheetOwner, attr, info);
446.143 - }
446.144 -
446.145 - System.out.println("NewSchemaBasedConfigPropertySupportFactory: Unsupported type: " + typeQName);
446.146 - return null;
446.147 - }
446.148 -
446.149 - public static PropertySupport getEnumeratedStringPropertySupport(
446.150 - final PropertySheetOwner propertySheetOwner,
446.151 - final Attribute attr,
446.152 - final MBeanAttributeInfo info,
446.153 - final List<String> validValues) {
446.154 -
446.155 - return new SchemaBasedConfigPropertySupport<String>(
446.156 - propertySheetOwner, String.class, attr, info) {
446.157 -
446.158 - @Override
446.159 - public PropertyEditor getPropertyEditor() {
446.160 - return new ComboBoxPropertyEditor(validValues);
446.161 - }
446.162 - };
446.163 - }
446.164 -
446.165 - public static PropertySupport getIntegerPropertySupport(
446.166 - final PropertySheetOwner propertySheetOwner,
446.167 - final Attribute attr,
446.168 - final MBeanAttributeInfo info,
446.169 - final int minInclusiveValue,
446.170 - final int maxInclusiveValue) {
446.171 -
446.172 - return new SchemaBasedConfigPropertySupport<Integer>(
446.173 - propertySheetOwner, Integer.class, attr, info) {
446.174 -
446.175 - @Override
446.176 - public Integer getValue() {
446.177 - // friendly reminder for now
446.178 - if (attr.getValue() instanceof String) {
446.179 - String msg = "The component's configuration schema indicates this attribute is of type 'int'." + // NOI18N
446.180 - " However, the MBean attribute is of type 'string'. Please fix the component."; // NOI18N
446.181 - throw new ClassCastException(msg);
446.182 - }
446.183 - return super.getValue();
446.184 - }
446.185 -
446.186 - @Override
446.187 - protected boolean validate(Integer val) {
446.188 - int value = Integer.parseInt(val.toString());
446.189 - if (value < minInclusiveValue || value > maxInclusiveValue) {
446.190 - String errMsg = NbBundle.getMessage(getClass(),
446.191 - "MSG_INVALID_INTEGER", value, // NOI18N
446.192 - minInclusiveValue, maxInclusiveValue);
446.193 - NotifyDescriptor d = new NotifyDescriptor.Message(
446.194 - errMsg, NotifyDescriptor.ERROR_MESSAGE);
446.195 - DialogDisplayer.getDefault().notify(d);
446.196 - return false;
446.197 - }
446.198 -
446.199 - return true;
446.200 - }
446.201 - };
446.202 - }
446.203 -
446.204 - private static PropertySupport getBooleanPropertySupport(
446.205 - PropertySheetOwner propertySheetOwner,
446.206 - Attribute attr,
446.207 - MBeanAttributeInfo info) {
446.208 -
446.209 - return new SchemaBasedConfigPropertySupport<Boolean>(
446.210 - propertySheetOwner, Boolean.class, attr, info);
446.211 - }
446.212 -
446.213 - private static PropertySupport getSimpleStringPropertySupport(
446.214 - final PropertySheetOwner propertySheetOwner,
446.215 - final Attribute attr,
446.216 - final MBeanAttributeInfo info) {
446.217 -
446.218 - return new SchemaBasedConfigPropertySupport<String>(
446.219 - propertySheetOwner, String.class, attr, info) {
446.220 -
446.221 - @Override
446.222 - public PropertyEditor getPropertyEditor() {
446.223 - if (info instanceof JBIComponentConfigurationMBeanAttributeInfo &&
446.224 - ((JBIComponentConfigurationMBeanAttributeInfo) info).isEncrypted()) {
446.225 - return new PasswordEditor();
446.226 - } else {
446.227 - return super.getPropertyEditor();
446.228 - }
446.229 - }
446.230 - };
446.231 - }
446.232 -}
447.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/OldSchemaBasedConfigPropertySupportFactory.java Sat Jan 26 03:07:46 2008 +0000
447.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
447.3 @@ -1,414 +0,0 @@
447.4 -/*
447.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
447.6 - *
447.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
447.8 - *
447.9 - * The contents of this file are subject to the terms of either the GNU
447.10 - * General Public License Version 2 only ("GPL") or the Common
447.11 - * Development and Distribution License("CDDL") (collectively, the
447.12 - * "License"). You may not use this file except in compliance with the
447.13 - * License. You can obtain a copy of the License at
447.14 - * http://www.netbeans.org/cddl-gplv2.html
447.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
447.16 - * specific language governing permissions and limitations under the
447.17 - * License. When distributing the software, include this License Header
447.18 - * Notice in each file and include the License file at
447.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
447.20 - * particular file as subject to the "Classpath" exception as provided
447.21 - * by Sun in the GPL Version 2 section of the License file that
447.22 - * accompanied this code. If applicable, add the following below the
447.23 - * License Header, with the fields enclosed by brackets [] replaced by
447.24 - * your own identifying information:
447.25 - * "Portions Copyrighted [year] [name of copyright owner]"
447.26 - *
447.27 - * Contributor(s):
447.28 - *
447.29 - * The Original Software is NetBeans. The Initial Developer of the Original
447.30 - * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
447.31 - * Microsystems, Inc. All Rights Reserved.
447.32 - *
447.33 - * If you wish your version of this file to be governed by only the CDDL
447.34 - * or only the GPL Version 2, indicate your decision by adding
447.35 - * "[Contributor] elects to include this software in this distribution
447.36 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
447.37 - * single choice of license, a recipient has the option to distribute
447.38 - * your version of this file under either the CDDL, the GPL Version 2 or
447.39 - * to extend the choice of license to its licensees as provided above.
447.40 - * However, if you add GPL Version 2 code and therefore, elected the GPL
447.41 - * Version 2 license, then the option applies only if the new code is
447.42 - * made subject to such option by the copyright holder.
447.43 - */
447.44 -package org.netbeans.modules.sun.manager.jbi.nodes.property;
447.45 -
447.46 -import java.beans.PropertyEditor;
447.47 -import java.io.File;
447.48 -import java.io.IOException;
447.49 -import java.net.URI;
447.50 -import java.util.Collection;
447.51 -import java.util.HashMap;
447.52 -import java.util.List;
447.53 -import javax.management.Attribute;
447.54 -import javax.management.MBeanAttributeInfo;
447.55 -import javax.swing.text.Document;
447.56 -import javax.swing.text.PlainDocument;
447.57 -import javax.xml.namespace.QName;
447.58 -import org.netbeans.modules.sun.manager.jbi.editors.ComboBoxPropertyEditor;
447.59 -import org.netbeans.modules.sun.manager.jbi.editors.PasswordEditor;
447.60 -import org.netbeans.modules.sun.manager.jbi.nodes.JBIComponentNode;
447.61 -import org.netbeans.modules.sun.manager.jbi.management.OldConfigurationMBeanAttributeInfo;
447.62 -import org.netbeans.modules.sun.manager.jbi.nodes.AppserverJBIMgmtNode;
447.63 -import org.netbeans.modules.xml.schema.model.ComplexTypeDefinition;
447.64 -import org.netbeans.modules.xml.schema.model.Element;
447.65 -import org.netbeans.modules.xml.schema.model.Enumeration;
447.66 -import org.netbeans.modules.xml.schema.model.Extension;
447.67 -import org.netbeans.modules.xml.schema.model.GlobalComplexType;
447.68 -import org.netbeans.modules.xml.schema.model.GlobalSimpleType;
447.69 -import org.netbeans.modules.xml.schema.model.MaxExclusive;
447.70 -import org.netbeans.modules.xml.schema.model.MaxInclusive;
447.71 -import org.netbeans.modules.xml.schema.model.MinExclusive;
447.72 -import org.netbeans.modules.xml.schema.model.MinInclusive;
447.73 -import org.netbeans.modules.xml.schema.model.Schema;
447.74 -import org.netbeans.modules.xml.schema.model.SchemaModel;
447.75 -import org.netbeans.modules.xml.schema.model.SchemaModelFactory;
447.76 -import org.netbeans.modules.xml.schema.model.SimpleContent;
447.77 -import org.netbeans.modules.xml.schema.model.SimpleTypeRestriction;
447.78 -import org.netbeans.modules.xml.xam.ModelSource;
447.79 -import org.netbeans.modules.xml.xam.dom.ReadOnlyAccess;
447.80 -import org.netbeans.modules.xml.xam.locator.CatalogModel;
447.81 -import org.netbeans.modules.xml.xam.locator.CatalogModelException;
447.82 -import org.openide.DialogDisplayer;
447.83 -import org.openide.NotifyDescriptor;
447.84 -import org.openide.nodes.PropertySupport;
447.85 -import org.openide.util.Lookup;
447.86 -import org.openide.util.NbBundle;
447.87 -import org.openide.util.lookup.Lookups;
447.88 -import org.w3c.dom.ls.LSInput;
447.89 -import org.xml.sax.InputSource;
447.90 -import org.xml.sax.SAXException;
447.91 -
447.92 -/**
447.93 - * Helper class to provide schema-based property support for JBI Component
447.94 - * configuration.
447.95 - *
447.96 - * The schema that is currently supported is nothing fancy. There is no
447.97 - * include/import, no entity, etc.
447.98 - *
447.99 - * @author jqian
447.100 - */
447.101 -public class OldSchemaBasedConfigPropertySupportFactory {
447.102 -
447.103 - private static MyCatalogModel catalogModel = new MyCatalogModel();
447.104 -
447.105 - public static PropertySupport getPropertySupport(
447.106 - String schemaText,
447.107 - String compName,
447.108 - final AppserverJBIMgmtNode componentNode,
447.109 - final Attribute attr,
447.110 - final MBeanAttributeInfo info) {
447.111 - Schema schema = getSchema(schemaText, compName);
447.112 - return getPropertySupport(schema, componentNode, attr, info);
447.113 - }
447.114 -
447.115 - /*private*/ static PropertySupport getPropertySupport(
447.116 - Schema schema,
447.117 - final AppserverJBIMgmtNode componentNode,
447.118 - final Attribute attr,
447.119 - final MBeanAttributeInfo info) {
447.120 -
447.121 - String elementName = attr.getName();
447.122 - String simpleTypeName = getGlobalSimpleTypeName(schema, elementName);
447.123 - //System.out.println("elementName: " + elementName + " simpleTypeName: " + simpleTypeName);
447.124 -
447.125 - if (simpleTypeName == null) {
447.126 - return null;
447.127 - } else if (simpleTypeName.endsWith("boolean")) { // NOI18N // ignore ns
447.128 - return getBooleanPropertySupport(componentNode, attr, info);
447.129 - } else if (simpleTypeName.endsWith("int")) { // NOI18N
447.130 - return getIntegerPropertySupport(componentNode, attr, info, null);
447.131 - } else if (simpleTypeName.endsWith("string")) { // NOI18N
447.132 - return getStringPropertySupport(componentNode, attr, info, null);
447.133 - }
447.134 -
447.135 - for (GlobalSimpleType gst : schema.getSimpleTypes()) {
447.136 - if (simpleTypeName.endsWith(gst.getName())) {
447.137 - SimpleTypeRestriction restriction =
447.138 - gst.getChildren(SimpleTypeRestriction.class).get(0);
447.139 - GlobalSimpleType baseSimpleType = restriction.getBase().get();
447.140 - String baseSimpleTypeName = baseSimpleType.getName();
447.141 -
447.142 - if (baseSimpleTypeName.equals("int")) { // NOI18N
447.143 - return getIntegerPropertySupport(
447.144 - componentNode, attr, info, restriction);
447.145 - } else if (baseSimpleTypeName.equals("string")) { // NOI18N
447.146 - return getStringPropertySupport(
447.147 - componentNode, attr, info, restriction);
447.148 - } else {
447.149 - throw new RuntimeException("TODO: Unsupported schema base type: " + // NOI18N
447.150 - baseSimpleTypeName + ". Pleae file a IssueZilla ticket.");
447.151 - }
447.152 - }
447.153 - }
447.154 -
447.155 - return null;
447.156 - }
447.157 -
447.158 - private static PropertySupport getBooleanPropertySupport(
447.159 - AppserverJBIMgmtNode componentNode,
447.160 - Attribute attr,
447.161 - MBeanAttributeInfo info) {
447.162 -
447.163 - return new SchemaBasedConfigPropertySupport<Boolean>(
447.164 - componentNode, Boolean.class, attr, info);
447.165 - }
447.166 -
447.167 - private static PropertySupport getStringPropertySupport(
447.168 - final AppserverJBIMgmtNode componentNode,
447.169 - final Attribute attr,
447.170 - final MBeanAttributeInfo info,
447.171 - final SimpleTypeRestriction restriction) {
447.172 -
447.173 - if (restriction == null) {
447.174 - return getSimpleStringPropertySupport(componentNode, attr, info);
447.175 - } else {
447.176 - Collection enumerations = restriction.getEnumerations();
447.177 - if (enumerations.size() == 0) {
447.178 - return getSimpleStringPropertySupport(componentNode, attr, info);
447.179 - } else {
447.180 - final String[] validValues = new String[enumerations.size()];
447.181 - int i = 0;
447.182 - for (Enumeration enumeration : restriction.getEnumerations()) {
447.183 - validValues[i++] = enumeration.getValue();
447.184 - }
447.185 - return getEnumeratedStringPropertySupport(
447.186 - componentNode, attr, info, validValues);
447.187 - }
447.188 - }
447.189 - }
447.190 -
447.191 - private static PropertySupport getSimpleStringPropertySupport(
447.192 - final AppserverJBIMgmtNode componentNode,
447.193 - final Attribute attr,
447.194 - final MBeanAttributeInfo info) {
447.195 -
447.196 - return new SchemaBasedConfigPropertySupport<String>(
447.197 - componentNode, String.class, attr, info) {
447.198 - @Override
447.199 - public PropertyEditor getPropertyEditor() {
447.200 - if (info instanceof OldConfigurationMBeanAttributeInfo &&
447.201 - ((OldConfigurationMBeanAttributeInfo)info).isPassword()) {
447.202 - return new PasswordEditor();
447.203 - } else {
447.204 - return super.getPropertyEditor();
447.205 - }
447.206 - }
447.207 - };
447.208 - }
447.209 -
447.210 - public static PropertySupport getEnumeratedStringPropertySupport(
447.211 - final AppserverJBIMgmtNode componentNode,
447.212 - final Attribute attr,
447.213 - final MBeanAttributeInfo info,
447.214 - final String[] validValues) {
447.215 -
447.216 - return new SchemaBasedConfigPropertySupport<String>(
447.217 - componentNode, String.class, attr, info) {
447.218 - @Override
447.219 - public PropertyEditor getPropertyEditor() {
447.220 - return new ComboBoxPropertyEditor(validValues);
447.221 - }
447.222 - };
447.223 - }
447.224 -
447.225 - public static PropertySupport getIntegerPropertySupport(
447.226 - final AppserverJBIMgmtNode componentNode,
447.227 - final Attribute attr,
447.228 - final MBeanAttributeInfo info,
447.229 - final int minInclusiveValue,
447.230 - final int maxInclusiveValue) {
447.231 -
447.232 - return new SchemaBasedConfigPropertySupport<Integer>(
447.233 - componentNode, Integer.class, attr, info) {
447.234 -
447.235 - @Override
447.236 - public Integer getValue() {
447.237 - // friendly reminder for now
447.238 - if (attr.getValue() instanceof String) {
447.239 - String msg = "The component's configuration schema indicates this attribute is of type 'int'." + // NOI18N
447.240 - " However, the MBean attribute is of type 'string'. Please fix the component."; // NOI18N
447.241 - throw new ClassCastException(msg);
447.242 - }
447.243 - return super.getValue();
447.244 - }
447.245 -
447.246 - @Override
447.247 - protected boolean validate(Integer val) {
447.248 - int value = Integer.parseInt(val.toString());
447.249 - if (value < minInclusiveValue || value > maxInclusiveValue) {
447.250 - String errMsg = NbBundle.getMessage(getClass(),
447.251 - "MSG_INVALID_INTEGER", value, // NOI18N
447.252 - minInclusiveValue, maxInclusiveValue);
447.253 - NotifyDescriptor d = new NotifyDescriptor.Message(
447.254 - errMsg, NotifyDescriptor.ERROR_MESSAGE);
447.255 - DialogDisplayer.getDefault().notify(d);
447.256 - return false;
447.257 - }
447.258 -
447.259 - return true;
447.260 - }
447.261 - };
447.262 - }
447.263 -
447.264 - private static PropertySupport getIntegerPropertySupport(
447.265 - final AppserverJBIMgmtNode componentNode,
447.266 - final Attribute attr,
447.267 - final MBeanAttributeInfo info,
447.268 - final SimpleTypeRestriction restriction) {
447.269 -
447.270 - int minInclusiveValue = Integer.MIN_VALUE;
447.271 - int maxInclusiveValue = Integer.MAX_VALUE;
447.272 -
447.273 - if (restriction != null) {
447.274 - Collection<MinInclusive> minInclusives = restriction.getMinInclusives();
447.275 - if (minInclusives.size() == 1) {
447.276 - MinInclusive minInclusive = minInclusives.iterator().next();
447.277 - minInclusiveValue = Integer.parseInt(minInclusive.getValue());
447.278 - }
447.279 -
447.280 - Collection<MinExclusive> minExclusives = restriction.getMinExclusives();
447.281 - if (minExclusives.size() == 1) {
447.282 - MinExclusive minExclusive = minExclusives.iterator().next();
447.283 - minInclusiveValue = Integer.parseInt(minExclusive.getValue()) + 1;
447.284 - }
447.285 -
447.286 - Collection<MaxInclusive> maxInclusives = restriction.getMaxInclusives();
447.287 - if (maxInclusives.size() == 1) {
447.288 - MaxInclusive maxInclusive = maxInclusives.iterator().next();
447.289 - maxInclusiveValue = Integer.parseInt(maxInclusive.getValue());
447.290 - }
447.291 -
447.292 - Collection<MaxExclusive> maxExclusives = restriction.getMaxExclusives();
447.293 - if (maxExclusives.size() == 1) {
447.294 - MaxExclusive maxExclusive = maxExclusives.iterator().next();
447.295 - maxInclusiveValue = Integer.parseInt(maxExclusive.getValue()) - 1;
447.296 - }
447.297 - }
447.298 -
447.299 - return getIntegerPropertySupport(
447.300 - componentNode, attr, info, minInclusiveValue, maxInclusiveValue);
447.301 - }
447.302 -
447.303 -
447.304 - static Schema getSchema(String schemaText, String compName) {
447.305 - SchemaModelFactory factory = SchemaModelFactory.getDefault();
447.306 - ModelSource modelSource = loadModel(schemaText, compName, compName, false);
447.307 - SchemaModel schemaModel = factory.getModel(modelSource);
447.308 - Schema schema = schemaModel.getSchema();
447.309 - return schema;
447.310 - }
447.311 -
447.312 - static String getGlobalSimpleTypeName(Schema schema, String elementName) {
447.313 -
447.314 - String type = null;
447.315 - for (GlobalComplexType gct : schema.getComplexTypes()) {
447.316 - if (gct.getName().equals("ConfigurationType")) { // NOI18N
447.317 - ComplexTypeDefinition ctd = gct.getDefinition();
447.318 - for (Element element : ctd.getChildren(Element.class)) {
447.319 - String name = element.getAnyAttribute(new QName("name")); // NOI18N
447.320 - if (name.equals(elementName)) {
447.321 - type = element.getAnyAttribute(new QName("type")); // NOI18N
447.322 - break;
447.323 - }
447.324 - }
447.325 - if (type != null) {
447.326 - break;
447.327 - }
447.328 - }
447.329 - }
447.330 -
447.331 - if (type == null) {
447.332 - return null;
447.333 - }
447.334 -
447.335 - String base = null;
447.336 - for (GlobalComplexType gct : schema.getComplexTypes()) {
447.337 - if (type.endsWith(gct.getName())) { // ignore ns
447.338 - List<SimpleContent> scList = gct.getChildren(SimpleContent.class);
447.339 - if (scList.size() > 0) { // ==1 ?
447.340 - SimpleContent sc = scList.get(0);
447.341 - Extension ext = sc.getChildren(Extension.class).get(0);
447.342 - base = ext.getAnyAttribute(new QName("base")); // NOI18N
447.343 - break;
447.344 - }
447.345 -
447.346 -// List<Sequence> seqList = gct.getChildren(Sequence.class);
447.347 -// if (seqList.size() > 0) { // ==1 ?
447.348 -// Sequence seq = seqList.get(0);
447.349 -// seq.getChildren();
447.350 -// break;
447.351 -// }
447.352 - }
447.353 - }
447.354 -
447.355 - return base;
447.356 - }
447.357 -
447.358 - private static ModelSource loadModel(String schemaText,
447.359 - String baseURI, String key, boolean editable) {
447.360 - ModelSource model = null;
447.361 - try {
447.362 - Document document = new PlainDocument();
447.363 - document.insertString(0, schemaText, null);
447.364 -
447.365 - File fakeFile = new File(key);
447.366 -
447.367 - Lookup lookup = Lookups.fixed(new Object[]{
447.368 - document, catalogModel, fakeFile,
447.369 - ReadOnlyAccess.Provider.getInstance()});
447.370 -
447.371 - model = new ModelSource(lookup, editable);
447.372 - // System.out.println("Model created: "+baseURI+", "+model);
447.373 -
447.374 - catalogModel.addModelSource(new URI(baseURI), model);
447.375 - } catch(Exception ex) {
447.376 - System.out.println(ex);
447.377 - model = null;
447.378 - }
447.379 -
447.380 - return model;
447.381 - }
447.382 -
447.383 - private static class MyCatalogModel implements CatalogModel {
447.384 -
447.385 - private HashMap<URI, ModelSource> msMap = new HashMap<URI, ModelSource>();
447.386 -
447.387 - MyCatalogModel() {
447.388 - super();
447.389 - }
447.390 -
447.391 - public void addModelSource(URI loc, ModelSource ms) {
447.392 - msMap.put(loc, ms);
447.393 - }
447.394 -
447.395 - public ModelSource getModelSource(URI locationURI)
447.396 - throws CatalogModelException {
447.397 - return msMap.get(locationURI);
447.398 - }
447.399 -
447.400 - public ModelSource getModelSource(URI locationURI,
447.401 - ModelSource modelSourceOfSourceDocument)
447.402 - throws CatalogModelException {
447.403 - return getModelSource(locationURI);
447.404 - }
447.405 -
447.406 - public InputSource resolveEntity(String publicId, String systemId)
447.407 - throws SAXException, IOException {
447.408 - return null;
447.409 - }
447.410 -
447.411 - public LSInput resolveResource(String type, String namespaceURI,
447.412 - String publicId, String systemId, String baseURI) {
447.413 - return null;
447.414 - }
447.415 - }
447.416 -
447.417 -}
448.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/PropertySheetOwner.java Sat Jan 26 03:07:46 2008 +0000
448.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
448.3 @@ -1,51 +0,0 @@
448.4 -/*
448.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
448.6 - *
448.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
448.8 - *
448.9 - * The contents of this file are subject to the terms of either the GNU
448.10 - * General Public License Version 2 only ("GPL") or the Common
448.11 - * Development and Distribution License("CDDL") (collectively, the
448.12 - * "License"). You may not use this file except in compliance with the
448.13 - * License. You can obtain a copy of the License at
448.14 - * http://www.netbeans.org/cddl-gplv2.html
448.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
448.16 - * specific language governing permissions and limitations under the
448.17 - * License. When distributing the software, include this License Header
448.18 - * Notice in each file and include the License file at
448.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
448.20 - * particular file as subject to the "Classpath" exception as provided
448.21 - * by Sun in the GPL Version 2 section of the License file that
448.22 - * accompanied this code. If applicable, add the following below the
448.23 - * License Header, with the fields enclosed by brackets [] replaced by
448.24 - * your own identifying information:
448.25 - * "Portions Copyrighted [year] [name of copyright owner]"
448.26 - *
448.27 - * If you wish your version of this file to be governed by only the CDDL
448.28 - * or only the GPL Version 2, indicate your decision by adding
448.29 - * "[Contributor] elects to include this software in this distribution
448.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
448.31 - * single choice of license, a recipient has the option to distribute
448.32 - * your version of this file under either the CDDL, the GPL Version 2 or
448.33 - * to extend the choice of license to its licensees as provided above.
448.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
448.35 - * Version 2 license, then the option applies only if the new code is
448.36 - * made subject to such option by the copyright holder.
448.37 - *
448.38 - * Contributor(s):
448.39 - *
448.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
448.41 - */
448.42 -
448.43 -package org.netbeans.modules.sun.manager.jbi.nodes.property;
448.44 -
448.45 -import javax.management.Attribute;
448.46 -
448.47 -/**
448.48 - *
448.49 - * @author jqian
448.50 - */
448.51 -public interface PropertySheetOwner {
448.52 -
448.53 - public Attribute setSheetProperty(String attrName, Object value);
448.54 -}
449.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/SchemaBasedConfigPropertySupport.java Sat Jan 26 03:07:46 2008 +0000
449.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/SchemaBasedConfigPropertySupport.java Sat Jan 26 05:58:37 2008 +0000
449.3 @@ -47,7 +47,7 @@
449.4 import javax.management.MBeanAttributeInfo;
449.5 import javax.swing.SwingUtilities;
449.6 import org.netbeans.modules.sun.manager.jbi.management.AppserverJBIMgmtController;
449.7 -import org.netbeans.modules.sun.manager.jbi.management.OldConfigurationMBeanAttributeInfo;
449.8 +import org.netbeans.modules.sun.manager.jbi.management.ConfigurationMBeanAttributeInfo;
449.9 import org.netbeans.modules.sun.manager.jbi.management.wrapper.api.RuntimeManagementServiceWrapper;
449.10 import org.netbeans.modules.sun.manager.jbi.nodes.AppserverJBIMgmtNode;
449.11 import org.netbeans.modules.sun.manager.jbi.util.DoNotShowAgainMessage;
449.12 @@ -74,10 +74,9 @@
449.13 protected Attribute attr;
449.14 protected MBeanAttributeInfo info;
449.15 protected AppserverJBIMgmtNode componentNode;
449.16 - private PropertySheetOwner propertySheetOwner;
449.17
449.18 SchemaBasedConfigPropertySupport(
449.19 - PropertySheetOwner propertySheetOwner,
449.20 + AppserverJBIMgmtNode componentNode,
449.21 Class<T> type,
449.22 Attribute attr,
449.23 MBeanAttributeInfo info) {
449.24 @@ -91,12 +90,7 @@
449.25
449.26 this.attr = attr;
449.27 this.info = info;
449.28 -
449.29 - this.propertySheetOwner = propertySheetOwner;
449.30 -
449.31 - if (propertySheetOwner instanceof AppserverJBIMgmtNode) {
449.32 - this.componentNode = (AppserverJBIMgmtNode) propertySheetOwner;
449.33 - }
449.34 + this.componentNode = componentNode;
449.35 }
449.36
449.37 @SuppressWarnings(value = "unchecked")
449.38 @@ -130,14 +124,8 @@
449.39
449.40 try {
449.41 if (validate(newValue)) {
449.42 - if (propertySheetOwner != null) {
449.43 - attr = propertySheetOwner.setSheetProperty(getName(), newValue);
449.44 - } else {
449.45 - attr = componentNode.setSheetProperty(getName(), newValue);
449.46 - }
449.47 - if (componentNode != null) {
449.48 - checkForPromptToRestart();
449.49 - }
449.50 + attr = componentNode.setSheetProperty(getName(), newValue);
449.51 + checkForPromptToRestart();
449.52 }
449.53 } catch (Exception ex) {
449.54 NotifyDescriptor d = new NotifyDescriptor.Message(
449.55 @@ -157,10 +145,10 @@
449.56
449.57 SwingUtilities.invokeLater(new Runnable() {
449.58 public void run() {
449.59 - if (info instanceof OldConfigurationMBeanAttributeInfo) {
449.60 + if (info instanceof ConfigurationMBeanAttributeInfo) {
449.61
449.62 - OldConfigurationMBeanAttributeInfo myInfo =
449.63 - (OldConfigurationMBeanAttributeInfo)info;
449.64 + ConfigurationMBeanAttributeInfo myInfo =
449.65 + (ConfigurationMBeanAttributeInfo)info;
449.66
449.67 DoNotShowAgainMessage d;
449.68
450.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
450.2 +++ b/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/property/SchemaBasedConfigPropertySupportFactory.java Sat Jan 26 05:58:37 2008 +0000
450.3 @@ -0,0 +1,414 @@
450.4 +/*
450.5 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
450.6 + *
450.7 + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
450.8 + *
450.9 + * The contents of this file are subject to the terms of either the GNU
450.10 + * General Public License Version 2 only ("GPL") or the Common
450.11 + * Development and Distribution License("CDDL") (collectively, the
450.12 + * "License"). You may not use this file except in compliance with the
450.13 + * License. You can obtain a copy of the License at
450.14 + * http://www.netbeans.org/cddl-gplv2.html
450.15 + * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
450.16 + * specific language governing permissions and limitations under the
450.17 + * License. When distributing the software, include this License Header
450.18 + * Notice in each file and include the License file at
450.19 + * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
450.20 + * particular file as subject to the "Classpath" exception as provided
450.21 + * by Sun in the GPL Version 2 section of the License file that
450.22 + * accompanied this code. If applicable, add the following below the
450.23 + * License Header, with the fields enclosed by brackets [] replaced by
450.24 + * your own identifying information:
450.25 + * "Portions Copyrighted [year] [name of copyright owner]"
450.26 + *
450.27 + * Contributor(s):
450.28 + *
450.29 + * The Original Software is NetBeans. The Initial Developer of the Original
450.30 + * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
450.31 + * Microsystems, Inc. All Rights Reserved.
450.32 + *
450.33 + * If you wish your version of this file to be governed by only the CDDL
450.34 + * or only the GPL Version 2, indicate your decision by adding
450.35 + * "[Contributor] elects to include this software in this distribution
450.36 + * under the [CDDL or GPL Version 2] license." If you do not indicate a
450.37 + * single choice of license, a recipient has the option to distribute
450.38 + * your version of this file under either the CDDL, the GPL Version 2 or
450.39 + * to extend the choice of license to its licensees as provided above.
450.40 + * However, if you add GPL Version 2 code and therefore, elected the GPL
450.41 + * Version 2 license, then the option applies only if the new code is
450.42 + * made subject to such option by the copyright holder.
450.43 + */
450.44 +package org.netbeans.modules.sun.manager.jbi.nodes.property;
450.45 +
450.46 +import java.beans.PropertyEditor;
450.47 +import java.io.File;
450.48 +import java.io.IOException;
450.49 +import java.net.URI;
450.50 +import java.util.Collection;
450.51 +import java.util.HashMap;
450.52 +import java.util.List;
450.53 +import javax.management.Attribute;
450.54 +import javax.management.MBeanAttributeInfo;
450.55 +import javax.swing.text.Document;
450.56 +import javax.swing.text.PlainDocument;
450.57 +import javax.xml.namespace.QName;
450.58 +import org.netbeans.modules.sun.manager.jbi.editors.ComboBoxPropertyEditor;
450.59 +import org.netbeans.modules.sun.manager.jbi.editors.PasswordEditor;
450.60 +import org.netbeans.modules.sun.manager.jbi.nodes.JBIComponentNode;
450.61 +import org.netbeans.modules.sun.manager.jbi.management.ConfigurationMBeanAttributeInfo;
450.62 +import org.netbeans.modules.sun.manager.jbi.nodes.AppserverJBIMgmtNode;
450.63 +import org.netbeans.modules.xml.schema.model.ComplexTypeDefinition;
450.64 +import org.netbeans.modules.xml.schema.model.Element;
450.65 +import org.netbeans.modules.xml.schema.model.Enumeration;
450.66 +import org.netbeans.modules.xml.schema.model.Extension;
450.67 +import org.netbeans.modules.xml.schema.model.GlobalComplexType;
450.68 +import org.netbeans.modules.xml.schema.model.GlobalSimpleType;
450.69 +import org.netbeans.modules.xml.schema.model.MaxExclusive;
450.70 +import org.netbeans.modules.xml.schema.model.MaxInclusive;
450.71 +import org.netbeans.modules.xml.schema.model.MinExclusive;
450.72 +import org.netbeans.modules.xml.schema.model.MinInclusive;
450.73 +import org.netbeans.modules.xml.schema.model.Schema;
450.74 +import org.netbeans.modules.xml.schema.model.SchemaModel;
450.75 +import org.netbeans.modules.xml.schema.model.SchemaModelFactory;
450.76 +import org.netbeans.modules.xml.schema.model.SimpleContent;
450.77 +import org.netbeans.modules.xml.schema.model.SimpleTypeRestriction;
450.78 +import org.netbeans.modules.xml.xam.ModelSource;
450.79 +import org.netbeans.modules.xml.xam.dom.ReadOnlyAccess;
450.80 +import org.netbeans.modules.xml.xam.locator.CatalogModel;
450.81 +import org.netbeans.modules.xml.xam.locator.CatalogModelException;
450.82 +import org.openide.DialogDisplayer;
450.83 +import org.openide.NotifyDescriptor;
450.84 +import org.openide.nodes.PropertySupport;
450.85 +import org.openide.util.Lookup;
450.86 +import org.openide.util.NbBundle;
450.87 +import org.openide.util.lookup.Lookups;
450.88 +import org.w3c.dom.ls.LSInput;
450.89 +import org.xml.sax.InputSource;
450.90 +import org.xml.sax.SAXException;
450.91 +
450.92 +/**
450.93 + * Helper class to provide schema-based property support for JBI Component
450.94 + * configuration.
450.95 + *
450.96 + * The schema that is currently supported is nothing fancy. There is no
450.97 + * include/import, no entity, etc.
450.98 + *
450.99 + * @author jqian
450.100 + */
450.101 +public class SchemaBasedConfigPropertySupportFactory {
450.102 +
450.103 + private static MyCatalogModel catalogModel = new MyCatalogModel();
450.104 +
450.105 + public static PropertySupport getPropertySupport(
450.106 + String schemaText,
450.107 + String compName,
450.108 + final AppserverJBIMgmtNode componentNode,
450.109 + final Attribute attr,
450.110 + final MBeanAttributeInfo info) {
450.111 + Schema schema = getSchema(schemaText, compName);
450.112 + return getPropertySupport(schema, componentNode, attr, info);
450.113 + }
450.114 +
450.115 + /*private*/ static PropertySupport getPropertySupport(
450.116 + Schema schema,
450.117 + final AppserverJBIMgmtNode componentNode,
450.118 + final Attribute attr,
450.119 + final MBeanAttributeInfo info) {
450.120 +
450.121 + String elementName = attr.getName();
450.122 + String simpleTypeName = getGlobalSimpleTypeName(schema, elementName);
450.123 + //System.out.println("elementName: " + elementName + " simpleTypeName: " + simpleTypeName);
450.124 +
450.125 + if (simpleTypeName == null) {
450.126 + return null;
450.127 + } else if (simpleTypeName.endsWith("boolean")) { // NOI18N // ignore ns
450.128 + return getBooleanPropertySupport(componentNode, attr, info);
450.129 + } else if (simpleTypeName.endsWith("int")) { // NOI18N
450.130 + return getIntegerPropertySupport(componentNode, attr, info, null);
450.131 + } else if (simpleTypeName.endsWith("string")) { // NOI18N
450.132 + return getStringPropertySupport(componentNode, attr, info, null);
450.133 + }
450.134 +
450.135 + for (GlobalSimpleType gst : schema.getSimpleTypes()) {
450.136 + if (simpleTypeName.endsWith(gst.getName())) {
450.137 + SimpleTypeRestriction restriction =
450.138 + gst.getChildren(SimpleTypeRestriction.class).get(0);
450.139 + GlobalSimpleType baseSimpleType = restriction.getBase().get();
450.140 + String baseSimpleTypeName = baseSimpleType.getName();
450.141 +
450.142 + if (baseSimpleTypeName.equals("int")) { // NOI18N
450.143 + return getIntegerPropertySupport(
450.144 + componentNode, attr, info, restriction);
450.145 + } else if (baseSimpleTypeName.equals("string")) { // NOI18N
450.146 + return getStringPropertySupport(
450.147 + componentNode, attr, info, restriction);
450.148 + } else {
450.149 + throw new RuntimeException("TODO: Unsupported schema base type: " + // NOI18N
450.150 + baseSimpleTypeName + ". Pleae file a IssueZilla ticket.");
450.151 + }
450.152 + }
450.153 + }
450.154 +
450.155 + return null;
450.156 + }
450.157 +
450.158 + private static PropertySupport getBooleanPropertySupport(
450.159 + AppserverJBIMgmtNode componentNode,
450.160 + Attribute attr,
450.161 + MBeanAttributeInfo info) {
450.162 +
450.163 + return new SchemaBasedConfigPropertySupport<Boolean>(
450.164 + componentNode, Boolean.class, attr, info);
450.165 + }
450.166 +
450.167 + private static PropertySupport getStringPropertySupport(
450.168 + final AppserverJBIMgmtNode componentNode,
450.169 + final Attribute attr,
450.170 + final MBeanAttributeInfo info,
450.171 + final SimpleTypeRestriction restriction) {
450.172 +
450.173 + if (restriction == null) {
450.174 + return getSimpleStringPropertySupport(componentNode, attr, info);
450.175 + } else {
450.176 + Collection enumerations = restriction.getEnumerations();
450.177 + if (enumerations.size() == 0) {
450.178 + return getSimpleStringPropertySupport(componentNode, attr, info);
450.179 + } else {
450.180 + final String[] validValues = new String[enumerations.size()];
450.181 + int i = 0;
450.182 + for (Enumeration enumeration : restriction.getEnumerations()) {
450.183 + validValues[i++] = enumeration.getValue();
450.184 + }
450.185 + return getEnumeratedStringPropertySupport(
450.186 + componentNode, attr, info, validValues);
450.187 + }
450.188 + }
450.189 + }
450.190 +
450.191 + private static PropertySupport getSimpleStringPropertySupport(
450.192 + final AppserverJBIMgmtNode componentNode,
450.193 + final Attribute attr,
450.194 + final MBeanAttributeInfo info) {
450.195 +
450.196 + return new SchemaBasedConfigPropertySupport<String>(
450.197 + componentNode, String.class, attr, info) {
450.198 + @Override
450.199 + public PropertyEditor getPropertyEditor() {
450.200 + if (info instanceof ConfigurationMBeanAttributeInfo &&
450.201 + ((ConfigurationMBeanAttributeInfo)info).isPassword()) {
450.202 + return new PasswordEditor();
450.203 + } else {
450.204 + return super.getPropertyEditor();
450.205 + }
450.206 + }
450.207 + };
450.208 + }
450.209 +
450.210 + public static PropertySupport getEnumeratedStringPropertySupport(
450.211 + final AppserverJBIMgmtNode componentNode,
450.212 + final Attribute attr,
450.213 + final MBeanAttributeInfo info,
450.214 + final String[] validValues) {
450.215 +
450.216 + return new SchemaBasedConfigPropertySupport<String>(
450.217 + componentNode, String.class, attr, info) {
450.218 + @Override
450.219 + public PropertyEditor getPropertyEditor() {
450.220 + return new ComboBoxPropertyEditor(validValues);
450.221 + }
450.222 + };
450.223 + }
450.224 +
450.225 + public static PropertySupport getIntegerPropertySupport(
450.226 + final AppserverJBIMgmtNode componentNode,
450.227 + final Attribute attr,
450.228 + final MBeanAttributeInfo info,
450.229 + final int minInclusiveValue,
450.230 + final int maxInclusiveValue) {
450.231 +
450.232 + return new SchemaBasedConfigPropertySupport<Integer>(
450.233 + componentNode, Integer.class, attr, info) {
450.234 +
450.235 + @Override
450.236 + public Integer getValue() {
450.237 + // friendly reminder for now
450.238 + if (attr.getValue() instanceof String) {
450.239 + String msg = "The component's configuration schema indicates this attribute is of type 'int'." + // NOI18N
450.240 + " However, the MBean attribute is of type 'string'. Please fix the component."; // NOI18N
450.241 + throw new ClassCastException(msg);
450.242 + }
450.243 + return super.getValue();
450.244 + }
450.245 +
450.246 + @Override
450.247 + protected boolean validate(Integer val) {
450.248 + int value = Integer.parseInt(val.toString());
450.249 + if (value < minInclusiveValue || value > maxInclusiveValue) {
450.250 + String errMsg = NbBundle.getMessage(getClass(),
450.251 + "MSG_INVALID_INTEGER", value, // NOI18N
450.252 + minInclusiveValue, maxInclusiveValue);
450.253 + NotifyDescriptor d = new NotifyDescriptor.Message(
450.254 + errMsg, NotifyDescriptor.ERROR_MESSAGE);
450.255 + DialogDisplayer.getDefault().notify(d);
450.256 + return false;
450.257 + }
450.258 +
450.259 + return true;
450.260 + }
450.261 + };
450.262 + }
450.263 +
450.264 + private static PropertySupport getIntegerPropertySupport(
450.265 + final AppserverJBIMgmtNode componentNode,
450.266 + final Attribute attr,
450.267 + final MBeanAttributeInfo info,
450.268 + final SimpleTypeRestriction restriction) {
450.269 +
450.270 + int minInclusiveValue = Integer.MIN_VALUE;
450.271 + int maxInclusiveValue = Integer.MAX_VALUE;
450.272 +
450.273 + if (restriction != null) {
450.274 + Collection<MinInclusive> minInclusives = restriction.getMinInclusives();
450.275 + if (minInclusives.size() == 1) {
450.276 + MinInclusive minInclusive = minInclusives.iterator().next();
450.277 + minInclusiveValue = Integer.parseInt(minInclusive.getValue());
450.278 + }
450.279 +
450.280 + Collection<MinExclusive> minExclusives = restriction.getMinExclusives();
450.281 + if (minExclusives.size() == 1) {
450.282 + MinExclusive minExclusive = minExclusives.iterator().next();
450.283 + minInclusiveValue = Integer.parseInt(minExclusive.getValue()) + 1;
450.284 + }
450.285 +
450.286 + Collection<MaxInclusive> maxInclusives = restriction.getMaxInclusives();
450.287 + if (maxInclusives.size() == 1) {
450.288 + MaxInclusive maxInclusive = maxInclusives.iterator().next();
450.289 + maxInclusiveValue = Integer.parseInt(maxInclusive.getValue());
450.290 + }
450.291 +
450.292 + Collection<MaxExclusive> maxExclusives = restriction.getMaxExclusives();
450.293 + if (maxExclusives.size() == 1) {
450.294 + MaxExclusive maxExclusive = maxExclusives.iterator().next();
450.295 + maxInclusiveValue = Integer.parseInt(maxExclusive.getValue()) - 1;
450.296 + }
450.297 + }
450.298 +
450.299 + return getIntegerPropertySupport(
450.300 + componentNode, attr, info, minInclusiveValue, maxInclusiveValue);
450.301 + }
450.302 +
450.303 +
450.304 + static Schema getSchema(String schemaText, String compName) {
450.305 + SchemaModelFactory factory = SchemaModelFactory.getDefault();
450.306 + ModelSource modelSource = loadModel(schemaText, compName, compName, false);
450.307 + SchemaModel schemaModel = factory.getModel(modelSource);
450.308 + Schema schema = schemaModel.getSchema();
450.309 + return schema;
450.310 + }
450.311 +
450.312 + static String getGlobalSimpleTypeName(Schema schema, String elementName) {
450.313 +
450.314 + String type = null;
450.315 + for (GlobalComplexType gct : schema.getComplexTypes()) {
450.316 + if (gct.getName().equals("ConfigurationType")) { // NOI18N
450.317 + ComplexTypeDefinition ctd = gct.getDefinition();
450.318 + for (Element element : ctd.getChildren(Element.class)) {
450.319 + String name = element.getAnyAttribute(new QName("name")); // NOI18N
450.320 + if (name.equals(elementName)) {
450.321 + type = element.getAnyAttribute(new QName("type")); // NOI18N
450.322 + break;
450.323 + }
450.324 + }
450.325 + if (type != null) {
450.326 + break;
450.327 + }
450.328 + }
450.329 + }
450.330 +
450.331 + if (type == null) {
450.332 + return null;
450.333 + }
450.334 +
450.335 + String base = null;
450.336 + for (GlobalComplexType gct : schema.getComplexTypes()) {
450.337 + if (type.endsWith(gct.getName())) { // ignore ns
450.338 + List<SimpleContent> scList = gct.getChildren(SimpleContent.class);
450.339 + if (scList.size() > 0) { // ==1 ?
450.340 + SimpleContent sc = scList.get(0);
450.341 + Extension ext = sc.getChildren(Extension.class).get(0);
450.342 + base = ext.getAnyAttribute(new QName("base")); // NOI18N
450.343 + break;
450.344 + }
450.345 +
450.346 +// List<Sequence> seqList = gct.getChildren(Sequence.class);
450.347 +// if (seqList.size() > 0) { // ==1 ?
450.348 +// Sequence seq = seqList.get(0);
450.349 +// seq.getChildren();
450.350 +// break;
450.351 +// }
450.352 + }
450.353 + }
450.354 +
450.355 + return base;
450.356 + }
450.357 +
450.358 + private static ModelSource loadModel(String schemaText,
450.359 + String baseURI, String key, boolean editable) {
450.360 + ModelSource model = null;
450.361 + try {
450.362 + Document document = new PlainDocument();
450.363 + document.insertString(0, schemaText, null);
450.364 +
450.365 + File fakeFile = new File(key);
450.366 +
450.367 + Lookup lookup = Lookups.fixed(new Object[]{
450.368 + document, catalogModel, fakeFile,
450.369 + ReadOnlyAccess.Provider.getInstance()});
450.370 +
450.371 + model = new ModelSource(lookup, editable);
450.372 + // System.out.println("Model created: "+baseURI+", "+model);
450.373 +
450.374 + catalogModel.addModelSource(new URI(baseURI), model);
450.375 + } catch(Exception ex) {
450.376 + System.out.println(ex);
450.377 + model = null;
450.378 + }
450.379 +
450.380 + return model;
450.381 + }
450.382 +
450.383 + private static class MyCatalogModel implements CatalogModel {
450.384 +
450.385 + private HashMap<URI, ModelSource> msMap = new HashMap<URI, ModelSource>();
450.386 +
450.387 + MyCatalogModel() {
450.388 + super();
450.389 + }
450.390 +
450.391 + public void addModelSource(URI loc, ModelSource ms) {
450.392 + msMap.put(loc, ms);
450.393 + }
450.394 +
450.395 + public ModelSource getModelSource(URI locationURI)
450.396 + throws CatalogModelException {
450.397 + return msMap.get(locationURI);
450.398 + }
450.399 +
450.400 + public ModelSource getModelSource(URI locationURI,
450.401 + ModelSource modelSourceOfSourceDocument)
450.402 + throws CatalogModelException {
450.403 + return getModelSource(locationURI);
450.404 + }
450.405 +
450.406 + public InputSource resolveEntity(String publicId, String systemId)
450.407 + throws SAXException, IOException {
450.408 + return null;
450.409 + }
450.410 +
450.411 + public LSInput resolveResource(String type, String namespaceURI,
450.412 + String publicId, String systemId, String baseURI) {
450.413 + return null;
450.414 + }
450.415 + }
450.416 +
450.417 +}
451.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/BindingComponent.png has changed
452.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/BindingComponentBadge.png has changed
453.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/JBI.png has changed
454.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/ServiceAssembly.png has changed
455.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/ServiceAssemblyBadge.png has changed
456.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/ServiceEngine.png has changed
457.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/ServiceEngineBadge.png has changed
458.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/ServiceUnit.png has changed
459.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/SharedLibrary.png has changed
460.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/SharedLibraryBadge.png has changed
461.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/down.png has changed
462.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/folder.png has changed
463.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/installed.jpg has changed
464.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/not_deployed.png has changed
465.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/unknown.png has changed
466.1 Binary file compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/nodes/resources/waiting.png has changed
467.1 --- a/compapp.manager.jbi/src/org/netbeans/modules/sun/manager/jbi/util/XmlUtil.java Sat Jan 26 03:07:46 2008 +0000
467.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
467.3 @@ -1,95 +0,0 @@
467.4 -/*
467.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
467.6 - *
467.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
467.8 - *
467.9 - * The contents of this file are subject to the terms of either the GNU
467.10 - * General Public License Version 2 only ("GPL") or the Common
467.11 - * Development and Distribution License("CDDL") (collectively, the
467.12 - * "License"). You may not use this file except in compliance with the
467.13 - * License. You can obtain a copy of the License at
467.14 - * http://www.netbeans.org/cddl-gplv2.html
467.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
467.16 - * specific language governing permissions and limitations under the
467.17 - * License. When distributing the software, include this License Header
467.18 - * Notice in each file and include the License file at
467.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
467.20 - * particular file as subject to the "Classpath" exception as provided
467.21 - * by Sun in the GPL Version 2 section of the License file that
467.22 - * accompanied this code. If applicable, add the following below the
467.23 - * License Header, with the fields enclosed by brackets [] replaced by
467.24 - * your own identifying information:
467.25 - * "Portions Copyrighted [year] [name of copyright owner]"
467.26 - *
467.27 - * If you wish your version of this file to be governed by only the CDDL
467.28 - * or only the GPL Version 2, indicate your decision by adding
467.29 - * "[Contributor] elects to include this software in this distribution
467.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
467.31 - * single choice of license, a recipient has the option to distribute
467.32 - * your version of this file under either the CDDL, the GPL Version 2 or
467.33 - * to extend the choice of license to its licensees as provided above.
467.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
467.35 - * Version 2 license, then the option applies only if the new code is
467.36 - * made subject to such option by the copyright holder.
467.37 - *
467.38 - * Contributor(s):
467.39 - *
467.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
467.41 - */
467.42 -
467.43 -package org.netbeans.modules.sun.manager.jbi.util;
467.44 -
467.45 -import javax.xml.namespace.QName;
467.46 -import org.w3c.dom.Attr;
467.47 -import org.w3c.dom.Element;
467.48 -import org.w3c.dom.NamedNodeMap;
467.49 -import org.w3c.dom.Node;
467.50 -
467.51 -/**
467.52 - *
467.53 - * @author jqian
467.54 - */
467.55 -public class XmlUtil {
467.56 -
467.57 - public static QName getAttributeNSName(Element e, String attrName) {
467.58 - String attrValue = e.getAttribute(attrName);
467.59 - return getNSName(e, attrValue);
467.60 - }
467.61 -
467.62 - private static QName getNSName(Element e, String qname) {
467.63 - if (qname == null) {
467.64 - return null;
467.65 - }
467.66 - int i = qname.indexOf(':');
467.67 - if (i > 0) {
467.68 - String name = qname.substring(i + 1);
467.69 - String prefix = qname.substring(0, i);
467.70 - return new QName(getNamespaceURI(e, prefix), name);
467.71 - } else {
467.72 - return new QName(qname);
467.73 - }
467.74 - }
467.75 -
467.76 - public static String getNamespaceURI(Element el, String prefix) {
467.77 - if ((prefix == null) || (prefix.length() < 1)) {
467.78 - return "";
467.79 - }
467.80 - prefix = prefix.trim();
467.81 - try {
467.82 - NamedNodeMap map = el.getOwnerDocument().getDocumentElement().getAttributes();
467.83 - for (int j = 0; j < map.getLength(); j++) {
467.84 - Node n = map.item(j);
467.85 - String attrName = ((Attr)n).getName();
467.86 - if (attrName != null) {
467.87 - if (attrName.trim().equals("xmlns:" + prefix)) {
467.88 - return ((Attr)n).getValue();
467.89 - }
467.90 - }
467.91 - }
467.92 - } catch (Exception e) {
467.93 - }
467.94 -
467.95 - return "";
467.96 - }
467.97 -
467.98 -}
468.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
468.2 +++ b/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/ComponentActionDescriptorTest.java Sat Jan 26 05:58:37 2008 +0000
468.3 @@ -0,0 +1,94 @@
468.4 +/*
468.5 + * To change this template, choose Tools | Templates
468.6 + * and open the template in the editor.
468.7 + */
468.8 +package org.netbeans.modules.sun.manager.jbi.management.model;
468.9 +
468.10 +import java.io.BufferedReader;
468.11 +import java.io.File;
468.12 +import java.io.FileReader;
468.13 +import java.io.IOException;
468.14 +import java.net.URI;
468.15 +import java.net.URISyntaxException;
468.16 +import java.util.List;
468.17 +import org.junit.After;
468.18 +import org.junit.AfterClass;
468.19 +import org.junit.Before;
468.20 +import org.junit.BeforeClass;
468.21 +import org.junit.Test;
468.22 +import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationAction;
468.23 +import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationGroupAction;
468.24 +import static org.junit.Assert.*;
468.25 +
468.26 +/**
468.27 + *
468.28 + * @author jqian
468.29 + */
468.30 +public class ComponentActionDescriptorTest {
468.31 +
468.32 + private ComponentActionDescriptor descriptor;
468.33 +
468.34 + public ComponentActionDescriptorTest() {
468.35 + }
468.36 +
468.37 + @BeforeClass
468.38 + public static void setUpClass() throws Exception {
468.39 + }
468.40 +
468.41 + @AfterClass
468.42 + public static void tearDownClass() throws Exception {
468.43 + }
468.44 +
468.45 + @Before
468.46 + public void setUp() {
468.47 + }
468.48 +
468.49 + @After
468.50 + public void tearDown() {
468.51 + }
468.52 +
468.53 + /**
468.54 + * Test of getActions method, of class ComponentActionDescriptor.
468.55 + */
468.56 + @Test
468.57 + public void getActions() throws URISyntaxException {
468.58 +
468.59 + System.out.println("getActions");
468.60 +
468.61 + URI xmlURI = getClass().getResource("resources/sun-bpel-engine-actions.xml").toURI();
468.62 + File xmlFile = new File(xmlURI);
468.63 + String xmlText = getContent(xmlFile);
468.64 +
468.65 + List<MBeanOperationAction> result =
468.66 + ComponentActionDescriptor.getActions(xmlText);
468.67 + assertEquals(2, result.size());
468.68 + assertTrue(result.get(1) instanceof MBeanOperationGroupAction);
468.69 +
468.70 + MBeanOperationGroupAction groupAction = (MBeanOperationGroupAction) result.get(1);
468.71 + assertEquals(2, groupAction.getActions().size());
468.72 + }
468.73 +
468.74 + private String getContent(File file) {
468.75 + String ret = "";
468.76 +
468.77 + BufferedReader is = null;
468.78 + try {
468.79 + is = new BufferedReader(new FileReader(file));
468.80 + String inputLine;
468.81 + while ((inputLine = is.readLine()) != null) {
468.82 + ret += inputLine;
468.83 + }
468.84 + } catch (IOException e) {
468.85 + System.out.println("IOException: " + e);
468.86 + } finally {
468.87 + if (is != null) {
468.88 + try {
468.89 + is.close();
468.90 + } catch (Exception e) {
468.91 + }
468.92 + }
468.93 + }
468.94 +
468.95 + return ret;
468.96 + }
468.97 +}
469.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/ComponentInformationParserTest.java Sat Jan 26 03:07:46 2008 +0000
469.2 +++ b/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/ComponentInformationParserTest.java Sat Jan 26 05:58:37 2008 +0000
469.3 @@ -83,7 +83,8 @@
469.4
469.5 URI xmlURI = getClass().getResource("resources/BindingComponentInformation.xml").toURI();
469.6 File xmlFile = new File(xmlURI);
469.7 - List<JBIComponentStatus> compList = ComponentInformationParser.parse(xmlFile);
469.8 + JBIComponentDocument compDoc = ComponentInformationParser.parse(xmlFile);
469.9 + List<JBIComponentStatus> compList = compDoc.getJbiComponentList();
469.10 assertEquals(5, compList.size());
469.11
469.12 // check one BC
469.13 @@ -109,7 +110,8 @@
469.14
469.15 URI xmlURI = getClass().getResource("resources/ComponentInformation.xml").toURI();
469.16 File xmlFile = new File(xmlURI);
469.17 - List<JBIComponentStatus> compList = ComponentInformationParser.parse(xmlFile);
469.18 + JBIComponentDocument compDoc = ComponentInformationParser.parse(xmlFile);
469.19 + List<JBIComponentStatus> compList = compDoc.getJbiComponentList();
469.20 assertEquals(11, compList.size());
469.21
469.22 // check one SE
470.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentActionDescriptorTest.java Sat Jan 26 03:07:46 2008 +0000
470.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
470.3 @@ -1,94 +0,0 @@
470.4 -/*
470.5 - * To change this template, choose Tools | Templates
470.6 - * and open the template in the editor.
470.7 - */
470.8 -package org.netbeans.modules.sun.manager.jbi.management.model;
470.9 -
470.10 -import java.io.BufferedReader;
470.11 -import java.io.File;
470.12 -import java.io.FileReader;
470.13 -import java.io.IOException;
470.14 -import java.net.URI;
470.15 -import java.net.URISyntaxException;
470.16 -import java.util.List;
470.17 -import org.junit.After;
470.18 -import org.junit.AfterClass;
470.19 -import org.junit.Before;
470.20 -import org.junit.BeforeClass;
470.21 -import org.junit.Test;
470.22 -import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationAction;
470.23 -import org.netbeans.modules.sun.manager.jbi.actions.MBeanOperationGroupAction;
470.24 -import static org.junit.Assert.*;
470.25 -
470.26 -/**
470.27 - *
470.28 - * @author jqian
470.29 - */
470.30 -public class JBIComponentActionDescriptorTest {
470.31 -
470.32 - private JBIComponentActionDescriptor descriptor;
470.33 -
470.34 - public JBIComponentActionDescriptorTest() {
470.35 - }
470.36 -
470.37 - @BeforeClass
470.38 - public static void setUpClass() throws Exception {
470.39 - }
470.40 -
470.41 - @AfterClass
470.42 - public static void tearDownClass() throws Exception {
470.43 - }
470.44 -
470.45 - @Before
470.46 - public void setUp() {
470.47 - }
470.48 -
470.49 - @After
470.50 - public void tearDown() {
470.51 - }
470.52 -
470.53 - /**
470.54 - * Test of getActions method, of class ComponentActionDescriptor.
470.55 - */
470.56 - @Test
470.57 - public void getActions() throws URISyntaxException {
470.58 -
470.59 - System.out.println("getActions");
470.60 -
470.61 - URI xmlURI = getClass().getResource("resources/sun-bpel-engine-actions.xml").toURI();
470.62 - File xmlFile = new File(xmlURI);
470.63 - String xmlText = getContent(xmlFile);
470.64 -
470.65 - List<MBeanOperationAction> result =
470.66 - JBIComponentActionDescriptor.getActions(xmlText);
470.67 - assertEquals(2, result.size());
470.68 - assertTrue(result.get(1) instanceof MBeanOperationGroupAction);
470.69 -
470.70 - MBeanOperationGroupAction groupAction = (MBeanOperationGroupAction) result.get(1);
470.71 - assertEquals(2, groupAction.getActions().size());
470.72 - }
470.73 -
470.74 - private String getContent(File file) {
470.75 - String ret = "";
470.76 -
470.77 - BufferedReader is = null;
470.78 - try {
470.79 - is = new BufferedReader(new FileReader(file));
470.80 - String inputLine;
470.81 - while ((inputLine = is.readLine()) != null) {
470.82 - ret += inputLine;
470.83 - }
470.84 - } catch (IOException e) {
470.85 - System.out.println("IOException: " + e);
470.86 - } finally {
470.87 - if (is != null) {
470.88 - try {
470.89 - is.close();
470.90 - } catch (Exception e) {
470.91 - }
470.92 - }
470.93 - }
470.94 -
470.95 - return ret;
470.96 - }
470.97 -}
471.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentConfigurationDescriptorTest.java Sat Jan 26 03:07:46 2008 +0000
471.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
471.3 @@ -1,248 +0,0 @@
471.4 -/*
471.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
471.6 - *
471.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
471.8 - *
471.9 - * The contents of this file are subject to the terms of either the GNU
471.10 - * General Public License Version 2 only ("GPL") or the Common
471.11 - * Development and Distribution License("CDDL") (collectively, the
471.12 - * "License"). You may not use this file except in compliance with the
471.13 - * License. You can obtain a copy of the License at
471.14 - * http://www.netbeans.org/cddl-gplv2.html
471.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
471.16 - * specific language governing permissions and limitations under the
471.17 - * License. When distributing the software, include this License Header
471.18 - * Notice in each file and include the License file at
471.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
471.20 - * particular file as subject to the "Classpath" exception as provided
471.21 - * by Sun in the GPL Version 2 section of the License file that
471.22 - * accompanied this code. If applicable, add the following below the
471.23 - * License Header, with the fields enclosed by brackets [] replaced by
471.24 - * your own identifying information:
471.25 - * "Portions Copyrighted [year] [name of copyright owner]"
471.26 - *
471.27 - * If you wish your version of this file to be governed by only the CDDL
471.28 - * or only the GPL Version 2, indicate your decision by adding
471.29 - * "[Contributor] elects to include this software in this distribution
471.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
471.31 - * single choice of license, a recipient has the option to distribute
471.32 - * your version of this file under either the CDDL, the GPL Version 2 or
471.33 - * to extend the choice of license to its licensees as provided above.
471.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
471.35 - * Version 2 license, then the option applies only if the new code is
471.36 - * made subject to such option by the copyright holder.
471.37 - *
471.38 - * Contributor(s):
471.39 - *
471.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
471.41 - */
471.42 -
471.43 -package org.netbeans.modules.sun.manager.jbi.management.model;
471.44 -
471.45 -import java.io.BufferedReader;
471.46 -import java.io.File;
471.47 -import java.io.FileReader;
471.48 -import java.io.IOException;
471.49 -import java.net.URI;
471.50 -import java.net.URISyntaxException;
471.51 -import java.util.Set;
471.52 -import javax.xml.parsers.ParserConfigurationException;
471.53 -import org.junit.After;
471.54 -import org.junit.AfterClass;
471.55 -import org.junit.Before;
471.56 -import org.junit.BeforeClass;
471.57 -import org.junit.Test;
471.58 -import static org.junit.Assert.*;
471.59 -import org.xml.sax.SAXException;
471.60 -
471.61 -/**
471.62 - *
471.63 - * @author jqian
471.64 - */
471.65 -public class JBIComponentConfigurationDescriptorTest {
471.66 -
471.67 - private static JBIComponentConfigurationDescriptor threadCount;
471.68 - private static JBIComponentConfigurationDescriptor appConfig;
471.69 -
471.70 - public JBIComponentConfigurationDescriptorTest() {
471.71 - }
471.72 -
471.73 - @BeforeClass
471.74 - public static void setUpClass() throws URISyntaxException,
471.75 - ParserConfigurationException, IOException, SAXException {
471.76 -
471.77 - URI xmlURI = JBIComponentConfigurationDescriptorTest.class.
471.78 - getResource("resources/sun-jms-binding-jbi.xml").toURI();
471.79 - File xmlFile = new File(xmlURI);
471.80 - String xmlText = getContent(xmlFile);
471.81 -
471.82 - JBIComponentConfigurationDescriptor result =
471.83 - JBIComponentConfigurationParser.parse(xmlText);
471.84 -
471.85 - threadCount = result.getChild("ThreadCount");
471.86 - appConfig = result.getChild("JMSApplicationConfiguration");
471.87 - }
471.88 -
471.89 - @AfterClass
471.90 - public static void tearDownClass() throws Exception {
471.91 - }
471.92 -
471.93 - @Before
471.94 - public void setUp() {
471.95 - }
471.96 -
471.97 - @After
471.98 - public void tearDown() {
471.99 - }
471.100 -
471.101 - /**
471.102 - * Test of getName method, of class JBIComponentConfigurationDescriptor.
471.103 - */
471.104 - @Test
471.105 - public void getName() {
471.106 - System.out.println("getName");
471.107 -
471.108 - assertEquals("ThreadCount", threadCount.getName());
471.109 - assertEquals("JMSApplicationConfiguration", appConfig.getName());
471.110 - }
471.111 -
471.112 - /**
471.113 - * Test of getDisplayName method, of class JBIComponentConfigurationDescriptor.
471.114 - */
471.115 - @Test
471.116 - public void getDisplayName() {
471.117 - System.out.println("getDisplayName");
471.118 -
471.119 - assertEquals("Number of Threads", threadCount.getDisplayName());
471.120 - assertEquals("JMS BC Application Configuration", appConfig.getDisplayName());
471.121 - }
471.122 -
471.123 - /**
471.124 - * Test of getDescription method, of class JBIComponentConfigurationDescriptor.
471.125 - */
471.126 - @Test
471.127 - public void getDescription() {
471.128 - System.out.println("getDescription");
471.129 -
471.130 - assertEquals("# of threads to proccess outbound JMS requests and Message Exchange responses concurrentlty", threadCount.getDescription());
471.131 - assertEquals("Describes JMS connection properties", appConfig.getDescription());
471.132 - }
471.133 -
471.134 - /**
471.135 - * Test of getTypeQName method, of class JBIComponentConfigurationDescriptor.
471.136 - */
471.137 - @Test
471.138 - public void getTypeQname() {
471.139 - System.out.println("getTypeQname");
471.140 -
471.141 - assertEquals(JBIComponentConfigurationDescriptor.XSD_POSITIVE_INTEGER,
471.142 - threadCount.getTypeQName());
471.143 - }
471.144 -
471.145 - /**
471.146 - * Test of isEncrypted method, of class JBIComponentConfigurationDescriptor.
471.147 - */
471.148 - @Test
471.149 - public void isEncrypted() {
471.150 - System.out.println("isEncrypted");
471.151 -
471.152 - assertFalse(threadCount.isEncrypted());
471.153 - assertFalse(appConfig.isEncrypted());
471.154 - }
471.155 -
471.156 - /**
471.157 - * Test of needsApplicationRestart method, of class JBIComponentConfigurationDescriptor.
471.158 - */
471.159 - @Test
471.160 - public void isApplicationRestartRequired() {
471.161 - System.out.println("needsApplicationRestart");
471.162 -
471.163 - assertFalse(threadCount.isApplicationRestartRequired());
471.164 - assertTrue(appConfig.isApplicationRestartRequired());
471.165 - }
471.166 -
471.167 - /**
471.168 - * Test of isComponentRestartRequired method, of class JBIComponentConfigurationDescriptor.
471.169 - */
471.170 - @Test
471.171 - public void isComponentRestartRequired() {
471.172 - System.out.println("isComponentRestartRequired");
471.173 -
471.174 - assertTrue(threadCount.isComponentRestartRequired());
471.175 - assertFalse(appConfig.isComponentRestartRequired());
471.176 - }
471.177 -
471.178 - /**
471.179 - * Test of isServerRestartRequired method, of class JBIComponentConfigurationDescriptor.
471.180 - */
471.181 - @Test
471.182 - public void isServerRestartRequired() {
471.183 - System.out.println("isServerRestartRequired");
471.184 -
471.185 - assertFalse(threadCount.isServerRestartRequired());
471.186 - assertFalse(appConfig.isServerRestartRequired());
471.187 - }
471.188 -
471.189 - /**
471.190 - * Test of isRequired method, of class JBIComponentConfigurationDescriptor.
471.191 - */
471.192 - @Test
471.193 - public void isRequired() {
471.194 - System.out.println("isRequired");
471.195 -
471.196 - assertFalse(threadCount.isRequired());
471.197 - assertFalse(appConfig.isRequired());
471.198 - }
471.199 -
471.200 - /**
471.201 - * Test of getChildNames method, of class JBIComponentConfigurationDescriptor.
471.202 - */
471.203 - @Test
471.204 - public void getChildNames() {
471.205 - System.out.println("getChildNames");
471.206 -
471.207 - Set<String> childrenNames = appConfig.getChildNames();
471.208 - assertTrue(childrenNames.contains("ApplicationConfigurationName"));
471.209 - assertTrue(childrenNames.contains("UserName"));
471.210 - assertTrue(childrenNames.contains("Password"));
471.211 - assertTrue(childrenNames.contains("JndiEnv"));
471.212 - }
471.213 -
471.214 - /**
471.215 - * Test of getChild method, of class JBIComponentConfigurationDescriptor.
471.216 - */
471.217 - @Test
471.218 - public void getChild() {
471.219 - System.out.println("getChild");
471.220 -
471.221 - JBIComponentConfigurationDescriptor jndiEnv = appConfig.getChild("JndiEnv");
471.222 - Set<String> childrenNames = jndiEnv.getChildNames();
471.223 - assertTrue(childrenNames.contains("JndiName"));
471.224 - assertTrue(childrenNames.contains("JndiValue"));
471.225 - }
471.226 -
471.227 - private static String getContent(File file) {
471.228 - String ret = "";
471.229 -
471.230 - BufferedReader is = null;
471.231 - try {
471.232 - is = new BufferedReader(new FileReader(file));
471.233 - String inputLine;
471.234 - while ((inputLine = is.readLine()) != null) {
471.235 - ret += inputLine;
471.236 - }
471.237 - } catch (IOException e) {
471.238 - System.out.println("IOException: " + e);
471.239 - } finally {
471.240 - if (is != null) {
471.241 - try {
471.242 - is.close();
471.243 - } catch (Exception e) {
471.244 - }
471.245 - }
471.246 - }
471.247 -
471.248 - return ret;
471.249 - }
471.250 -
471.251 -}
471.252 \ No newline at end of file
472.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/JBIComponentConfigurationParserTest.java Sat Jan 26 03:07:46 2008 +0000
472.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
472.3 @@ -1,124 +0,0 @@
472.4 -/*
472.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
472.6 - *
472.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
472.8 - *
472.9 - * The contents of this file are subject to the terms of either the GNU
472.10 - * General Public License Version 2 only ("GPL") or the Common
472.11 - * Development and Distribution License("CDDL") (collectively, the
472.12 - * "License"). You may not use this file except in compliance with the
472.13 - * License. You can obtain a copy of the License at
472.14 - * http://www.netbeans.org/cddl-gplv2.html
472.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
472.16 - * specific language governing permissions and limitations under the
472.17 - * License. When distributing the software, include this License Header
472.18 - * Notice in each file and include the License file at
472.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
472.20 - * particular file as subject to the "Classpath" exception as provided
472.21 - * by Sun in the GPL Version 2 section of the License file that
472.22 - * accompanied this code. If applicable, add the following below the
472.23 - * License Header, with the fields enclosed by brackets [] replaced by
472.24 - * your own identifying information:
472.25 - * "Portions Copyrighted [year] [name of copyright owner]"
472.26 - *
472.27 - * If you wish your version of this file to be governed by only the CDDL
472.28 - * or only the GPL Version 2, indicate your decision by adding
472.29 - * "[Contributor] elects to include this software in this distribution
472.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
472.31 - * single choice of license, a recipient has the option to distribute
472.32 - * your version of this file under either the CDDL, the GPL Version 2 or
472.33 - * to extend the choice of license to its licensees as provided above.
472.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
472.35 - * Version 2 license, then the option applies only if the new code is
472.36 - * made subject to such option by the copyright holder.
472.37 - *
472.38 - * Contributor(s):
472.39 - *
472.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
472.41 - */
472.42 -
472.43 -package org.netbeans.modules.sun.manager.jbi.management.model;
472.44 -
472.45 -import java.io.BufferedReader;
472.46 -import java.io.File;
472.47 -import java.io.FileReader;
472.48 -import java.io.IOException;
472.49 -import java.net.URI;
472.50 -import java.net.URISyntaxException;
472.51 -import org.junit.After;
472.52 -import org.junit.AfterClass;
472.53 -import org.junit.Before;
472.54 -import org.junit.BeforeClass;
472.55 -import org.junit.Test;
472.56 -import static org.junit.Assert.*;
472.57 -
472.58 -/**
472.59 - *
472.60 - * @author jqian
472.61 - */
472.62 -public class JBIComponentConfigurationParserTest {
472.63 -
472.64 - public JBIComponentConfigurationParserTest() {
472.65 - }
472.66 -
472.67 - @BeforeClass
472.68 - public static void setUpClass() throws Exception {
472.69 - }
472.70 -
472.71 - @AfterClass
472.72 - public static void tearDownClass() throws Exception {
472.73 - }
472.74 -
472.75 - @Before
472.76 - public void setUp() throws URISyntaxException {
472.77 - }
472.78 -
472.79 - @After
472.80 - public void tearDown() {
472.81 - }
472.82 -
472.83 - /**
472.84 - * Test of parse method, of class ComponentConfigurationParser.
472.85 - */
472.86 - @Test
472.87 - public void parse() throws Exception {
472.88 - System.out.println("parse");
472.89 -
472.90 - URI xmlURI = getClass().getResource("resources/sun-jms-binding-jbi.xml").toURI();
472.91 - File xmlFile = new File(xmlURI);
472.92 - String xmlText = getContent(xmlFile);
472.93 -
472.94 - JBIComponentConfigurationDescriptor result =
472.95 - JBIComponentConfigurationParser.parse(xmlText);
472.96 - assertEquals(3, result.getChildren().size());
472.97 - assertNotNull(result.getChild("ThreadCount"));
472.98 - assertNotNull(result.getChild("JMSApplicationVariables"));
472.99 - assertNotNull(result.getChild("JMSApplicationConfiguration"));
472.100 - assertNull(result.getChild("FOO"));
472.101 - }
472.102 -
472.103 - private static String getContent(File file) {
472.104 - String ret = "";
472.105 -
472.106 - BufferedReader is = null;
472.107 - try {
472.108 - is = new BufferedReader(new FileReader(file));
472.109 - String inputLine;
472.110 - while ((inputLine = is.readLine()) != null) {
472.111 - ret += inputLine;
472.112 - }
472.113 - } catch (IOException e) {
472.114 - System.out.println("IOException: " + e);
472.115 - } finally {
472.116 - if (is != null) {
472.117 - try {
472.118 - is.close();
472.119 - } catch (Exception e) {
472.120 - }
472.121 - }
472.122 - }
472.123 -
472.124 - return ret;
472.125 - }
472.126 -
472.127 -}
472.128 \ No newline at end of file
473.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/ModelSuite.java Sat Jan 26 03:07:46 2008 +0000
473.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
473.3 @@ -1,55 +0,0 @@
473.4 -/*
473.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
473.6 - *
473.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
473.8 - *
473.9 - * The contents of this file are subject to the terms of either the GNU
473.10 - * General Public License Version 2 only ("GPL") or the Common
473.11 - * Development and Distribution License("CDDL") (collectively, the
473.12 - * "License"). You may not use this file except in compliance with the
473.13 - * License. You can obtain a copy of the License at
473.14 - * http://www.netbeans.org/cddl-gplv2.html
473.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
473.16 - * specific language governing permissions and limitations under the
473.17 - * License. When distributing the software, include this License Header
473.18 - * Notice in each file and include the License file at
473.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
473.20 - * particular file as subject to the "Classpath" exception as provided
473.21 - * by Sun in the GPL Version 2 section of the License file that
473.22 - * accompanied this code. If applicable, add the following below the
473.23 - * License Header, with the fields enclosed by brackets [] replaced by
473.24 - * your own identifying information:
473.25 - * "Portions Copyrighted [year] [name of copyright owner]"
473.26 - *
473.27 - * If you wish your version of this file to be governed by only the CDDL
473.28 - * or only the GPL Version 2, indicate your decision by adding
473.29 - * "[Contributor] elects to include this software in this distribution
473.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
473.31 - * single choice of license, a recipient has the option to distribute
473.32 - * your version of this file under either the CDDL, the GPL Version 2 or
473.33 - * to extend the choice of license to its licensees as provided above.
473.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
473.35 - * Version 2 license, then the option applies only if the new code is
473.36 - * made subject to such option by the copyright holder.
473.37 - *
473.38 - * Contributor(s):
473.39 - *
473.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
473.41 - */
473.42 -
473.43 -package org.netbeans.modules.sun.manager.jbi.management.model;
473.44 -
473.45 -import org.junit.runner.RunWith;
473.46 -import org.junit.runners.Suite;
473.47 -
473.48 -/**
473.49 - *
473.50 - * @author jqian
473.51 - */
473.52 -@RunWith(Suite.class)
473.53 -@Suite.SuiteClasses({
473.54 - org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationDescriptorTest.class,
473.55 - org.netbeans.modules.sun.manager.jbi.management.model.JBIComponentConfigurationParserTest.class
473.56 -})
473.57 -public class ModelSuite {
473.58 -}
473.59 \ No newline at end of file
474.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/beaninfo/BeaninfoSuite.java Sat Jan 26 03:07:46 2008 +0000
474.2 +++ b/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/beaninfo/BeaninfoSuite.java Sat Jan 26 05:58:37 2008 +0000
474.3 @@ -1,40 +1,6 @@
474.4 /*
474.5 - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
474.6 - *
474.7 - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
474.8 - *
474.9 - * The contents of this file are subject to the terms of either the GNU
474.10 - * General Public License Version 2 only ("GPL") or the Common
474.11 - * Development and Distribution License("CDDL") (collectively, the
474.12 - * "License"). You may not use this file except in compliance with the
474.13 - * License. You can obtain a copy of the License at
474.14 - * http://www.netbeans.org/cddl-gplv2.html
474.15 - * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
474.16 - * specific language governing permissions and limitations under the
474.17 - * License. When distributing the software, include this License Header
474.18 - * Notice in each file and include the License file at
474.19 - * nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
474.20 - * particular file as subject to the "Classpath" exception as provided
474.21 - * by Sun in the GPL Version 2 section of the License file that
474.22 - * accompanied this code. If applicable, add the following below the
474.23 - * License Header, with the fields enclosed by brackets [] replaced by
474.24 - * your own identifying information:
474.25 - * "Portions Copyrighted [year] [name of copyright owner]"
474.26 - *
474.27 - * If you wish your version of this file to be governed by only the CDDL
474.28 - * or only the GPL Version 2, indicate your decision by adding
474.29 - * "[Contributor] elects to include this software in this distribution
474.30 - * under the [CDDL or GPL Version 2] license." If you do not indicate a
474.31 - * single choice of license, a recipient has the option to distribute
474.32 - * your version of this file under either the CDDL, the GPL Version 2 or
474.33 - * to extend the choice of license to its licensees as provided above.
474.34 - * However, if you add GPL Version 2 code and therefore, elected the GPL
474.35 - * Version 2 license, then the option applies only if the new code is
474.36 - * made subject to such option by the copyright holder.
474.37 - *
474.38 - * Contributor(s):
474.39 - *
474.40 - * Portions Copyrighted 2008 Sun Microsystems, Inc.
474.41 + * To change this template, choose Tools | Templates
474.42 + * and open the template in the editor.
474.43 */
474.44
474.45 package org.netbeans.modules.sun.manager.jbi.management.model.beaninfo;
475.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/resources/sun-http-binding-jbi.xml Sat Jan 26 03:07:46 2008 +0000
475.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
475.3 @@ -1,142 +0,0 @@
475.4 -<?xml version="1.0" encoding="UTF-8"?>
475.5 -<jbi
475.6 - version="1.0"
475.7 - xmlns="http://java.sun.com/xml/ns/jbi"
475.8 - xmlns:identification="http://www.sun.com/jbi/descriptor/identification"
475.9 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
475.10 - xmlns:config='http://www.sun.com/jbi/Configuration'
475.11 - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
475.12 - xsi:schemaLocation="http://www.sun.com/jbi/Configuration ./componentConfiguration.xsd http://java.sun.com/xml/ns/jbi ./jbi.xsd">
475.13 - <!-- identification information about this binding -->
475.14 - <component type="binding-component">
475.15 - <identification>
475.16 - <name>sun-jms-binding</name>
475.17 - <description>JMS binding</description>
475.18 - <identification:VersionInfo specification-version="${JBI_SPEC_VERSION}" build-number="${BUILD_NUMBER}"/>
475.19 - </identification>
475.20 -
475.21 - <config:Configuration>
475.22 - <config:Property name="OutboundThreads"
475.23 - type="xsd:int"
475.24 - displayName="Number of Outbound Threads"
475.25 - displayDescription="Number of threads to process outgoing HTTP/SOAP client invocations concurrently. Any integer number between 1 and 2147483647 is allowed."
475.26 - defaultValue="10"
475.27 - isApplicationRestartRequired="false"
475.28 - isComponentRestartRequired="false"
475.29 - isServerRestartRequired="false"/>
475.30 -
475.31 - <config:Property name="HttpDefaultPort"
475.32 - type="xsd:int"
475.33 - displayName="Default HTTP Port Number"
475.34 - displayDescription="Default HTTP port number for incoming HTTP/SOAP requests. The default value is -1 which indicates there is no valid port number defined. A valid port number is any positive integer between 1 and 65535, but it is highly recommended to avoid system reserved ports."
475.35 - defaultValue="111"
475.36 - isApplicationRestartRequired="true"
475.37 - isComponentRestartRequired="false"
475.38 - isServerRestartRequired="false"/>
475.39 -
475.40 - <config:Property name="HttpsDefaultPort"
475.41 - displayName="Default HTTPS Port Number"
475.42 - displayDescription="Default HTTPS port number for incoming HTTP/SOAP requests. The default value is -1 which indicates there is no valid port number defined. A valid port number is any positive integer between 1 and 65535, but it is highly recommended to avoid system reserved ports."
475.43 - type="xsd:int"
475.44 - defaultValue="2222"
475.45 - isApplicationRestartRequired="true"
475.46 - isComponentRestartRequired="false"
475.47 - isServerRestartRequired="false"/>
475.48 -
475.49 - <config:Property name="AMConfigDirectory"
475.50 - type="xsd:string"
475.51 - defaultValue="dummy"
475.52 - displayName="Sun Access Manager Configuration Directory"
475.53 - displayDescription="Sun Access Manager configuration directory containing the AM configuration properties file"
475.54 - isApplicationRestartRequired="false"
475.55 - isComponentRestartRequired="false"
475.56 - isServerRestartRequired="false"/>
475.57 -
475.58 - <config:Property name="ProxyType"
475.59 - type="xsd:string"
475.60 - defaultValue="SOCKS"
475.61 - displayName="Proxy Type"
475.62 - displayDescription="A valid proxy type. Allowed proxy type values are: SOCKS, HTTP, and DIRECT. This configuration is used for outgoing HTTP/SOAP client invocations only."
475.63 - isApplicationRestartRequired="true"
475.64 - isComponentRestartRequired="true"
475.65 - isServerRestartRequired="false"/>
475.66 -
475.67 - <config:Property name="ProxyHost"
475.68 - type="xsd:string"
475.69 - defaultValue="dummy"
475.70 - displayName="Proxy Host"
475.71 - displayDescription="A valid proxy host name. This configuration is used for outgoing HTTP/SOAP client invocations only."
475.72 - isApplicationRestartRequired="true"
475.73 - isComponentRestartRequired="true"
475.74 - isServerRestartRequired="false"/>
475.75 -
475.76 - <config:Property name="ProxyPort"
475.77 - type="xsd:int"
475.78 - defaultValue="3333"
475.79 - displayName="Proxy Port"
475.80 - displayDescription="A valid proxy port. This configuration is used for outgoing HTTP/SOAP client invocations only."
475.81 - isApplicationRestartRequired="true"
475.82 - isComponentRestartRequired="true"
475.83 - isServerRestartRequired="false"/>
475.84 -
475.85 -
475.86 - <config:Property name="NonProxyHosts"
475.87 - type="xsd:string"
475.88 - defaultValue="dummy"
475.89 - displayName="Non-proxy Hosts"
475.90 - displayDescription="A list of server hosts whose connections do not require a proxy server"
475.91 - isApplicationRestartRequired="true"
475.92 - isComponentRestartRequired="true"
475.93 - isServerRestartRequired="false"/>
475.94 -
475.95 - <config:Property name="ProxyUserName"
475.96 - type="xsd:string"
475.97 - defaultValue="dummy"
475.98 - displayName="Proxy User Name"
475.99 - displayDescription="A valid proxy user name"
475.100 - isApplicationRestartRequired="true"
475.101 - isComponentRestartRequired="true"
475.102 - isServerRestartRequired="false"/>
475.103 -
475.104 - <config:Property name="ProxyPassword"
475.105 - type="xsd:string"
475.106 - defaultValue="dummy"
475.107 - displayName="Proxy User Password"
475.108 - displayDescription="A valid proxy user password"
475.109 - encrypted="true"
475.110 - isApplicationRestartRequired="true"
475.111 - isComponentRestartRequired="true"
475.112 - isServerRestartRequired="false"/>
475.113 -
475.114 - <config:Property name="UseJVMProxySettings"
475.115 - type="xsd:boolean"
475.116 - defaultValue="true"
475.117 - displayName="Use Default JVM Proxy Settings"
475.118 - displayDescription="Determines whether or not to use the default JVM system properties for proxy settings"
475.119 - isApplicationRestartRequired="true"
475.120 - isComponentRestartRequired="true"
475.121 - isServerRestartRequired="false"/>
475.122 -
475.123 - <config:ApplicationConfiguration>
475.124 - <config:Property name="configurationName"
475.125 - displayName="Application Configuration Name"
475.126 - displayDescription="Name of the application configuration"
475.127 - type="xsd:string"
475.128 - required="true"/>
475.129 - <config:Property name="httpUrlLocation"
475.130 - displayName="HTTP URL Location"
475.131 - displayDescription="Endpoint address - HTTP URL location"
475.132 - type="xsd:string"
475.133 - required="true"/>
475.134 - </config:ApplicationConfiguration>
475.135 -
475.136 - <!-- Example of Application Variable -->
475.137 - <config:ApplicationVariable isApplicationRestartRequired="true">
475.138 - <config:name/>
475.139 - <config:type/>
475.140 - <config:value/>
475.141 - </config:ApplicationVariable>
475.142 - </config:Configuration>
475.143 - </component>
475.144 -</jbi>
475.145 -
476.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/management/model/resources/sun-jms-binding-jbi.xml Sat Jan 26 03:07:46 2008 +0000
476.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
476.3 @@ -1,92 +0,0 @@
476.4 -<!-- jbi.xml descriptor for the binding component (BC) -->
476.5 -<jbi
476.6 - version="1.0"
476.7 - xmlns="http://java.sun.com/xml/ns/jbi"
476.8 - xmlns:identification="http://www.sun.com/jbi/descriptor/identification"
476.9 - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
476.10 - xmlns:config='http://www.sun.com/jbi/Configuration'
476.11 - xmlns:xsd="http://www.w3.org/2001/XMLSchema"
476.12 - xsi:schemaLocation="http://www.sun.com/jbi/Configuration ./componentConfiguration.xsd http://java.sun.com/xml/ns/jbi ./jbi.xsd">
476.13 - <!-- identification information about this binding -->
476.14 - <component type="binding-component">
476.15 - <identification>
476.16 - <name>sun-jms-binding</name>
476.17 - <description>JMS binding</description>
476.18 - <identification:VersionInfo specification-version="${JBI_SPEC_VERSION}" build-number="${BUILD_NUMBER}"/>
476.19 - </identification>
476.20 - <config:Configuration>
476.21 -
476.22 - <!-- Example of component property -->
476.23 -
476.24 - <config:Property name="ThreadCount"
476.25 - displayName="Number of Threads"
476.26 - displayDescription="# of threads to proccess outbound JMS requests and Message Exchange responses concurrentlty"
476.27 - type="xsd:positiveInteger"
476.28 - value="10"
476.29 - isComponentRestartRequired="true"
476.30 - onChangeMessage="Please restart component">
476.31 - <config:Constraint facet="minInclusive" value="1"/>
476.32 - <config:Constraint facet="maxInclusive" value="100"/>
476.33 - </config:Property>
476.34 - <!-- Example of Application Variable -->
476.35 - <config:ApplicationVariable name="JMSApplicationVariables"
476.36 - displayName="Application Variable" displayDescription="A list of Application Variables"
476.37 - isApplicationRestartRequired="true"
476.38 - onChangeMessage="Restart of application is required after changing this property"
476.39 - hideDisplay="install">
476.40 - <config:ApplicationVariableName name="JMSVariable"
476.41 - displayName="JMS Application Variable Name"
476.42 - displayDescription="Name of the application variable"
476.43 - type="xsd:string"
476.44 - required="true"/>
476.45 - <config:ApplicationVariableValue name="JMSApplicationVariableValue"
476.46 - displayName="JMS Application Variable Value"
476.47 - displayDescription="Value of Application Variable"
476.48 - required="true"/>
476.49 - <config:ApplicationVariableType name="JMSApplicationVariableType"
476.50 - displayName="Application Variable Type"
476.51 - displayDescription="Type of the application variable"
476.52 - type="xsd:string"
476.53 - required="true"/>
476.54 - </config:ApplicationVariable>
476.55 -
476.56 - <!-- Example of Application Configuration -->
476.57 - <config:ApplicationConfiguration name="JMSApplicationConfiguration"
476.58 - displayName="JMS BC Application Configuration" displayDescription="Describes JMS connection properties"
476.59 - isApplicationRestartRequired="true"
476.60 - onChangeMessage="Restart of application is required after changing this property"
476.61 - hideDisplay="install">
476.62 - <config:Property name="ApplicationConfigurationName"
476.63 - displayName="Application Configuration Name"
476.64 - displayDescription="Name of the application configuration"
476.65 - type="xsd:string"
476.66 - required="true"/>
476.67 - <config:Property name="UserName"
476.68 - displayName="User Name"
476.69 - displayDescription="user name to use to connect to JMS server"
476.70 - type="xsd:string"
476.71 - required="true"/>
476.72 - <config:Property name="Password"
476.73 - displayName="Password"
476.74 - displayDescription="Password to use to connect to JMS server"
476.75 - type="xsd:string"
476.76 - required="true"
476.77 - encrypted="true"/>
476.78 - <config:CompoundProperty name="JndiEnv"
476.79 - displayName="JNDI enviornment" displayDescription="JNDI environment enntries"
476.80 - required="false">
476.81 - <config:Property name="JndiName"
476.82 - displayName="JNDI Name"
476.83 - displayDescription="JNDI entry name"
476.84 - type="xsd:string"
476.85 - required="true"/>
476.86 - <config:Property name="JndiValue"
476.87 - displayName="JNDI Value"
476.88 - displayDescription="JNDI value"
476.89 - type="xsd:string"
476.90 - required="true"/>
476.91 - </config:CompoundProperty>
476.92 - </config:ApplicationConfiguration>
476.93 - </config:Configuration>
476.94 - </component>
476.95 -</jbi>
476.96 \ No newline at end of file
477.1 --- a/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/nodes/property/SchemaBasedConfigPropertySupportFactoryTest.java Sat Jan 26 03:07:46 2008 +0000
477.2 +++ b/compapp.manager.jbi/test/unit/src/org/netbeans/modules/sun/manager/jbi/nodes/property/SchemaBasedConfigPropertySupportFactoryTest.java Sat Jan 26 05:58:37 2008 +0000
477.3 @@ -45,8 +45,8 @@
477.4 import junit.framework.TestCase;
477.5 import org.netbeans.modules.sun.manager.jbi.editors.ComboBoxPropertyEditor;
477.6 import org.netbeans.modules.sun.manager.jbi.editors.PasswordEditor;
477.7 -import org.netbeans.modules.sun.manager.jbi.management.model.OldJBIComponentConfigurationDescriptor;
477.8 -import org.netbeans.modules.sun.manager.jbi.management.OldConfigurationMBeanAttributeInfo;
477.9 +import org.netbeans.modules.sun.manager.jbi.management.model.ComponentConfigurationDescriptor;
477.10 +import org.netbeans.modules.sun.manager.jbi.management.ConfigurationMBeanAttributeInfo;
477.11 import org.netbeans.modules.xml.schema.model.Schema;
477.12 import org.openide.nodes.PropertySupport;
477.13
477.14 @@ -58,7 +58,7 @@
477.15
477.16 private Schema schema;
477.17
477.18 - private OldJBIComponentConfigurationDescriptor descriptor;
477.19 + private ComponentConfigurationDescriptor descriptor;
477.20
477.21 public SchemaBasedConfigPropertySupportFactoryTest(String testName) {
477.22 super(testName);
477.23 @@ -69,13 +69,13 @@
477.24 "resources/sun-http-binding-config.xsd").toURI();
477.25 File xsdFile = new File(xsdURI);
477.26 String schemaText = getContent(xsdFile);
477.27 - schema = OldSchemaBasedConfigPropertySupportFactory.getSchema(schemaText, "whatever");
477.28 + schema = SchemaBasedConfigPropertySupportFactory.getSchema(schemaText, "whatever");
477.29
477.30 URI xmlURI = getClass().getResource(
477.31 "resources/sun-http-binding-config.xml").toURI();
477.32 File xmlFile = new File(xmlURI);
477.33 String xmlText = getContent(xmlFile);
477.34 - descriptor = OldJBIComponentConfigurationDescriptor.parse(xmlText);
477.35 + descriptor = ComponentConfigurationDescriptor.parse(xmlText);
477.36 }
477.37
477.38 protected void tearDown() throws Exception {
477.39 @@ -83,32 +83,32 @@
477.40
477.41 public void testGetBaseTypeName() {
477.42 // integer
477.43 - String type = OldSchemaBasedConfigPropertySupportFactory.
477.44 + String type = SchemaBasedConfigPropertySupportFactory.
477.45 getGlobalSimpleTypeName(schema, "OutboundThreads");
477.46 assertEquals(type, "tns:SimpleRestrictedThreadType");
477.47
477.48 // boolean
477.49 - type = OldSchemaBasedConfigPropertySupportFactory.
477.50 + type = SchemaBasedConfigPropertySupportFactory.
477.51 getGlobalSimpleTypeName(schema, "UseJVMProxySettings");
477.52 assertEquals(type, "xsd:boolean");
477.53
477.54 // string
477.55 - type = OldSchemaBasedConfigPropertySupportFactory.
477.56 + type = SchemaBasedConfigPropertySupportFactory.
477.57 getGlobalSimpleTypeName(schema, "ProxyHost");
477.58 assertEquals(type, "tns:SimpleStringType");
477.59
477.60 // string enumeration
477.61 - type = OldSchemaBasedConfigPropertySupportFactory.
477.62 + type = SchemaBasedConfigPropertySupportFactory.
477.63 getGlobalSimpleTypeName(schema, "ProxyType");
477.64 assertEquals(type, "tns:ProxyTypeSimpleType");
477.65
477.66 // password
477.67 - type = OldSchemaBasedConfigPropertySupportFactory.
477.68 + type = SchemaBasedConfigPropertySupportFactory.
477.69 getGlobalSimpleTypeName(schema, "ProxyPassword");
477.70 assertEquals(type, "tns:SimpleStringType");
477.71
477.72 // tabular data
477.73 - type = OldSchemaBasedConfigPropertySupportFactory.
477.74 + type = SchemaBasedConfigPropertySupportFactory.
477.75 getGlobalSimpleTypeName(schema, "ApplicationConfigurations");
477.76 assertEquals(type, null);
477.77 }
477.78 @@ -116,35 +116,35 @@
477.79 public void testGetPropertySupport() throws Exception {
477.80
477.81 // integer
477.82 - PropertySupport propSupport = OldSchemaBasedConfigPropertySupportFactory.
477.83 + PropertySupport propSupport = SchemaBasedConfigPropertySupportFactory.
477.84 getPropertySupport(schema, null,
477.85 new Attribute("OutboundThreads", 4),
477.86 - new OldConfigurationMBeanAttributeInfo(
477.87 + new ConfigurationMBeanAttributeInfo(
477.88 descriptor.getChild("OutboundThreads"), "java.lang.Integer", true, true, false));
477.89 assertTrue(propSupport.getValue() instanceof Integer);
477.90
477.91 // boolean
477.92 - propSupport = OldSchemaBasedConfigPropertySupportFactory.
477.93 + propSupport = SchemaBasedConfigPropertySupportFactory.
477.94 getPropertySupport(schema, null,
477.95 new Attribute("UseJVMProxySettings", true),
477.96 - new OldConfigurationMBeanAttributeInfo(
477.97 + new ConfigurationMBeanAttributeInfo(
477.98 descriptor.getChild("UseJVMProxySettings"), "java.lang.Boolean", true, true, false));
477.99 assertTrue(propSupport.getValue() instanceof Boolean);
477.100
477.101 // string
477.102 - propSupport = OldSchemaBasedConfigPropertySupportFactory.
477.103 + propSupport = SchemaBasedConfigPropertySupportFactory.
477.104 getPropertySupport(schema, null,
477.105 new Attribute("ProxyHost", "localhost"),
477.106 - new OldConfigurationMBeanAttributeInfo(
477.107 + new ConfigurationMBeanAttributeInfo(
477.108 descriptor.getChild("ProxyHost"), "java.lang.String", true, true, false));
477.109 assertTrue(propSupport.getValue() instanceof String);
477.110 assertFalse(propSupport.getPropertyEditor() instanceof ComboBoxPropertyEditor);
477.111
477.112 // string enumeration
477.113 - propSupport = OldSchemaBasedConfigPropertySupportFactory.
477.114 + propSupport = SchemaBasedConfigPropertySupportFactory.
477.115 getPropertySupport(schema, null,
477.116 new Attribute("ProxyType", "SOCKS"),
477.117 - new OldConfigurationMBeanAttributeInfo(
477.118 + new ConfigurationMBeanAttributeInfo(
477.119 descriptor.getChild("ProxyType"), "java.lang.String", true, true, false));
477.120 assertTrue(propSupport.getValue() instanceof String);
477.121 PropertyEditor propEditor = propSupport.getPropertyEditor();
477.122 @@ -158,10 +158,10 @@
477.123 }
477.124
477.125 // password
477.126 - propSupport = OldSchemaBasedConfigPropertySupportFactory.
477.127 + propSupport = SchemaBasedConfigPropertySupportFactory.
477.128 getPropertySupport(schema, null,
477.129 new Attribute("ProxyPassword", "somePassword"),
477.130 - new OldConfigurationMBeanAttributeInfo(
477.131 + new ConfigurationMBeanAttributeInfo(
477.132 descriptor.getChild("ProxyPassword"), "java.lang.String", true, true, false));
477.133 assertTrue(propSupport.getValue() instanceof String);
477.134 assertTrue(propSupport.getPropertyEditor() instanceof PasswordEditor);
478.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/build.gif has changed
479.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/defaultCategory.gif has changed
480.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/docjar.gif has changed
481.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/general.gif has changed
482.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/icanproProjectIcon.gif has changed
483.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/j2seProject.gif has changed
484.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/jar.gif has changed
485.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/libraries.gif has changed
486.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/projectDependencies.gif has changed
487.1 Binary file compapp.projects.base/src/org/netbeans/modules/compapp/projects/base/ui/resources/run.gif has changed
488.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/Servers.png has changed
489.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/default.png has changed
490.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/ejb.png has changed
491.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/entity_bean.png has changed
492.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/message_bean.png has changed
493.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/res.png has changed
494.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/session_bean.png has changed
495.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/javaee/sunresources/resources/web_service_one.png has changed
496.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/jeese/ui/resources/j2eemodules.gif has changed
497.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/brokenProjectBadge.gif has changed
498.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/build.gif has changed
499.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/compositeApplicationBadge.png has changed
500.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/composite_application_project.png has changed
501.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/configbadge.gif has changed
502.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/debug.gif has changed
503.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/defaultCategory.gif has changed
504.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/general.gif has changed
505.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/j2seProject.gif has changed
506.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/jar.gif has changed
507.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/jbiModuleIcon.gif has changed
508.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/jbibadge.gif has changed
509.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/libraries.gif has changed
510.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/portmapIcon.gif has changed
511.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/projectDependencies.gif has changed
512.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/projects/jbi/ui/resources/run.gif has changed
513.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/errorbadge.gif has changed
514.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/first.gif has changed
515.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/input.png has changed
516.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/last.gif has changed
517.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/next.gif has changed
518.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/output.png has changed
519.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/prev.gif has changed
520.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/refresh.gif has changed
521.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/result_failure.png has changed
522.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/result_success.png has changed
523.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/testCase.png has changed
524.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/testCases_badge.png has changed
525.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/testbadge.gif has changed
526.1 Binary file compapp.projects.jbi/src/org/netbeans/modules/compapp/test/ui/resources/warningBadge.gif has changed
527.1 Binary file compapp.projects.jbi/test/unit/data/projects/earEJBWeb.ear has changed
528.1 Binary file compapp.projects.jbi/test/unit/data/projects/earEJBWeb_jbi.ear has changed
529.1 Binary file compapp.projects.jbi/test/unit/data/projects/ejbPortNameMissing.jar has changed
530.1 Binary file compapp.projects.jbi/test/unit/data/projects/ejbPortNameMissing_jbi.jar has changed
531.1 Binary file compapp.projects.jbi/test/unit/data/projects/ejbWebSvcs.jar has changed
532.1 Binary file compapp.projects.jbi/test/unit/data/projects/ejbWebSvcs_jbi.jar has changed
533.1 Binary file compapp.projects.jbi/test/unit/data/projects/webAppDefault.war has changed
534.1 Binary file compapp.projects.jbi/test/unit/data/projects/webAppDefault_jbi.war has changed
535.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
535.2 +++ b/etl.editor/external/avalon-logkit-current.jar Sat Jan 26 05:58:37 2008 +0000
535.3 @@ -0,0 +1,1 @@
535.4 +<<<EXTERNAL F2E695951E5BAE8BF09BC818C40705E0431579E5-avalon-logkit-current.jar>>>
536.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
536.2 +++ b/etl.editor/external/axiondb.jar Sat Jan 26 05:58:37 2008 +0000
536.3 @@ -0,0 +1,1 @@
536.4 +<<<EXTERNAL 3C3BAC6D77EC4DDF3642F2CB7C22B73CB0996141-axiondb.jar>>>
537.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
537.2 +++ b/etl.editor/external/commons-collections-3.0.jar Sat Jan 26 05:58:37 2008 +0000
537.3 @@ -0,0 +1,1 @@
537.4 +<<<EXTERNAL AA12980FE4ECA7331A660BDEED371D024687C68D-commons-collections-3.0.jar>>>
538.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
538.2 +++ b/etl.editor/external/etlengine.jar Sat Jan 26 05:58:37 2008 +0000
538.3 @@ -0,0 +1,1 @@
538.4 +<<<EXTERNAL 766E1C9B292A5925D303ED9E5F4D2F38574174CF-etlengine.jar>>>
539.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
539.2 +++ b/etl.editor/external/i18n-1.0.jar Sat Jan 26 05:58:37 2008 +0000
539.3 @@ -0,0 +1,1 @@
539.4 +<<<EXTERNAL 90A093504C1098C9657BDE860F202A452B3B139C-i18n-1.0.jar>>>
540.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
540.2 +++ b/etl.editor/external/net.java.hulp.i18ntask.jar Sat Jan 26 05:58:37 2008 +0000
540.3 @@ -0,0 +1,1 @@
540.4 +<<<EXTERNAL 0A2DE0816B1A7325A73C30E616FE87A04D2C7B23-net.java.hulp.i18ntask.jar>>>
541.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
541.2 +++ b/etl.editor/external/velocity-1.4.jar Sat Jan 26 05:58:37 2008 +0000
541.3 @@ -0,0 +1,1 @@
541.4 +<<<EXTERNAL 936D56C82103644EF042139D9E796CC0CF8EDC32-velocity-1.4.jar>>>
542.1 Binary file etl.editor/src/org/netbeans/modules/etl/ui/resources/images/ETLCollab.gif has changed
543.1 Binary file etl.editor/src/org/netbeans/modules/etl/ui/resources/images/ETLDefinition.png has changed
544.1 Binary file etl.editor/src/org/netbeans/modules/etl/ui/resources/images/ETLDefinitionError.png has changed
545.1 Binary file etl.editor/src/org/netbeans/modules/etl/ui/resources/images/ETLDefinitionWarning.png has changed
546.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/Column.gif has changed
547.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/ColumnNotNull.gif has changed
548.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/Group.gif has changed
549.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/GroupOpen.gif has changed
550.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/SourceTable.png has changed
551.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/Table.gif has changed
552.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/error.png has changed
553.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/root.png has changed
554.1 Binary file etl.editor/src/org/netbeans/modules/mashup/db/ui/resource/images/warning.png has changed
555.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/AutoMapToTarget.png has changed
556.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Auto_Layout.png has changed
557.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Boolean.png has changed
558.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Case.png has changed
559.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/CharToDate.png has changed
560.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Collapse_All.png has changed
561.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/ColumnSelection.png has changed
562.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Comparison.png has changed
563.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Count.png has changed
564.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/DatabaseProperties.png has changed
565.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/DateAddition.png has changed
566.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/DateSubtraction.png has changed
567.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/DateToChar.png has changed
568.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Error.png has changed
569.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Expand_All.png has changed
570.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/ISNOTNULL.png has changed
571.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/ISNULL.png has changed
572.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Join.png has changed
573.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Math.png has changed
574.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/NOW2.png has changed
575.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Pane.png has changed
576.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/RuntimeInput.png has changed
577.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/RuntimeOutput.png has changed
578.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/SUM.png has changed
579.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/ShowMappedOnly.png has changed
580.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Show_Source_Columns.png has changed
581.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Show_Sql.png has changed
582.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/SourceTable.png has changed
583.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/String.png has changed
584.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Table32.gif has changed
585.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/TableSelection.png has changed
586.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/TargetTable.png has changed
587.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Warning.png has changed
588.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Zoom_In.png has changed
589.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/Zoom_Out.png has changed
590.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/addition.gif has changed
591.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/and.png has changed
592.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/arrow_down.gif has changed
593.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/arrow_up.gif has changed
594.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/assignDown.png has changed
595.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/assignUp.png has changed
596.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/average.png has changed
597.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/booleanNot.png has changed
598.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/castAs.png has changed
599.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/category_10x16.png has changed
600.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/coalesce.png has changed
601.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/collapse_all_edm.png has changed
602.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/collapsed.gif has changed
603.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/column.png has changed
604.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/columnsSortedAsc.gif has changed
605.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/columnsSortedDesc.gif has changed
606.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/concat.gif has changed
607.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/datePart.png has changed
608.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/division.png has changed
609.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/down.png has changed
610.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/editWhen.png has changed
611.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/edit_join.png has changed
612.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/edm-collapse.png has changed
613.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/edm-expand.png has changed
614.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/equal.png has changed
615.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/expand_all_edm.png has changed
616.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/expanded.gif has changed
617.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/filter16.gif has changed
618.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/format_date.gif has changed
619.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/funnel.png has changed
620.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/greater_equal.png has changed
621.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/greater_than.png has changed
622.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/information.png has changed
623.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/isValidDateTime.png has changed
624.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/join_view.png has changed
625.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/layout_edm.png has changed
626.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/leftTrim.png has changed
627.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/length.png has changed
628.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/lesser_equal.png has changed
629.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/lesser_than.png has changed
630.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/like.png has changed
631.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/literal.png has changed
632.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/lowercase.gif has changed
633.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/matches.png has changed
634.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/max.png has changed
635.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/min.png has changed
636.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/modified_condition.png has changed
637.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/modified_condition_hover.png has changed
638.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/modulo.png has changed
639.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/multiplication.png has changed
640.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/navigate_beginning.png has changed
641.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/navigate_end.png has changed
642.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/navigate_left.png has changed
643.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/navigate_right.png has changed
644.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/nextmatch.png has changed
645.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/no_condition.png has changed
646.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/no_condition_hover.png has changed
647.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/normalizePerson.png has changed
648.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/not_equal.png has changed
649.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/null.png has changed
650.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/nullif.png has changed
651.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/numberToHex.png has changed
652.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/or.png has changed
653.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/otd.png has changed
654.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/parseAddress.png has changed
655.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/parseBusinessName.png has changed
656.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/prevmatch.png has changed
657.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/print.gif has changed
658.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/properties.png has changed
659.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/redo.png has changed
660.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/refresh.gif has changed
661.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/refresh.png has changed
662.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/refresh16.png has changed
663.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/refresh16_1.png has changed
664.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/remove.png has changed
665.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/replace.gif has changed
666.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/rerun.png has changed
667.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/rightCheck.png has changed
668.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/rightTrim.png has changed
669.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/root.png has changed
670.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/row_add.png has changed
671.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/row_delete.png has changed
672.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/row_preferences.png has changed
673.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/run16.gif has changed
674.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/run16.png has changed
675.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/runCollaboration.png has changed
676.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/saveAll24.png has changed
677.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/select_tables.png has changed
678.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/showOutput.png has changed
679.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/showRejectedData.png has changed
680.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/sign.png has changed
681.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/stop.gif has changed
682.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/stringToHex.png has changed
683.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/substring.gif has changed
684.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/subtraction.gif has changed
685.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/sync.gif has changed
686.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/system_condition.png has changed
687.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/system_condition_hover.png has changed
688.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/table_truncate.png has changed
689.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/targetTableCondition.png has changed
690.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/trim.gif has changed
691.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/undo.png has changed
692.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/ungroup_table.png has changed
693.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/up.png has changed
694.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/uppercase.gif has changed
695.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/userFunction.png has changed
696.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/validate.png has changed
697.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/validateField.png has changed
698.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/validateMenu.png has changed
699.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/validation_edm.png has changed
700.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/var.gif has changed
701.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/zoom_in_edm.png has changed
702.1 Binary file etl.editor/src/org/netbeans/modules/sql/framework/ui/resources/images/zoom_out_edm.png has changed
703.1 Binary file etl.project/src/org/netbeans/modules/etl/project/ui/resources/etlproProjectIcon.gif has changed
704.1 Binary file iep.editor/src/images/alphabetize.gif has changed
705.1 Binary file iep.editor/src/images/attributeBasedWindowx16.png has changed
706.1 Binary file iep.editor/src/images/attributeBasedWindowx32.png has changed
707.1 Binary file iep.editor/src/images/autoLayout.gif has changed
708.1 Binary file iep.editor/src/images/batchedStreamOutputx16.png has changed
709.1 Binary file iep.editor/src/images/batchedStreamOutputx32.png has changed
710.1 Binary file iep.editor/src/images/categorize.gif has changed
711.1 Binary file iep.editor/src/images/contiguousOrderx16.png has changed
712.1 Binary file iep.editor/src/images/contiguousOrderx32.png has changed
713.1 Binary file iep.editor/src/images/copy.gif has changed
714.1 Binary file iep.editor/src/images/cursorsnone.gif has changed
715.1 Binary file iep.editor/src/images/delete.gif has changed
716.1 Binary file iep.editor/src/images/deleteStreamx16.png has changed
717.1 Binary file iep.editor/src/images/deleteStreamx32.png has changed
718.1 Binary file iep.editor/src/images/distinctx16.png has changed
719.1 Binary file iep.editor/src/images/distinctx32.png has changed
720.1 Binary file iep.editor/src/images/documentationx16.png has changed
721.1 Binary file iep.editor/src/images/error.gif has changed
722.1 Binary file iep.editor/src/images/error_badge.png has changed
723.1 Binary file iep.editor/src/images/fit_diagram.png has changed
724.1 Binary file iep.editor/src/images/fit_width.png has changed
725.1 Binary file iep.editor/src/images/gapWindowx16.png has changed
726.1 Binary file iep.editor/src/images/gapWindowx32.png has changed
727.1 Binary file iep.editor/src/images/help.gif has changed
728.1 Binary file iep.editor/src/images/icons32x32/attributeBasedWindowx32.png has changed
729.1 Binary file iep.editor/src/images/icons32x32/batchedStreamOutputx32.png has changed
730.1 Binary file iep.editor/src/images/icons32x32/contiguousOrderx32.png has changed
731.1 Binary file iep.editor/src/images/icons32x32/deleteStreamx32.png has changed
732.1 Binary file iep.editor/src/images/icons32x32/distinctx32.png has changed
733.1 Binary file iep.editor/src/images/icons32x32/gapWindowx32.png has changed
734.1 Binary file iep.editor/src/images/icons32x32/insertStreamx32.png has changed
735.1 Binary file iep.editor/src/images/icons32x32/intersect4.png has changed
736.1 Binary file iep.editor/src/images/icons32x32/intersectx32.png has changed
737.1 Binary file iep.editor/src/images/icons32x32/minusx32.png has changed
738.1 Binary file iep.editor/src/images/icons32x32/notificationStreamx32.png has changed
739.1 Binary file iep.editor/src/images/icons32x32/partitionedWindowx32.png has changed
740.1 Binary file iep.editor/src/images/icons32x32/relationAggregatorx32.png has changed
741.1 Binary file iep.editor/src/images/icons32x32/relationMapx32.png has changed
742.1 Binary file iep.editor/src/images/icons32x32/relationOutputx32.png has changed
743.1 Binary file iep.editor/src/images/icons32x32/relationStreamx32.png has changed
744.1 Binary file iep.editor/src/images/icons32x32/streamInputx32.png has changed
745.1 Binary file iep.editor/src/images/icons32x32/streamOutputx32.png has changed
746.1 Binary file iep.editor/src/images/icons32x32/streamProjectionAndFilterx32.png has changed
747.1 Binary file iep.editor/src/images/icons32x32/tableInputx32.png has changed
748.1 Binary file iep.editor/src/images/icons32x32/tableOutputx32.png has changed
749.1 Binary file iep.editor/src/images/icons32x32/tablex32.png has changed
750.1 Binary file iep.editor/src/images/icons32x32/timeBasedAggregatorx32.png has changed
751.1 Binary file iep.editor/src/images/icons32x32/timeBasedWindowx32.png has changed
752.1 Binary file iep.editor/src/images/icons32x32/tupleBasedAggregatorx32.png has changed
753.1 Binary file iep.editor/src/images/icons32x32/tupleBasedWindowx32.png has changed
754.1 Binary file iep.editor/src/images/icons32x32/tupleSerialCorrelationx32.png has changed
755.1 Binary file iep.editor/src/images/icons32x32/unionAllx32.png has changed
756.1 Binary file iep.editor/src/images/icons32x32/unionx32.png has changed
757.1 Binary file iep.editor/src/images/insertStreamx16.png has changed
758.1 Binary file iep.editor/src/images/insertStreamx32.png has changed
759.1 Binary file iep.editor/src/images/intersectx16.png has changed
760.1 Binary file iep.editor/src/images/intersectx32.png has changed
761.1 Binary file iep.editor/src/images/minus.gif has changed
762.1 Binary file iep.editor/src/images/minusx16.png has changed
763.1 Binary file iep.editor/src/images/minusx32.png has changed
764.1 Binary file iep.editor/src/images/normal_size.png has changed
765.1 Binary file iep.editor/src/images/notificationStreamx16.png has changed
766.1 Binary file iep.editor/src/images/notificationStreamx32.png has changed
767.1 Binary file iep.editor/src/images/orthoLink.gif has changed
768.1 Binary file iep.editor/src/images/overview.gif has changed
769.1 Binary file iep.editor/src/images/partitionedWindowx16.png has changed
770.1 Binary file iep.editor/src/images/partitionedWindowx32.png has changed
771.1 Binary file iep.editor/src/images/paste.gif has changed
772.1 Binary file iep.editor/src/images/plus.gif has changed
773.1 Binary file iep.editor/src/images/relationAggregatorx16.png has changed
774.1 Binary file iep.editor/src/images/relationAggregatorx32.png has changed
775.1 Binary file iep.editor/src/images/relationMapx16.png has changed
776.1 Binary file iep.editor/src/images/relationMapx32.png has changed
777.1 Binary file iep.editor/src/images/relationOutputx16.png has changed
778.1 Binary file iep.editor/src/images/relationOutputx32.png has changed
779.1 Binary file iep.editor/src/images/relationStreamx16.png has changed
780.1 Binary file iep.editor/src/images/relationStreamx32.png has changed
781.1 Binary file iep.editor/src/images/schema.gif has changed
782.1 Binary file iep.editor/src/images/stcIco.gif has changed
783.1 Binary file iep.editor/src/images/streamInputx16.png has changed
784.1 Binary file iep.editor/src/images/streamInputx32.png has changed
785.1 Binary file iep.editor/src/images/streamOutputx16.png has changed
786.1 Binary file iep.editor/src/images/streamOutputx32.png has changed
787.1 Binary file iep.editor/src/images/streamProjectionAndFilterx16.png has changed
788.1 Binary file iep.editor/src/images/streamProjectionAndFilterx32.png has changed
789.1 Binary file iep.editor/src/images/tableInputx16.png has changed
790.1 Binary file iep.editor/src/images/tableInputx32.png has changed
791.1 Binary file iep.editor/src/images/tableOutputx16.png has changed
792.1 Binary file iep.editor/src/images/tableOutputx32.png has changed
793.1 Binary file iep.editor/src/images/tablex16.png has changed
794.1 Binary file iep.editor/src/images/tablex32.png has changed
795.1 Binary file iep.editor/src/images/timeBasedAggregatorx16.png has changed
796.1 Binary file iep.editor/src/images/timeBasedAggregatorx32.png has changed
797.1 Binary file iep.editor/src/images/timeBasedWindowx16.png has changed
798.1 Binary file iep.editor/src/images/timeBasedWindowx32.png has changed
799.1 Binary file iep.editor/src/images/tupleBasedAggregatorx16.png has changed
800.1 Binary file iep.editor/src/images/tupleBasedAggregatorx32.png has changed
801.1 Binary file iep.editor/src/images/tupleBasedWindowx16.png has changed
802.1 Binary file iep.editor/src/images/tupleBasedWindowx32.png has changed
803.1 Binary file iep.editor/src/images/tupleSerialCorrelationx16.png has changed
804.1 Binary file iep.editor/src/images/tupleSerialCorrelationx32.png has changed
805.1 Binary file iep.editor/src/images/unionAllx16.png has changed
806.1 Binary file iep.editor/src/images/unionAllx32.png has changed
807.1 Binary file iep.editor/src/images/unionx16.png has changed
808.1 Binary file iep.editor/src/images/unionx32.png has changed
809.1 Binary file iep.editor/src/images/validation.png has changed
810.1 Binary file iep.editor/src/images/x16.cut.gif has changed
811.1 Binary file iep.editor/src/images/x16.redo.gif has changed
812.1 Binary file iep.editor/src/images/x16.undo.gif has changed
813.1 Binary file iep.editor/src/images/zoom_in.png has changed
814.1 Binary file iep.editor/src/images/zoom_out.png has changed
815.1 Binary file iep.editor/src/org/netbeans/modules/iep/editor/eventProcess.png has changed
816.1 Binary file iep.project/src/org/netbeans/modules/iep/project/ui/resources/iepProject.gif has changed
817.1 --- a/o.n.soa.libs.httpunit/build.xml Sat Jan 26 03:07:46 2008 +0000
817.2 +++ b/o.n.soa.libs.httpunit/build.xml Sat Jan 26 05:58:37 2008 +0000
817.3 @@ -20,12 +20,12 @@
817.4 <project name="httpunit" default="netbeans" basedir=".">
817.5 <import file="../../../nbbuild/templates/projectized.xml"/>
817.6
817.7 - <!--target name="netbeans-extra">
817.8 + <target name="netbeans-extra">
817.9 <mkdir dir="${cluster}/modules/ext"/>
817.10 <copy todir="${cluster}/modules/ext/jbi">
817.11 <fileset dir="external">
817.12 <include name="*.jar"/>
817.13 </fileset>
817.14 </copy>
817.15 - </target-->
817.16 + </target>
817.17 </project>
818.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
818.2 +++ b/o.n.soa.libs.httpunit/external/httpunit-1.6.2.jar Sat Jan 26 05:58:37 2008 +0000
818.3 @@ -0,0 +1,1 @@
818.4 +<<<EXTERNAL B4B42BDA5955665AE5B6D7FA60A4B401BD1063E2-httpunit-1.6.2.jar>>>
819.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
819.2 +++ b/o.n.soa.libs.jbiadmincommon/external/jbi-admin-common.jar Sat Jan 26 05:58:37 2008 +0000
819.3 @@ -0,0 +1,1 @@
819.4 +<<<EXTERNAL 32256B2EA126131B0D47679ACF7354109682BBBE-jbi-admin-common.jar>>>
820.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
820.2 +++ b/o.n.soa.libs.jgo/external/JGo5.1.jar Sat Jan 26 05:58:37 2008 +0000
820.3 @@ -0,0 +1,1 @@
820.4 +<<<EXTERNAL B248D473DC3F308E0629264740B9BB6CADF9FCB2-JGo5.1.jar>>>
821.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
821.2 +++ b/o.n.soa.libs.jgo/external/JGoInstruments5.1.jar Sat Jan 26 05:58:37 2008 +0000
821.3 @@ -0,0 +1,1 @@
821.4 +<<<EXTERNAL 18D65CDEFE572DE881FDAB4BA9079D9B19EE9F71-JGoInstruments5.1.jar>>>
822.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
822.2 +++ b/o.n.soa.libs.jgo/external/JGoLayout5.1.jar Sat Jan 26 05:58:37 2008 +0000
822.3 @@ -0,0 +1,1 @@
822.4 +<<<EXTERNAL B40B8ED2B532976F8F6CEACFE101923FD8AA5B0D-JGoLayout5.1.jar>>>
823.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
823.2 +++ b/o.n.soa.libs.wsdl4j/external/wsdl4j-1.5.2.zip Sat Jan 26 05:58:37 2008 +0000
823.3 @@ -0,0 +1,1 @@
823.4 +<<<EXTERNAL 129CC5B153EB6C50C60F9226CA75791ED834E214-wsdl4j-1.5.2.zip>>>
824.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
824.2 +++ b/o.n.soa.libs.xmlbeans/external/xmlbeans-2.1.0.zip Sat Jan 26 05:58:37 2008 +0000
824.3 @@ -0,0 +1,1 @@
824.4 +<<<EXTERNAL E9F6043038CE96817BA2909E8DA8141DEA949731-xmlbeans-2.1.0.zip>>>
825.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/canvas/jgo/collapsed.gif has changed
826.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/canvas/jgo/expended.gif has changed
827.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/palette/Auto_Layout.png has changed
828.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/palette/Collapse_All.png has changed
829.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/palette/DeleteSelection.png has changed
830.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/palette/Expand_All.png has changed
831.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/palette/category_10x16.png has changed
832.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/basicmapper/palette/down.png has changed
833.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/common/palette/resources/palette.gif has changed
834.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/common/palette/resources/palette32.gif has changed
835.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/common/palette/resources/paletteCategory.gif has changed
836.1 Binary file soa.mapper/src/org/netbeans/modules/soa/mapper/common/palette/resources/paletteCategory32.gif has changed
837.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
837.2 +++ b/soa.reportgenerator/external/itext-2.0.5.jar Sat Jan 26 05:58:37 2008 +0000
837.3 @@ -0,0 +1,1 @@
837.4 +<<<EXTERNAL 5EC866D83AE50C70D87150239D44260F0867E521-itext-2.0.5.jar>>>
838.1 Binary file soa.reportgenerator/src/org/netbeans/modules/reportgenerator/api/impl/resources/images/customChooser.png has changed
839.1 Binary file soa.reportgenerator/src/org/netbeans/modules/reportgenerator/api/impl/resources/images/customizeReport.png has changed
840.1 Binary file soa.reportgenerator/src/org/netbeans/modules/reportgenerator/api/impl/resources/images/documentationx16.png has changed
841.1 Binary file soa.reportgenerator/src/org/netbeans/modules/reportgenerator/api/impl/resources/images/generateReport.png has changed
842.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/axinodes/images/ATTRIBUTE.png has changed
843.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/axinodes/images/ATTRIBUTE_OPTIONAL.png has changed
844.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/axinodes/images/ELEMENT.png has changed
845.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/axinodes/images/ELEMENT_OPTIONAL.png has changed
846.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/axinodes/images/ELEMENT_OPTIONAL_REPEATING.png has changed
847.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/axinodes/images/ELEMENT_REPEATING.png has changed
848.1 Binary file soa.ui/src/org/netbeans/modules/soa/ui/tnv/scrollpane/thumbnail_view.png has changed
849.1 --- a/sql.project/nbproject/project.xml Sat Jan 26 03:07:46 2008 +0000
849.2 +++ b/sql.project/nbproject/project.xml Sat Jan 26 05:58:37 2008 +0000
849.3 @@ -22,7 +22,6 @@
849.4 <configuration>
849.5 <data xmlns="http://www.netbeans.org/ns/nb-module-project/3">
849.6 <code-name-base>org.netbeans.modules.sql.project</code-name-base>
849.7 - <standalone/>
849.8 <module-dependencies>
849.9 <dependency>
849.10 <code-name-base>org.netbeans.modules.compapp.projects.base</code-name-base>
850.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/Datasource.gif has changed
851.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/docjar.gif has changed
852.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/j2seProject.gif has changed
853.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/jar.gif has changed
854.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/libraries.gif has changed
855.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/projectDependencies.gif has changed
856.1 Binary file sql.project/src/org/netbeans/modules/sql/project/ui/resources/sqlproProjectIcon.gif has changed
857.1 Binary file sql.wizard/src/org/netbeans/modules/jdbcwizard/resources/SourceTable.png has changed
858.1 Binary file wsdlextensions.file/src/org/netbeans/modules/wsdlextensions/file/resources/onalarm16x16.png has changed
859.1 Binary file wsdlextensions.file/src/org/netbeans/modules/wsdlextensions/file/resources/onmessage16x16.png has changed
860.1 Binary file wsdlextensions.file/src/org/netbeans/modules/wsdlextensions/file/resources/scope16x16.png has changed
861.1 Binary file wsdlextensions.file/src/org/netbeans/modules/wsdlextensions/file/resources/throw16.png has changed
862.1 Binary file wsdlextensions.file/src/org/netbeans/modules/wsdlextensions/file/resources/while16x16.png has changed
863.1 Binary file wsdlextensions.ftp/src/org/netbeans/modules/wsdlextensions/ftp/resources/onalarm16x16.png has changed
864.1 Binary file wsdlextensions.ftp/src/org/netbeans/modules/wsdlextensions/ftp/resources/onmessage16x16.png has changed
865.1 Binary file wsdlextensions.ftp/src/org/netbeans/modules/wsdlextensions/ftp/resources/scope16x16.png has changed
866.1 Binary file wsdlextensions.ftp/src/org/netbeans/modules/wsdlextensions/ftp/resources/throw16.png has changed
867.1 Binary file wsdlextensions.ftp/src/org/netbeans/modules/wsdlextensions/ftp/resources/while16x16.png has changed
868.1 Binary file wsdlextensions.jms/src/org/netbeans/modules/wsdlextensions/jms/resources/onalarm16x16.png has changed
869.1 Binary file wsdlextensions.jms/src/org/netbeans/modules/wsdlextensions/jms/resources/onmessage16x16.png has changed
870.1 Binary file wsdlextensions.jms/src/org/netbeans/modules/wsdlextensions/jms/resources/scope16x16.png has changed
871.1 Binary file wsdlextensions.jms/src/org/netbeans/modules/wsdlextensions/jms/resources/throw16.png has changed
872.1 Binary file wsdlextensions.jms/src/org/netbeans/modules/wsdlextensions/jms/resources/while16x16.png has changed
873.1 Binary file wsdlextensions.snmp/src/org/netbeans/modules/wsdlextensions/snmp/resources/onalarm16x16.png has changed
874.1 Binary file wsdlextensions.snmp/src/org/netbeans/modules/wsdlextensions/snmp/resources/onmessage16x16.png has changed
875.1 Binary file wsdlextensions.snmp/src/org/netbeans/modules/wsdlextensions/snmp/resources/scope16x16.png has changed
876.1 Binary file wsdlextensions.snmp/src/org/netbeans/modules/wsdlextensions/snmp/resources/throw16.png has changed
877.1 Binary file wsdlextensions.snmp/src/org/netbeans/modules/wsdlextensions/snmp/resources/while16x16.png has changed
878.1 Binary file xslt.core/src/org/netbeans/modules/xslt/core/resources/xslt_file.gif has changed
879.1 Binary file xslt.help/javahelp/org/netbeans/modules/xslt/help/images/attribute.png has changed
880.1 Binary file xslt.help/javahelp/org/netbeans/modules/xslt/help/images/element.png has changed
881.1 Binary file xslt.help/javahelp/org/netbeans/modules/xslt/help/images/rule.png has changed
882.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/model/nodes/actions/Instruction.png has changed
883.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/addition16.png has changed
884.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/addition32.png has changed
885.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/and16.png has changed
886.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/and32.png has changed
887.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/boolean16.png has changed
888.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/boolean32.png has changed
889.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/category_boolean.png has changed
890.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/category_date.png has changed
891.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/category_nodes.png has changed
892.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/category_number.png has changed
893.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/category_operators.png has changed
894.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/category_string.png has changed
895.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/ceiling16.png has changed
896.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/ceiling32.png has changed
897.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/concat16.png has changed
898.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/concat32.png has changed
899.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/contains16.png has changed
900.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/contains32.png has changed
901.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/count16.png has changed
902.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/count32.png has changed
903.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/current-date16.png has changed
904.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/current-date32.png has changed
905.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/current-dateTime16.png has changed
906.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/current-dateTime32.png has changed
907.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/current-time16.png has changed
908.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/current-time32.png has changed
909.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/division16.png has changed
910.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/division32.png has changed
911.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/duration-literal16.png has changed
912.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/duration-literal32.png has changed
913.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/equal16.png has changed
914.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/equal32.png has changed
915.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/false16.png has changed
916.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/false32.png has changed
917.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/floor16.png has changed
918.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/floor32.png has changed
919.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/greater_or_equal16.png has changed
920.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/greater_or_equal32.png has changed
921.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/greater_than16.png has changed
922.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/greater_than32.png has changed
923.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/lang16.png has changed
924.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/lang32.png has changed
925.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/last16.png has changed
926.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/last32.png has changed
927.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/less_or_equal16.png has changed
928.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/less_or_equal32.png has changed
929.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/less_than16.png has changed
930.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/less_than32.png has changed
931.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/local-name16.png has changed
932.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/local-name32.png has changed
933.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/mod16.png has changed
934.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/mod32.png has changed
935.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/multiplication16.png has changed
936.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/multiplication32.png has changed
937.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/name16.png has changed
938.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/name32.png has changed
939.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/namespace-uri16.png has changed
940.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/namespace-uri32.png has changed
941.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/negative16.png has changed
942.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/negative32.png has changed
943.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/normalize-space16.png has changed
944.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/normalize-space32.png has changed
945.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/not16.png has changed
946.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/not32.png has changed
947.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/not_equal16.png has changed
948.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/not_equal32.png has changed
949.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/number-literal16.png has changed
950.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/number-literal32.png has changed
951.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/number16.png has changed
952.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/number32.png has changed
953.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/or16.png has changed
954.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/or32.png has changed
955.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/position16.png has changed
956.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/position32.png has changed
957.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/predicate16.png has changed
958.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/predicate32.png has changed
959.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/round16.png has changed
960.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/round32.png has changed
961.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/starts-with16.png has changed
962.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/starts-with32.png has changed
963.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/string-length16.png has changed
964.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/string-length32.png has changed
965.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/string-literal16.png has changed
966.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/string-literal32.png has changed
967.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/string16.png has changed
968.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/string32.png has changed
969.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/substring-after16.png has changed
970.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/substring-after32.png has changed
971.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/substring-before16.png has changed
972.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/substring-before32.png has changed
973.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/substring16.png has changed
974.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/substring32.png has changed
975.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/subtraction16.png has changed
976.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/subtraction32.png has changed
977.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/sum16.png has changed
978.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/sum32.png has changed
979.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/translate16.png has changed
980.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/translate32.png has changed
981.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/true16.png has changed
982.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/true32.png has changed
983.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/xpath_expression16.png has changed
984.1 Binary file xslt.mapper/src/org/netbeans/modules/xslt/mapper/palette/icons/xpath_expression32.png has changed
985.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/inputTransformationDesc.png has changed
986.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/j2seProject.gif has changed
987.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/jar.gif has changed
988.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/libraries.gif has changed
989.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/outputTransformationDesc.png has changed
990.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/projectDependencies.gif has changed
991.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/proxyUC.png has changed
992.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/requestReplyUC.png has changed
993.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/transformations.gif has changed
994.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/xslt.gif has changed
995.1 Binary file xslt.project/src/org/netbeans/modules/xslt/project/resources/xsltProjectIcon.png has changed
996.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/INVOKE.png has changed
997.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/INVOKES_NO_TRANSFORMATION.png has changed
998.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/OPERATION.png has changed
999.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/OPERATION_NO_TRANSFORMATION.png has changed
1000.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/PARAM.png has changed
1001.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/SERVICE.png has changed
1002.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/TRANSFORM.png has changed
1003.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/TRANSFORMMAP.png has changed
1004.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/UNKNOWN_TYPE.png has changed
1005.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/header.png has changed
1006.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/service1.png has changed
1007.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/serviceFolder.png has changed
1008.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/images/web_service.png has changed
1009.1 Binary file xslt.tmap/src/org/netbeans/modules/xslt/tmap/resources/tmap.png has changed
