author
int64 658
755k
| date
stringlengths 19
19
| timezone
int64 -46,800
43.2k
| hash
stringlengths 40
40
| message
stringlengths 5
490
| mods
list | language
stringclasses 20
values | license
stringclasses 3
values | repo
stringlengths 5
68
| original_message
stringlengths 12
491
|
|---|---|---|---|---|---|---|---|---|---|
499,362 |
14.10.2022 10:31:07
| -28,800 |
4d80a21fe42c9da161a16af281a35f4dc436e241
|
Add RandomDistort Prob Notes
|
[
{
"change_type": "MODIFY",
"old_path": "ppdet/data/transform/operators.py",
"new_path": "ppdet/data/transform/operators.py",
"diff": "@@ -457,6 +457,10 @@ class GridMask(BaseOperator):\n@register_op\nclass RandomDistort(BaseOperator):\n\"\"\"Random color distortion.\n+ Note:\n+ The 'probability' in [lower, upper, probability] is the probability of not using this transformation,\n+ not the probability of using this transformation. And this only applies in this operator(RandomDistort),\n+ 'probability' in other BaseOperator means the probability of using that transformation.\nArgs:\nhue (list): hue settings. in [lower, upper, probability] format.\nsaturation (list): saturation settings. in [lower, upper, probability] format.\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
Add RandomDistort Prob Notes (#7116)
|
499,337 |
14.10.2022 22:36:22
| -28,800 |
6818036daf24253e96e6149d9a9472685bf8cbae
|
fix ppvehicle_attribute.md add attribute legend
|
[
{
"change_type": "ADD",
"old_path": "docs/images/ppvehicle_add_attribute.png",
"new_path": "docs/images/ppvehicle_add_attribute.png",
"diff": "Binary files /dev/null and b/docs/images/ppvehicle_add_attribute.png differ\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
fix ppvehicle_attribute.md add attribute legend (#7118)
|
499,363 |
25.10.2022 14:44:27
| -28,800 |
e066d8d1abff729b0efc042a2e83e48d87898888
|
fix bug for mtmct attr vis
|
[
{
"change_type": "MODIFY",
"old_path": "deploy/pipeline/pphuman/mtmct.py",
"new_path": "deploy/pipeline/pphuman/mtmct.py",
"diff": "@@ -118,6 +118,7 @@ def save_mtmct_vis_results(camera_results, captures, output_dir,\nfor idx, video_file in enumerate(captures):\ncapture = cv2.VideoCapture(video_file)\ncid = camera_ids[idx]\n+\nbasename = os.path.basename(video_file)\nvideo_out_name = \"vis_\" + basename\nout_path = os.path.join(save_dir, video_out_name)\n@@ -151,16 +152,22 @@ def save_mtmct_vis_results(camera_results, captures, output_dir,\ntid_list = multi_res.keys() # c0_t1, c0_t2...\nall_attr_result = [multi_res[i][\"attrs\"]\nfor i in tid_list] # all cid_tid result\n+\nif any(\nall_attr_result\n): # at least one cid_tid[attrs] is not None will goes to attrs_vis\nattr_res = []\n+ cid_str = 'c' + str(cid - 1) + \"_\"\nfor k in tid_list:\n+ if not k.startswith(cid_str):\n+ continue\nif (frame_id - 1) >= len(multi_res[k]['attrs']):\nt_attr = None\nelse:\nt_attr = multi_res[k]['attrs'][frame_id - 1]\nattr_res.append(t_attr)\n+\n+ assert len(attr_res) == len(boxes)\nimage = visualize_attr(\nimage, attr_res, boxes, is_mtmct=True)\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
fix bug for mtmct attr vis (#7165)
|
499,304 |
26.10.2022 20:36:24
| -28,800 |
b0620a7b87826d9e37f14ade696b59c3c80c7ce3
|
correct the use of all_reduce
|
[
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/heads/gfl_head.py",
"new_path": "ppdet/modeling/heads/gfl_head.py",
"diff": "@@ -388,12 +388,7 @@ class GFLHead(nn.Layer):\navg_factor = sum(avg_factor)\ntry:\n- avg_factor_clone = avg_factor.clone()\n- tmp_avg_factor = paddle.distributed.all_reduce(avg_factor_clone)\n- if tmp_avg_factor is not None:\n- avg_factor = tmp_avg_factor\n- else:\n- avg_factor = avg_factor_clone\n+ paddle.distributed.all_reduce(avg_factor)\navg_factor = paddle.clip(\navg_factor / paddle.distributed.get_world_size(), min=1)\nexcept:\n"
},
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/heads/simota_head.py",
"new_path": "ppdet/modeling/heads/simota_head.py",
"diff": "@@ -179,15 +179,8 @@ class OTAHead(GFLHead):\nnum_level_anchors)\nnum_total_pos = sum(pos_num_l)\ntry:\n- cloned_num_total_pos = num_total_pos.clone()\n- reduced_cloned_num_total_pos = paddle.distributed.all_reduce(\n- cloned_num_total_pos)\n- if reduced_cloned_num_total_pos is not None:\n- num_total_pos = reduced_cloned_num_total_pos / paddle.distributed.get_world_size(\n- )\n- else:\n- num_total_pos = cloned_num_total_pos / paddle.distributed.get_world_size(\n- )\n+ paddle.distributed.all_reduce(num_total_pos)\n+ num_total_pos = num_total_pos / paddle.distributed.get_world_size()\nexcept:\nnum_total_pos = max(num_total_pos, 1)\n@@ -262,12 +255,7 @@ class OTAHead(GFLHead):\navg_factor = sum(avg_factor)\ntry:\n- avg_factor_clone = avg_factor.clone()\n- tmp_avg_factor = paddle.distributed.all_reduce(avg_factor_clone)\n- if tmp_avg_factor is not None:\n- avg_factor = tmp_avg_factor\n- else:\n- avg_factor = avg_factor_clone\n+ paddle.distributed.all_reduce(avg_factor)\navg_factor = paddle.clip(\navg_factor / paddle.distributed.get_world_size(), min=1)\nexcept:\n@@ -408,15 +396,8 @@ class OTAVFLHead(OTAHead):\nnum_level_anchors)\nnum_total_pos = sum(pos_num_l)\ntry:\n- cloned_num_total_pos = num_total_pos.clone()\n- reduced_cloned_num_total_pos = paddle.distributed.all_reduce(\n- cloned_num_total_pos)\n- if reduced_cloned_num_total_pos is not None:\n- num_total_pos = reduced_cloned_num_total_pos / paddle.distributed.get_world_size(\n- )\n- else:\n- num_total_pos = cloned_num_total_pos / paddle.distributed.get_world_size(\n- )\n+ paddle.distributed.all_reduce(num_total_pos)\n+ num_total_pos = num_total_pos / paddle.distributed.get_world_size()\nexcept:\nnum_total_pos = max(num_total_pos, 1)\n@@ -494,12 +475,7 @@ class OTAVFLHead(OTAHead):\navg_factor = sum(avg_factor)\ntry:\n- avg_factor_clone = avg_factor.clone()\n- tmp_avg_factor = paddle.distributed.all_reduce(avg_factor_clone)\n- if tmp_avg_factor is not None:\n- avg_factor = tmp_avg_factor\n- else:\n- avg_factor = avg_factor_clone\n+ paddle.distributed.all_reduce(avg_factor)\navg_factor = paddle.clip(\navg_factor / paddle.distributed.get_world_size(), min=1)\nexcept:\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
correct the use of all_reduce (#7108) (#7199)
|
499,304 |
31.10.2022 20:12:40
| -28,800 |
ba2aad26e6bc1e5c2dad76ca96692a0d63eccfac
|
fix dynamic shape of reshape op when export model
|
[
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/heads/gfl_head.py",
"new_path": "ppdet/modeling/heads/gfl_head.py",
"diff": "@@ -260,7 +260,7 @@ class GFLHead(nn.Layer):\ncenter_points = paddle.stack([x, y], axis=-1)\ncls_score = cls_score.reshape([b, -1, self.cls_out_channels])\nbbox_pred = self.distribution_project(bbox_pred) * stride\n- bbox_pred = bbox_pred.reshape([b, cell_h * cell_w, 4])\n+ bbox_pred = bbox_pred.reshape([-1, cell_h * cell_w, 4])\n# NOTE: If keep_ratio=False and image shape value that\n# multiples of 32, distance2bbox not set max_shapes parameter\n"
},
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/heads/pico_head.py",
"new_path": "ppdet/modeling/heads/pico_head.py",
"diff": "@@ -353,13 +353,13 @@ class PicoHead(OTAVFLHead):\nbbox_pred = bbox_pred.reshape([1, (self.reg_max + 1) * 4,\n-1]).transpose([0, 2, 1])\nelse:\n- b, _, h, w = fpn_feat.shape\n+ _, _, h, w = fpn_feat.shape\nl = h * w\ncls_score_out = F.sigmoid(\n- cls_score.reshape([b, self.cls_out_channels, l]))\n+ cls_score.reshape([-1, self.cls_out_channels, l]))\nbbox_pred = bbox_pred.transpose([0, 2, 3, 1])\nbbox_pred = self.distribution_project(bbox_pred)\n- bbox_pred = bbox_pred.reshape([b, l, 4])\n+ bbox_pred = bbox_pred.reshape([-1, l, 4])\ncls_logits_list.append(cls_score_out)\nbboxes_reg_list.append(bbox_pred)\n@@ -597,7 +597,7 @@ class PicoHeadV2(GFLHead):\nanchor_points, stride_tensor = self._generate_anchors(fpn_feats)\ncls_score_list, box_list = [], []\nfor i, (fpn_feat, stride) in enumerate(zip(fpn_feats, self.fpn_stride)):\n- b, _, h, w = fpn_feat.shape\n+ _, _, h, w = fpn_feat.shape\n# task decomposition\nconv_cls_feat, se_feat = self.conv_feat(fpn_feat, i)\ncls_logit = self.head_cls_list[i](se_feat)\n@@ -620,10 +620,11 @@ class PicoHeadV2(GFLHead):\n[0, 2, 1]))\nelse:\nl = h * w\n- cls_score_out = cls_score.reshape([b, self.cls_out_channels, l])\n+ cls_score_out = cls_score.reshape(\n+ [-1, self.cls_out_channels, l])\nbbox_pred = reg_pred.transpose([0, 2, 3, 1])\nbbox_pred = self.distribution_project(bbox_pred)\n- bbox_pred = bbox_pred.reshape([b, l, 4])\n+ bbox_pred = bbox_pred.reshape([-1, l, 4])\ncls_score_list.append(cls_score_out)\nbox_list.append(bbox_pred)\n"
},
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/heads/ppyoloe_head.py",
"new_path": "ppdet/modeling/heads/ppyoloe_head.py",
"diff": "@@ -192,7 +192,7 @@ class PPYOLOEHead(nn.Layer):\nanchor_points, stride_tensor = self._generate_anchors(feats)\ncls_score_list, reg_dist_list = [], []\nfor i, feat in enumerate(feats):\n- b, _, h, w = feat.shape\n+ _, _, h, w = feat.shape\nl = h * w\navg_feat = F.adaptive_avg_pool2d(feat, (1, 1))\ncls_logit = self.pred_cls[i](self.stem_cls[i](feat, avg_feat) +\n@@ -203,7 +203,7 @@ class PPYOLOEHead(nn.Layer):\nreg_dist = self.proj_conv(F.softmax(reg_dist, axis=1)).squeeze(1)\n# cls and reg\ncls_score = F.sigmoid(cls_logit)\n- cls_score_list.append(cls_score.reshape([b, self.num_classes, l]))\n+ cls_score_list.append(cls_score.reshape([-1, self.num_classes, l]))\nreg_dist_list.append(reg_dist)\ncls_score_list = paddle.concat(cls_score_list, axis=-1)\n@@ -238,8 +238,8 @@ class PPYOLOEHead(nn.Layer):\nreturn loss\ndef _bbox_decode(self, anchor_points, pred_dist):\n- b, l, _ = get_static_shape(pred_dist)\n- pred_dist = F.softmax(pred_dist.reshape([b, l, 4, self.reg_max + 1]))\n+ _, l, _ = get_static_shape(pred_dist)\n+ pred_dist = F.softmax(pred_dist.reshape([-1, l, 4, self.reg_max + 1]))\npred_dist = self.proj_conv(pred_dist.transpose([0, 3, 1, 2])).squeeze(1)\nreturn batch_distance2bbox(anchor_points, pred_dist)\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
fix dynamic shape of reshape op when export model (#7230)
|
499,333 |
18.11.2022 11:12:58
| -28,800 |
8fb93d46ec37f7ed19599be99747d94cb0e5e156
|
fix read doc, test=document_fix
|
[
{
"change_type": "MODIFY",
"old_path": "README_en.md",
"new_path": "README_en.md",
"diff": "@@ -311,7 +311,7 @@ The comparison between COCO mAP and FPS on Qualcomm Snapdragon 865 processor of\n|:---------- |:------------------:|:-----------------------------:|:-------------------------------------------------------:|:----------------------------------------------------------------------------------------:|\n| PP-YOLOE+_s | 43.9 | 333.3 | [link](configs/ppyoloe/ppyoloe_plus_crn_s_80e_coco.yml) | [download](https://paddledet.bj.bcebos.com/models/ppyoloe_plus_crn_s_80e_coco.pdparams) |\n| PP-YOLOE+_m | 50.0 | 208.3 | [link](configs/ppyoloe/ppyoloe_plus_crn_m_80e_coco.yml) | [download](https://paddledet.bj.bcebos.com/models/ppyoloe_plus_crn_m_80e_coco.pdparams) |\n-| PP-YOLOE+_l | 53.3 | 149.2 | [link](configs/ppyoloe/ppyoloe_plus_crn_l_80e_coco.yml) | [download](https://paddledet.bj.bcebos.com/models/ppyoloe_plus_crn_m_80e_coco.pdparams) |\n+| PP-YOLOE+_l | 53.3 | 149.2 | [link](configs/ppyoloe/ppyoloe_plus_crn_l_80e_coco.yml) | [download](https://paddledet.bj.bcebos.com/models/ppyoloe_plus_crn_l_80e_coco.pdparams) |\n| PP-YOLOE+_x | 54.9 | 95.2 | [link](configs/ppyoloe/ppyoloe_plus_crn_x_80e_coco.yml) | [download](https://paddledet.bj.bcebos.com/models/ppyoloe_plus_crn_x_80e_coco.pdparams) |\n#### PP-PicoDet series Recommended scenarios: Mobile chips and x86 CPU devices, such as ARM CPU(RK3399, Raspberry Pi) and NPU(BITMAIN)\n@@ -470,20 +470,21 @@ Please refer to [docs](deploy/pipeline/README_en.md) for details.\n- **[Academic exchange] 2022.9.27 [YOLO Vision Event](https://www.youtube.com/playlist?list=PL1FZnkj4ad1NHVC7CMc3pjSQ-JRK-Ev6O):** As the first YOLO-themed event, PaddleDetection was invited to communicate with the experts in the field of Computer Vision around the world.\n### [Industrial tutorial examples](./industrial_tutorial/README.md)\n+\n+- [Rotated object detection based on PP-YOLOE-R](https://aistudio.baidu.com/aistudio/projectdetail/5058293)\n+\n+- [Aerial image detection based on PP-YOLOE-SOD](https://aistudio.baidu.com/aistudio/projectdetail/5036782)\n+\n- [Fall down recognition based on PP-Human v2](https://aistudio.baidu.com/aistudio/projectdetail/4606001)\n- [Intelligent fitness recognition based on PP-TinyPose Plus](https://aistudio.baidu.com/aistudio/projectdetail/4385813)\n- [Road litter detection based on PP-PicoDet Plus](https://aistudio.baidu.com/aistudio/projectdetail/3561097)\n-- [Communication tower detection based on PP-PicoDet and deployment on Android](https://aistudio.baidu.com/aistudio/projectdetail/3561097)\n-\n- [Visitor flow statistics based on FairMOT](https://aistudio.baidu.com/aistudio/projectdetail/2421822)\n- [Guest analysis based on PP-Human](https://aistudio.baidu.com/aistudio/projectdetail/4537344)\n-- [Fight recognition based on video classification](https://aistudio.baidu.com/aistudio/projectdetail/4512242)\n-\n- [More examples](./industrial_tutorial/README.md)\n## <img title=\"\" src=\"https://user-images.githubusercontent.com/48054808/157836473-1cf451fa-f01f-4148-ba68-b6d06d5da2f9.png\" alt=\"\" width=\"20\"> Applications\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
fix read doc, test=document_fix (#7362)
|
499,395 |
19.11.2022 16:34:13
| -28,800 |
02ee239956c7e64c0cb02b4ceada44cb3b68f458
|
[cherry-pick]add clip grad in ppyolo config
|
[
{
"change_type": "MODIFY",
"old_path": "configs/ppyolo/_base_/optimizer_1x.yml",
"new_path": "configs/ppyolo/_base_/optimizer_1x.yml",
"diff": "@@ -13,6 +13,7 @@ LearningRate:\nsteps: 4000\nOptimizerBuilder:\n+ clip_grad_by_norm: 35.\noptimizer:\nmomentum: 0.9\ntype: Momentum\n"
},
{
"change_type": "MODIFY",
"old_path": "configs/ppyolo/_base_/optimizer_2x.yml",
"new_path": "configs/ppyolo/_base_/optimizer_2x.yml",
"diff": "@@ -13,6 +13,7 @@ LearningRate:\nsteps: 4000\nOptimizerBuilder:\n+ clip_grad_by_norm: 35.\noptimizer:\nmomentum: 0.9\ntype: Momentum\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
[cherry-pick]add clip grad in ppyolo config (#7353)
|
499,339 |
05.12.2022 12:59:47
| -28,800 |
339eed8b64b22043230c96b051412f414042cc21
|
[docs] fix deadline in ppyoloe docs, test=document_fix
|
[
{
"change_type": "MODIFY",
"old_path": "configs/ppyoloe/README.md",
"new_path": "configs/ppyoloe/README.md",
"diff": "@@ -92,7 +92,7 @@ python -m paddle.distributed.launch --gpus 0,1,2,3,4,5,6,7 tools/train.py -c con\n**Notes:**\n- If you need to evaluate while training, please add `--eval`.\n- PP-YOLOE+ supports mixed precision training, please add `--amp`.\n-- PaddleDetection supports multi-machine distribued training, you can refer to [DistributedTraining tutorial](../../docs/DistributedTraining_en.md).\n+- PaddleDetection supports multi-machine distribued training, you can refer to [DistributedTraining tutorial](../../docs/tutorials/DistributedTraining_en.md).\n### Evaluation\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
[docs] fix deadline in ppyoloe docs, test=document_fix (#7456)
|
499,301 |
14.12.2022 16:00:43
| -28,800 |
c22803f209d20ab94bd8bd22b61a8f5faf1a4089
|
upgrade adamw for new paddle version
|
[
{
"change_type": "MODIFY",
"old_path": "ppdet/optimizer/adamw.py",
"new_path": "ppdet/optimizer/adamw.py",
"diff": "@@ -16,10 +16,15 @@ from __future__ import absolute_import\nfrom __future__ import division\nfrom __future__ import print_function\n+import paddle\nfrom paddle.optimizer import AdamW\nfrom functools import partial\nimport re\n+IS_PADDLE_LATER_2_4 = (\n+ int(paddle.version.major) >= 2 and\n+ int(paddle.version.minor) >= 4) or int(paddle.version.major) == 0\n+\ndef layerwise_lr_decay(decay_rate, name_dict, n_layers, param):\n\"\"\"\n@@ -48,6 +53,9 @@ def layerwise_lr_decay(decay_rate, name_dict, n_layers, param):\nelif 'cls_token' in static_name or 'patch_embed' in static_name:\nratio = decay_rate**(n_layers + 1)\n+ if IS_PADDLE_LATER_2_4:\n+ return ratio\n+ else:\nparam.optimize_attr['learning_rate'] *= ratio\n@@ -172,6 +180,22 @@ class AdamWDL(AdamW):\nself.set_param_lr_func = partial(\nset_param_lr_func, layerwise_decay, name_dict,\nn_layers) if set_param_lr_func is not None else set_param_lr_func\n+\n+ if IS_PADDLE_LATER_2_4:\n+ super(AdamWDL, self).__init__(\n+ learning_rate=learning_rate,\n+ parameters=parameters,\n+ beta1=beta1,\n+ beta2=beta2,\n+ epsilon=epsilon,\n+ grad_clip=grad_clip,\n+ name=name,\n+ apply_decay_param_fun=apply_decay_param_fun,\n+ weight_decay=weight_decay,\n+ lazy_mode=lazy_mode,\n+ multi_precision=multi_precision,\n+ lr_ratio=self.set_param_lr_func)\n+ else:\nsuper(AdamWDL, self).__init__(\nlearning_rate=learning_rate,\nparameters=parameters,\n@@ -185,10 +209,10 @@ class AdamWDL(AdamW):\nlazy_mode=lazy_mode,\nmulti_precision=multi_precision)\n+\ndef _append_optimize_op(self, block, param_and_grad):\nif self.set_param_lr_func is None:\n- return super(AdamWDL, self)._append_optimize_op(block,\n- param_and_grad)\n+ return super(AdamWDL, self)._append_optimize_op(block, param_and_grad)\nself._append_decoupled_weight_decay(block, param_and_grad)\nprev_lr = param_and_grad[0].optimize_attr[\"learning_rate\"]\n@@ -199,6 +223,10 @@ class AdamWDL(AdamW):\nreturn res\n+if not IS_PADDLE_LATER_2_4:\n+ AdamWDL._append_optimize_op = _append_optimize_op\n+\n+\ndef build_adamwdl(model,\nlr=1e-4,\nweight_decay=0.05,\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
upgrade adamw for new paddle version (#7507)
|
499,304 |
17.01.2023 17:13:59
| -28,800 |
f00395437d2eff5fd7fec8085bd1bbd80e8385ca
|
[cherry-pick] add YOLOv8 ACT demo
|
[
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/picodet_s_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/picodet_s_qat_dis.yaml",
"diff": "Global:\nreader_config: ./configs/picodet_reader.yml\n- input_list: ['image', 'scale_factor']\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./picodet_s_416_coco_npu/\nmodel_filename: model.pdmodel\n@@ -10,7 +10,7 @@ Distillation:\nalpha: 1.0\nloss: l2\n-Quantization:\n+QuantAware:\nuse_pact: true\nactivation_quantize_type: 'moving_average_abs_max'\nweight_bits: 8\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/ppyoloe_l_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/ppyoloe_l_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/ppyoloe_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./ppyoloe_crn_l_300e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nuse_pact: true\nactivation_quantize_type: 'moving_average_abs_max'\nquantize_op_types:\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/ppyoloe_plus_l_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/ppyoloe_plus_l_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/ppyoloe_plus_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./ppyoloe_plus_crn_l_80e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nuse_pact: true\nactivation_quantize_type: 'moving_average_abs_max'\nquantize_op_types:\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/ppyoloe_plus_m_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/ppyoloe_plus_m_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/ppyoloe_plus_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./ppyoloe_plus_crn_m_80e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nuse_pact: true\nonnx_format: True\nactivation_quantize_type: 'moving_average_abs_max'\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/ppyoloe_plus_s_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/ppyoloe_plus_s_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/ppyoloe_plus_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./ppyoloe_plus_crn_s_80e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nuse_pact: true\nactivation_quantize_type: 'moving_average_abs_max'\nquantize_op_types:\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/ppyoloe_plus_x_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/ppyoloe_plus_x_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/ppyoloe_plus_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./ppyoloe_plus_crn_x_80e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nuse_pact: true\nonnx_format: True\nactivation_quantize_type: 'moving_average_abs_max'\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/yolov5_s_qat_dis.yml",
"new_path": "deploy/auto_compression/configs/yolov5_s_qat_dis.yml",
"diff": "Global:\nreader_config: configs/yolov5_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./yolov5_s_300e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nuse_pact: true\nactivation_quantize_type: 'moving_average_abs_max'\nquantize_op_types:\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/yolov6mt_s_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/yolov6mt_s_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/yolov5_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./yolov6mt_s_400e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nactivation_quantize_type: 'moving_average_abs_max'\nquantize_op_types:\n- conv2d\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/configs/yolov7_l_qat_dis.yaml",
"new_path": "deploy/auto_compression/configs/yolov7_l_qat_dis.yaml",
"diff": "Global:\nreader_config: configs/yolov5_reader.yml\n- input_list: ['image', 'scale_factor']\n- arch: YOLO\n+ include_nms: True\nEvaluation: True\nmodel_dir: ./yolov7_l_300e_coco\nmodel_filename: model.pdmodel\n@@ -12,7 +11,7 @@ Distillation:\nalpha: 1.0\nloss: soft_label\n-Quantization:\n+QuantAware:\nactivation_quantize_type: 'moving_average_abs_max'\nquantize_op_types:\n- conv2d\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "deploy/auto_compression/configs/yolov8_reader.yml",
"diff": "+metric: COCO\n+num_classes: 80\n+\n+# Dataset configuration\n+TrainDataset:\n+ !COCODataSet\n+ image_dir: train2017\n+ anno_path: annotations/instances_train2017.json\n+ dataset_dir: dataset/coco/\n+\n+EvalDataset:\n+ !COCODataSet\n+ image_dir: val2017\n+ anno_path: annotations/instances_val2017.json\n+ dataset_dir: dataset/coco/\n+\n+worker_num: 0\n+\n+# preprocess reader in test\n+EvalReader:\n+ sample_transforms:\n+ - Decode: {}\n+ - Resize: {target_size: [640, 640], keep_ratio: True, interp: 1}\n+ - Pad: {size: [640, 640], fill_value: [114., 114., 114.]}\n+ - NormalizeImage: {mean: [0., 0., 0.], std: [1., 1., 1.], norm_type: none}\n+ - Permute: {}\n+ batch_size: 4\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "deploy/auto_compression/configs/yolov8_s_qat_dis.yaml",
"diff": "+\n+Global:\n+ reader_config: configs/yolov8_reader.yml\n+ include_nms: True\n+ Evaluation: True\n+ model_dir: ./yolov8_s_500e_coco_trt_nms/\n+ model_filename: model.pdmodel\n+ params_filename: model.pdiparams\n+\n+Distillation:\n+ alpha: 1.0\n+ loss: soft_label\n+\n+QuantAware:\n+ onnx_format: true\n+ activation_quantize_type: 'moving_average_abs_max'\n+ quantize_op_types:\n+ - conv2d\n+ - depthwise_conv2d\n+\n+TrainConfig:\n+ train_iter: 8000\n+ eval_iter: 1000\n+ learning_rate:\n+ type: CosineAnnealingDecay\n+ learning_rate: 0.00003\n+ T_max: 10000\n+ optimizer_builder:\n+ optimizer:\n+ type: SGD\n+ weight_decay: 4.0e-05\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "deploy/auto_compression/run.py",
"new_path": "deploy/auto_compression/run.py",
"diff": "@@ -23,6 +23,7 @@ from ppdet.metrics import COCOMetric, VOCMetric, KeyPointTopDownCOCOEval\nfrom paddleslim.auto_compression.config_helpers import load_config as load_slim_config\nfrom paddleslim.auto_compression import AutoCompression\nfrom post_process import PPYOLOEPostProcess\n+from paddleslim.common.dataloader import get_feed_vars\ndef argsparser():\n@@ -94,9 +95,12 @@ def eval_function(exe, compiled_test_program, test_feed_names, test_fetch_list):\nfetch_list=test_fetch_list,\nreturn_numpy=False)\nres = {}\n+ if 'include_nms' in global_config and not global_config['include_nms']:\nif 'arch' in global_config and global_config['arch'] == 'PPYOLOE':\npostprocess = PPYOLOEPostProcess(\nscore_threshold=0.01, nms_threshold=0.6)\n+ else:\n+ assert \"Not support arch={} now.\".format(global_config['arch'])\nres = postprocess(np.array(outs[0]), data_all['scale_factor'])\nelse:\nfor out in outs:\n@@ -128,6 +132,10 @@ def main():\ntrain_loader = create('EvalReader')(reader_cfg['TrainDataset'],\nreader_cfg['worker_num'],\nreturn_list=True)\n+ if global_config.get('input_list') is None:\n+ global_config['input_list'] = get_feed_vars(\n+ global_config['model_dir'], global_config['model_filename'],\n+ global_config['params_filename'])\ntrain_loader = reader_wrapper(train_loader, global_config['input_list'])\nif 'Evaluation' in global_config.keys() and global_config[\n"
},
{
"change_type": "MODIFY",
"old_path": "requirements.txt",
"new_path": "requirements.txt",
"diff": "tqdm\ntypeguard\nvisualdl>=2.2.0\n-opencv-python\n+opencv-python <= 4.6.0\nPyYAML\nshapely\nscipy\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
[cherry-pick] add YOLOv8 ACT demo (#7625)
|
499,301 |
03.02.2023 18:52:04
| -28,800 |
e23e51ff2b0d722b7463c08fca9a8f3d93e27469
|
fix drop_prob type
|
[
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/backbones/transformer_utils.py",
"new_path": "ppdet/modeling/backbones/transformer_utils.py",
"diff": "@@ -32,7 +32,7 @@ def drop_path(x, drop_prob=0., training=False):\n\"\"\"\nif drop_prob == 0. or not training:\nreturn x\n- keep_prob = paddle.to_tensor(1 - drop_prob)\n+ keep_prob = paddle.to_tensor(1 - drop_prob, dtype=x.dtype)\nshape = (paddle.shape(x)[0], ) + (1, ) * (x.ndim - 1)\nrandom_tensor = keep_prob + paddle.rand(shape, dtype=x.dtype)\nrandom_tensor = paddle.floor(random_tensor) # binarize\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
fix drop_prob type (#7682)
|
499,333 |
08.02.2023 20:56:15
| -28,800 |
e3f8dd16bffca04060ec1edc388c5a618e15bbf8
|
update rcnn fit for paddle 2.2
|
[
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/heads/roi_extractor.py",
"new_path": "ppdet/modeling/heads/roi_extractor.py",
"diff": "@@ -88,15 +88,11 @@ class RoIAlign(object):\nk_min = self.start_level + offset\nk_max = self.end_level + offset\nif hasattr(paddle.vision.ops, \"distribute_fpn_proposals\"):\n- rois_dist, restore_index, rois_num_dist = paddle.vision.ops.distribute_fpn_proposals(\n- roi,\n- k_min,\n- k_max,\n- self.canconical_level,\n- self.canonical_size,\n- rois_num=rois_num)\n+ distribute_fpn_proposals = getattr(paddle.vision.ops,\n+ \"distribute_fpn_proposals\")\nelse:\n- rois_dist, restore_index, rois_num_dist = ops.distribute_fpn_proposals(\n+ distribute_fpn_proposals = ops.distribute_fpn_proposals\n+ rois_dist, restore_index, rois_num_dist = distribute_fpn_proposals(\nroi,\nk_min,\nk_max,\n"
},
{
"change_type": "MODIFY",
"old_path": "ppdet/modeling/proposal_generator/proposal_generator.py",
"new_path": "ppdet/modeling/proposal_generator/proposal_generator.py",
"diff": "@@ -63,20 +63,11 @@ class ProposalGenerator(object):\ntop_n = self.pre_nms_top_n if self.topk_after_collect else self.post_nms_top_n\nvariances = paddle.ones_like(anchors)\nif hasattr(paddle.vision.ops, \"generate_proposals\"):\n- rpn_rois, rpn_rois_prob, rpn_rois_num = paddle.vision.ops.generate_proposals(\n- scores,\n- bbox_deltas,\n- im_shape,\n- anchors,\n- variances,\n- pre_nms_top_n=self.pre_nms_top_n,\n- post_nms_top_n=top_n,\n- nms_thresh=self.nms_thresh,\n- min_size=self.min_size,\n- eta=self.eta,\n- return_rois_num=True)\n+ generate_proposals = getattr(paddle.vision.ops,\n+ \"generate_proposals\")\nelse:\n- rpn_rois, rpn_rois_prob, rpn_rois_num = ops.generate_proposals(\n+ generate_proposals = ops.generate_proposals\n+ rpn_rois, rpn_rois_prob, rpn_rois_num = generate_proposals(\nscores,\nbbox_deltas,\nim_shape,\n"
}
] |
Python
|
Apache License 2.0
|
paddlepaddle/paddledetection
|
update rcnn fit for paddle 2.2 (#7707)
|
734,358 |
05.01.2017 11:31:28
| -3,600 |
d2a26115bdcce9550ba65527e060a42ecdb8c8bc
|
[resolves Camel CDI context creation tests case failures
|
[
{
"change_type": "MODIFY",
"old_path": "docs/guide/start/compatibility.adoc",
"new_path": "docs/guide/start/compatibility.adoc",
"diff": "@@ -5,7 +5,7 @@ The WildFly compatibility matrix\n[cols=\"2*\",width=\"60%\"]\n|===\n| **10.1.0.Final**\n-| 4.3\n+| 4.3, 4.4, 4.5\n| **10.0.0.Final**\n| 4.0, 4.1, 4.2\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "<module name=\"org.apache.camel.component.mqtt\">\n<include artifact=\"org.apache.camel:camel-mqtt\" />\n- <include artifact=\"org.fusesource.mqtt-client:mqtt-client\" />\n<apply-to-dependencies skip=\"true\">\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n<dependencies>\n<module name=\"javax.api\"/>\n<module name=\"org.fusesource.hawtbuf\" export=\"true\"/>\n+ <module name=\"org.fusesource.hawtdispatch\" />\n<module name=\"org.slf4j\"/>\n</dependencies>\n<exports>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/other-modules.xml",
"new_path": "feature/etc/smartics/other-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.fusesource.mqtt\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\"/>\n+ </properties>\n+ <include artifact=\"org.fusesource.mqtt-client:mqtt-client\" />\n+ <dependencies>\n+ <module name=\"javax.api\"/>\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.infinispan.query.dsl\" >\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/mqtt/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/mqtt/main/module.xml",
"diff": "<module xmlns=\"urn:jboss:module:1.1\" name=\"org.apache.camel.component.mqtt\">\n<resources>\n<artifact name=\"${org.apache.camel:camel-mqtt}\" />\n- <artifact name=\"${org.fusesource.mqtt-client:mqtt-client}\" />\n</resources>\n<dependencies>\n<module name=\"javax.api\" />\n<module name=\"org.fusesource.hawtbuf\" export=\"true\" />\n+ <module name=\"org.fusesource.hawtdispatch\" />\n<module name=\"org.slf4j\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"org.apache.camel.core\" />\n- <module name=\"org.fusesource.hawtdispatch\" />\n+ <module name=\"org.fusesource.mqtt\" />\n</dependencies>\n<exports>\n<exclude path=\"org/fusesource\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/fusesource/mqtt/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.fusesource.mqtt\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\" />\n+ </properties>\n+ <resources>\n+ <artifact name=\"${org.fusesource.mqtt-client:mqtt-client}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"org.fusesource.hawtbuf\" />\n+ <module name=\"org.fusesource.hawtdispatch\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/mqtt/MQTTIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/mqtt/MQTTIntegrationTest.java",
"diff": "@@ -23,9 +23,6 @@ package org.wildfly.camel.test.mqtt;\nimport java.io.BufferedReader;\nimport java.io.IOException;\nimport java.io.InputStreamReader;\n-import java.util.ArrayList;\n-import java.util.List;\n-import java.util.concurrent.CountDownLatch;\nimport java.util.concurrent.TimeUnit;\nimport org.apache.activemq.broker.BrokerService;\n@@ -44,6 +41,7 @@ import org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.as.arquillian.api.ServerSetup;\nimport org.jboss.as.arquillian.api.ServerSetupTask;\nimport org.jboss.as.arquillian.container.ManagementClient;\n+import org.jboss.gravia.resource.ManifestBuilder;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.asset.StringAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\n@@ -86,6 +84,11 @@ public class MQTTIntegrationTest {\npublic static JavaArchive deployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"mqtt-tests\");\narchive.addAsResource(new StringAsset(BrokerSetup.TCP_CONNECTION), \"tcp-connection\");\n+ archive.setManifest(() -> {\n+ ManifestBuilder builder = new ManifestBuilder();\n+ builder.addManifestHeader(\"Dependencies\", \"org.fusesource.mqtt\");\n+ return builder.openStream();\n+ });\nreturn archive;\n}\n@@ -113,7 +116,11 @@ public class MQTTIntegrationTest {\nTopic topic = new Topic(BrokerSetup.TEST_TOPIC, QoS.AT_MOST_ONCE);\nconnection.connect();\n+ try {\nconnection.publish(topic.name().toString(), \"Kermit\".getBytes(), QoS.AT_LEAST_ONCE, false);\n+ } finally {\n+ connection.disconnect();\n+ }\nString result = consumer.receive(3000).getIn().getBody(String.class);\nAssert.assertEquals(\"Hello Kermit\", result);\n@@ -136,38 +143,30 @@ public class MQTTIntegrationTest {\n});\ncamelctx.start();\n-\n+ try {\nMQTT mqtt = new MQTT();\nmqtt.setHost(getConnection());\n- final BlockingConnection connection = mqtt.blockingConnection();\n+ BlockingConnection connection = mqtt.blockingConnection();\n+\nconnection.connect();\n+ try {\nTopic topic = new Topic(BrokerSetup.TEST_TOPIC, QoS.AT_MOST_ONCE);\n- Topic[] topics = {topic};\n- connection.subscribe(topics);\n+ connection.subscribe(new Topic[] { topic });\n- final List<String> result = new ArrayList<>();\n- final CountDownLatch latch = new CountDownLatch(1);\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.asyncSendBody(\"direct:start\", \"Kermit\");\n- Thread thread = new Thread(new Runnable() {\n- public void run() {\n- try {\n- Message message = connection.receive();\n- result.add(new String (message.getPayload()));\n+ Message message = connection.receive(10, TimeUnit.SECONDS);\nmessage.ack();\n- latch.countDown();\n- } catch (Exception e) {\n- e.printStackTrace();\n+\n+ String result = new String(message.getPayload());\n+ Assert.assertEquals(\"Hello Kermit\", result);\n+ } finally {\n+ connection.disconnect();\n}\n+ } finally {\n+ camelctx.stop();\n}\n- });\n- thread.start();\n-\n- ProducerTemplate producer = camelctx.createProducerTemplate();\n- producer.asyncSendBody(\"direct:start\", \"Kermit\");\n-\n- Assert.assertTrue(latch.await(10, TimeUnit.SECONDS));\n- Assert.assertEquals(\"One message\", 1, result.size());\n- Assert.assertEquals(\"Hello Kermit\", result.get(0));\n}\nprivate String getConnection() throws IOException {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/paho/PahoIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/paho/PahoIntegrationTest.java",
"diff": "@@ -103,11 +103,10 @@ public class PahoIntegrationTest {\n});\ncamelctx.start();\n-\n+ try {\nPollingConsumer consumer = camelctx.getEndpoint(\"seda:end\").createPollingConsumer();\nconsumer.start();\n- try {\nMqttClient client = null;\ntry {\nclient = new MqttClient(getConnection(), \"MqttClient\", new MemoryPersistence());\n@@ -141,7 +140,7 @@ public class PahoIntegrationTest {\n});\ncamelctx.start();\n-\n+ try {\nMqttClient client = new MqttClient(getConnection(), \"MqttClient\", new MemoryPersistence());\nMqttConnectOptions opts = new MqttConnectOptions();\nopts.setCleanSession(true);\n@@ -173,6 +172,9 @@ public class PahoIntegrationTest {\nAssert.assertTrue(latch.await(10, TimeUnit.SECONDS));\nAssert.assertEquals(\"One message\", 1, result.size());\nAssert.assertEquals(\"Hello Kermit\", result.get(0));\n+ } finally {\n+ camelctx.stop();\n+ }\n}\nprivate String getConnection() throws IOException {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"diff": "^org/eclipse/paho(.*)\n^org/elasticsearch(.*)\n^org/fusesource/hawtbuf(.*)\n- ^org/fusesource/mqtt(.*)\n^org/quartz(.*)\n^org/infinispan(.*)\n^org/springframework(.*)\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"diff": "@@ -1471,10 +1471,6 @@ org/elasticsearch/tribe\norg/elasticsearch/watcher\norg/fusesource/hawtbuf\norg/fusesource/hawtbuf/codec\n-org/fusesource/mqtt\n-org/fusesource/mqtt/cli\n-org/fusesource/mqtt/client\n-org/fusesource/mqtt/codec\norg/infinispan\norg/infinispan/affinity\norg/infinispan/affinity/impl\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1562] Camel CDI context creation tests case failures
|
734,358 |
05.01.2017 14:38:09
| -3,600 |
42fc7d48ccd37d0d44244adfbb91ede08dd8cfb4
|
[Ignore SSH producer test frequently swallows the output
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"diff": "@@ -16,6 +16,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.After;\nimport org.junit.Assert;\nimport org.junit.Before;\n+import org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.ssh.EmbeddedSSHServer;\n@@ -77,6 +78,7 @@ public class SSHIntegrationTest {\n}\n@Test\n+ @Ignore(\"[#1564] SSH producer test frequently swallows the output\")\npublic void testSSHProducer() throws Exception {\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[Ignore #1564] SSH producer test frequently swallows the output
|
734,358 |
05.01.2017 14:53:30
| -3,600 |
1d2edc5556b99013f22358559f3ad639cb01b1d8
|
[resolves Consolidate available port util
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/kafka/EmbeddedKafkaCluster.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/kafka/EmbeddedKafkaCluster.java",
"diff": "@@ -28,6 +28,7 @@ import kafka.server.KafkaConfig;\nimport kafka.server.KafkaServer;\nimport kafka.utils.ZkUtils;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.utils.TestUtils;\nimport scala.Option;\n@@ -83,7 +84,7 @@ public class EmbeddedKafkaCluster {\nprivate int resolvePort(int port) {\nif (port == -1) {\n- return TestUtils.getAvailablePort();\n+ return AvailablePortFinder.getNextAvailable();\n}\nreturn port;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/ssh/EmbeddedSSHServer.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/ssh/EmbeddedSSHServer.java",
"diff": "@@ -29,8 +29,8 @@ import org.apache.sshd.server.command.ScpCommandFactory;\nimport org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider;\nimport org.apache.sshd.server.sftp.SftpSubsystem;\nimport org.apache.sshd.server.shell.ProcessShellFactory;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.utils.EnvironmentUtils;\n-import org.wildfly.camel.test.common.utils.TestUtils;\nimport com.jcraft.jsch.JSch;\nimport com.jcraft.jsch.Session;\n@@ -40,12 +40,14 @@ public class EmbeddedSSHServer {\nprivate SshServer sshServer;\nprivate Path homeDir;\n- private int port;\npublic EmbeddedSSHServer(Path homeDir) {\n+ this(homeDir, AvailablePortFinder.getNextAvailable());\n+ }\n+\n+ public EmbeddedSSHServer(Path homeDir, int port) {\nthis.sshServer = SshServer.setUpDefaultServer();\n- this.port = TestUtils.getAvailablePort();\n- this.sshServer.setPort(this.port);\n+ this.sshServer.setPort(port);\nthis.sshServer.setCommandFactory(new ScpCommandFactory(command -> new ProcessShellFactory(command.split(\" \")).create()));\nthis.sshServer.setSubsystemFactories(Arrays.asList(new SftpSubsystem.Factory()));\nthis.sshServer.setKeyPairProvider(new SimpleGeneratorHostKeyProvider());\n@@ -53,32 +55,27 @@ public class EmbeddedSSHServer {\nthis.sshServer.setPublickeyAuthenticator((s, publicKey, serverSession) -> true);\nthis.homeDir = homeDir;\n-\nif (EnvironmentUtils.isWindows()) {\n- this.sshServer.setShellFactory(new ProcessShellFactory(new String[] { \"cmd.exe \" }, EnumSet.of(\n+ sshServer.setShellFactory(new ProcessShellFactory(new String[] { \"cmd.exe \" }, EnumSet.of(\nProcessShellFactory.TtyOptions.Echo, ProcessShellFactory.TtyOptions.ICrNl,\nProcessShellFactory.TtyOptions.ONlCr)));\n} else {\n- this.sshServer.setShellFactory(new ProcessShellFactory(new String[] { \"/bin/sh\", \"-i\", \"-s\" }, EnumSet\n+ sshServer.setShellFactory(new ProcessShellFactory(new String[] { \"/bin/sh\", \"-i\", \"-s\" }, EnumSet\n.of(ProcessShellFactory.TtyOptions.ONlCr)));\n}\n}\npublic void start() throws Exception {\n- if (this.sshServer != null) {\n- this.sshServer.start();\n+ sshServer.start();\nsetupKnownHosts();\n}\n- }\npublic void stop() throws Exception {\n- if (this.sshServer != null) {\n- this.sshServer.stop();\n- }\n+ sshServer.stop();\n}\npublic String getConnection() {\n- return String.format(\"localhost:%d\", this.port);\n+ return String.format(\"localhost:%d\", sshServer.getPort());\n}\nprivate void setupKnownHosts() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/TestUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/TestUtils.java",
"diff": "@@ -18,8 +18,6 @@ package org.wildfly.camel.test.common.utils;\nimport java.io.File;\nimport java.io.FileNotFoundException;\n-import java.io.IOException;\n-import java.net.ServerSocket;\nimport java.util.Random;\npublic final class TestUtils {\n@@ -37,19 +35,6 @@ public final class TestUtils {\nreturn file;\n}\n- public static int getAvailablePort() {\n- try {\n- ServerSocket socket = new ServerSocket(0);\n- try {\n- return socket.getLocalPort();\n- } finally {\n- socket.close();\n- }\n- } catch (IOException e) {\n- throw new IllegalStateException(\"Cannot find available port: \" + e.getMessage(), e);\n- }\n- }\n-\npublic static boolean deleteFile(File path) throws FileNotFoundException {\nif (!path.exists()) {\nthrow new FileNotFoundException(path.getAbsolutePath());\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/zookeeper/EmbeddedZookeeper.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/zookeeper/EmbeddedZookeeper.java",
"diff": "@@ -37,7 +37,7 @@ import org.apache.zookeeper.server.ZooKeeperServer;\nimport org.apache.zookeeper.server.persistence.FileTxnSnapLog;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n-import org.wildfly.camel.test.common.utils.TestUtils;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\npublic class EmbeddedZookeeper {\n@@ -49,7 +49,7 @@ public class EmbeddedZookeeper {\nprivate final int port;\npublic EmbeddedZookeeper() throws Exception {\n- this(TestUtils.getAvailablePort(), Files.createTempDirectory(Paths.get(\"target\").toAbsolutePath(), \"zktemp\"));\n+ this(AvailablePortFinder.getNextAvailable(), Files.createTempDirectory(Paths.get(\"target\").toAbsolutePath(), \"zktemp\"));\n}\npublic EmbeddedZookeeper(int port, Path baseDir) throws Exception {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/FtpIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/FtpIntegrationTest.java",
"diff": "@@ -55,7 +55,7 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n-import org.wildfly.camel.test.common.utils.TestUtils;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -65,7 +65,7 @@ public class FtpIntegrationTest {\nprivate static final String FILE_BASEDIR = \"basedir.txt\";\nprivate static final Path FTP_ROOT_DIR = Paths.get(System.getProperty(\"jboss.server.data.dir\") + \"/ftp\");\nprivate static final Path USERS_FILE = Paths.get(System.getProperty(\"jboss.server.config.dir\") + \"/users.properties\");\n- private static final int PORT = TestUtils.getAvailablePort();\n+ private static final int PORT = AvailablePortFinder.getNextAvailable();\nprivate FtpServer ftpServer;\n@@ -78,7 +78,7 @@ public class FtpIntegrationTest {\nfinal WebArchive archive = ShrinkWrap.create(WebArchive.class, \"camel-ftp-tests.war\");\narchive.addAsResource(new StringAsset(System.getProperty(\"basedir\")), FILE_BASEDIR);\n- archive.addClasses(TestUtils.class);\n+ archive.addClasses(AvailablePortFinder.class);\narchive.addAsLibraries(libraryDependencies);\nreturn archive;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/SftpIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/SftpIntegrationTest.java",
"diff": "@@ -42,8 +42,8 @@ import org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.ssh.EmbeddedSSHServer;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.utils.EnvironmentUtils;\n-import org.wildfly.camel.test.common.utils.TestUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -57,7 +57,7 @@ public class SftpIntegrationTest {\n@Deployment\npublic static WebArchive createDeployment() throws IOException {\nfinal WebArchive archive = ShrinkWrap.create(WebArchive.class, \"camel-ftp-tests.war\");\n- archive.addClasses(EmbeddedSSHServer.class, TestUtils.class, EnvironmentUtils.class);\n+ archive.addClasses(EmbeddedSSHServer.class, AvailablePortFinder.class, EnvironmentUtils.class);\narchive.addAsResource(new StringAsset(System.getProperty(\"basedir\")), FILE_BASEDIR);\narchive.setManifest(() -> {\nManifestBuilder builder = new ManifestBuilder();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/jsch/JschIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/jsch/JschIntegrationTest.java",
"diff": "@@ -42,8 +42,8 @@ import org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.ssh.EmbeddedSSHServer;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.utils.EnvironmentUtils;\n-import org.wildfly.camel.test.common.utils.TestUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -57,7 +57,7 @@ public class JschIntegrationTest {\n@Deployment\npublic static WebArchive createDeployment() {\nfinal WebArchive archive = ShrinkWrap.create(WebArchive .class, \"camel-jsch-tests.war\");\n- archive.addClasses(EmbeddedSSHServer.class, TestUtils.class, EnvironmentUtils.class);\n+ archive.addClasses(EmbeddedSSHServer.class, AvailablePortFinder.class, EnvironmentUtils.class);\narchive.addAsResource(new StringAsset(System.getProperty(\"basedir\")), FILE_BASEDIR);\narchive.setManifest(() -> {\nManifestBuilder builder = new ManifestBuilder();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"diff": "@@ -20,8 +20,8 @@ import org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.ssh.EmbeddedSSHServer;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.utils.EnvironmentUtils;\n-import org.wildfly.camel.test.common.utils.TestUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -34,7 +34,7 @@ public class SSHIntegrationTest {\n@Deployment\npublic static JavaArchive createDeployment() {\nreturn ShrinkWrap.create(JavaArchive.class, \"sshd-tests.jar\")\n- .addClasses(EmbeddedSSHServer.class, TestUtils.class, EnvironmentUtils.class)\n+ .addClasses(EmbeddedSSHServer.class, AvailablePortFinder.class, EnvironmentUtils.class)\n.setManifest(() -> {\nManifestBuilder builder = new ManifestBuilder();\nbuilder.addManifestHeader(\"Dependencies\", \"com.jcraft.jsch,org.apache.sshd\");\n@@ -44,7 +44,7 @@ public class SSHIntegrationTest {\n@Before\npublic void setUp() throws Exception {\n- sshServer = new EmbeddedSSHServer(SSHD_ROOT_DIR);\n+ sshServer = new EmbeddedSSHServer(SSHD_ROOT_DIR, AvailablePortFinder.getNextAvailable());\nsshServer.start();\n}\n@@ -70,8 +70,8 @@ public class SSHIntegrationTest {\ntry {\nMockEndpoint mockEndpoint = camelctx.getEndpoint(\"mock:end\", MockEndpoint.class);\nmockEndpoint.expectedMessageCount(1);\n+ mockEndpoint.setAssertPeriod(100);\nmockEndpoint.expectedBodiesReceived(\"Hello Kermit\" + System.lineSeparator());\n- mockEndpoint.assertIsSatisfied(5000);\n} finally {\ncamelctx.stop();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/syslog/SyslogDataFormatTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/syslog/SyslogDataFormatTest.java",
"diff": "@@ -37,7 +37,7 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n-import org.wildfly.camel.test.common.utils.TestUtils;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -50,7 +50,7 @@ public class SyslogDataFormatTest {\n@Deployment\npublic static JavaArchive createDeployment() {\nreturn ShrinkWrap.create(JavaArchive.class, \"camel-syslog-tests.jar\")\n- .addClass(TestUtils.class);\n+ .addClass(AvailablePortFinder.class);\n}\n@Test\n@@ -86,7 +86,7 @@ public class SyslogDataFormatTest {\n@Test\npublic void testSyslogUnmarshal() throws Exception {\n- int port = TestUtils.getAvailablePort();\n+ int port = AvailablePortFinder.getNextAvailable();\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/zookeeper/ZookeeperConsumerIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/zookeeper/ZookeeperConsumerIntegrationTest.java",
"diff": "@@ -38,7 +38,7 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n-import org.wildfly.camel.test.common.utils.TestUtils;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.zookeeper.EmbeddedZookeeper;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -51,7 +51,7 @@ public class ZookeeperConsumerIntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\nfinal JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"zookeeper-integration-tests\");\n- archive.addClasses(EmbeddedZookeeper.class, TestUtils.class);\n+ archive.addClasses(EmbeddedZookeeper.class, AvailablePortFinder.class);\nreturn archive;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/zookeeper/ZookeeperProducerIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/zookeeper/ZookeeperProducerIntegrationTest.java",
"diff": "@@ -35,7 +35,7 @@ import org.junit.Assert;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n-import org.wildfly.camel.test.common.utils.TestUtils;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\nimport org.wildfly.camel.test.common.zookeeper.EmbeddedZookeeper;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -48,7 +48,7 @@ public class ZookeeperProducerIntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\nfinal JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"zookeeper-integration-tests\");\n- archive.addClasses(EmbeddedZookeeper.class, TestUtils.class);\n+ archive.addClasses(EmbeddedZookeeper.class, AvailablePortFinder.class);\nreturn archive;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/apache/camel/component/mongodb/main/camel-mongodb-2.18.1.jar\n/org/apache/camel/component/mongodb/main/mongo-java-driver-3.3.0.jar\n/org/apache/camel/component/mqtt/main/camel-mqtt-2.18.1.jar\n-/org/apache/camel/component/mqtt/main/mqtt-client-1.14.jar\n/org/apache/camel/component/mvel/main/camel-mvel-2.18.1.jar\n/org/apache/camel/component/nats/main/camel-nats-2.18.1.jar\n/org/apache/camel/component/nats/main/jnats-0.5.3.jar\n/org/fusesource/hawtbuf/main/hawtbuf-1.11.jar\n/org/fusesource/hawtdispatch/main/hawtdispatch-1.22.jar\n/org/fusesource/hawtdispatch/main/hawtdispatch-transport-1.22.jar\n+/org/fusesource/mqtt/main/mqtt-client-1.14.jar\n/org/infinispan/query/dsl/main/infinispan-query-dsl-8.2.4.Final.jar\n/org/jboss/gravia/main/gravia-resource-1.3.1.jar\n/org/jboss/gravia/main/gravia-runtime-api-1.3.1.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1566] Consolidate available port util
|
734,358 |
12.12.2016 10:05:40
| -3,600 |
b93d711b74be7f23266361b1b0db636ca319c15f
|
[resolves yaml dataformat cannot find constructor any more
|
[
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "<apply-to-dependencies skip=\"true\">\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n+ <include module=\"org.yaml.snakeyaml\" />\n</apply-to-dependencies>\n<dependencies>\n<module name=\"org.slf4j\"/>\n+ <module name=\"org.yaml.snakeyaml\" export=\"true\"/>\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/snakeyaml/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/snakeyaml/main/module.xml",
"diff": "</resources>\n<dependencies>\n<module name=\"org.slf4j\" />\n+ <module name=\"org.yaml.snakeyaml\" export=\"true\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"org.apache.camel.core\" />\n- <module name=\"org.yaml.snakeyaml\" />\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/pom.xml",
"new_path": "itests/standalone/basic/pom.xml",
"diff": "<groupId>org.apache.camel</groupId>\n<artifactId>camel-mybatis</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-snakeyaml</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.apache.ftpserver</groupId>\n<artifactId>ftpserver-core</artifactId>\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/yaml/YamlDataFormatIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/yaml/YamlDataFormatIntegrationTest.java",
"diff": "@@ -22,6 +22,8 @@ package org.wildfly.camel.test.yaml;\nimport org.apache.camel.CamelContext;\nimport org.apache.camel.ProducerTemplate;\nimport org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.snakeyaml.SnakeYAMLDataFormat;\n+import org.apache.camel.component.snakeyaml.TypeFilters;\nimport org.apache.camel.impl.DefaultCamelContext;\nimport org.apache.camel.model.dataformat.YAMLLibrary;\nimport org.jboss.arquillian.container.test.api.Deployment;\n@@ -69,12 +71,16 @@ public class YamlDataFormatIntegrationTest {\n@Test\npublic void testUnmarshalYaml() throws Exception {\n+\n+ SnakeYAMLDataFormat yaml = new SnakeYAMLDataFormat();\n+ yaml.addTypeFilters(TypeFilters.types(Customer.class));\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\nfrom(\"direct:start\")\n- .unmarshal().yaml(YAMLLibrary.SnakeYAML);\n+ .unmarshal(yaml);\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"diff": "^org/springframework(.*)\n^org/xbill(.*)\n^org/xmlsoap(.*)\n+ ^org/yaml(.*)\n^schema/(.*)\n^schemas/(.*)\n^twitter4j/(.*)\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"diff": "@@ -1863,6 +1863,34 @@ org/xmlsoap\norg/xmlsoap/schemas\norg/xmlsoap/schemas/soap\norg/xmlsoap/schemas/soap/envelope\n+org/yaml\n+org/yaml/snakeyaml\n+org/yaml/snakeyaml/composer\n+org/yaml/snakeyaml/constructor\n+org/yaml/snakeyaml/emitter\n+org/yaml/snakeyaml/error\n+org/yaml/snakeyaml/events\n+org/yaml/snakeyaml/extensions\n+org/yaml/snakeyaml/extensions/compactnotation\n+org/yaml/snakeyaml/external\n+org/yaml/snakeyaml/external/biz\n+org/yaml/snakeyaml/external/biz/base64Coder\n+org/yaml/snakeyaml/external/com\n+org/yaml/snakeyaml/external/com/google\n+org/yaml/snakeyaml/external/com/google/gdata\n+org/yaml/snakeyaml/external/com/google/gdata/util\n+org/yaml/snakeyaml/external/com/google/gdata/util/common\n+org/yaml/snakeyaml/external/com/google/gdata/util/common/base\n+org/yaml/snakeyaml/introspector\n+org/yaml/snakeyaml/nodes\n+org/yaml/snakeyaml/parser\n+org/yaml/snakeyaml/reader\n+org/yaml/snakeyaml/representer\n+org/yaml/snakeyaml/resolver\n+org/yaml/snakeyaml/scanner\n+org/yaml/snakeyaml/serializer\n+org/yaml/snakeyaml/tokens\n+org/yaml/snakeyaml/util\nschema/configuration\nschemas/bindings\nschemas/bindings/blueprint\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1530] yaml dataformat cannot find constructor any more
|
734,358 |
05.01.2017 11:00:54
| -3,600 |
fd4420693777a9abdf8a078b9b66c8d7e88c9fb8
|
[resolves Remove explicit version for ActiveMQ
|
[
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<!-- Camel versions -->\n<version.apache.camel>2.18.2</version.apache.camel>\n- <version.apache.activemq>5.14.3</version.apache.activemq>\n<!-- WildFly versions -->\n<version.wildfly>10.1.0.Final</version.wildfly>\n<dependencyManagement>\n<dependencies>\n- <!-- ActiveMQ -->\n- <dependency>\n- <groupId>org.apache.activemq</groupId>\n- <artifactId>activemq-mqtt</artifactId>\n- <version>${version.apache.activemq}</version>\n- </dependency>\n-\n<!-- Aether -->\n<dependency>\n<groupId>org.apache.maven</groupId>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1558] Remove explicit version for ActiveMQ
|
734,358 |
31.01.2017 16:10:06
| -3,600 |
1aaa8e9549b6be001c5457a41822e28de3ea85b0
|
[resolves MllpTcpServerConsumerTest: Address already in use
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/AvailablePortFinder.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/AvailablePortFinder.java",
"diff": "package org.wildfly.camel.test.common.utils;\nimport java.io.IOException;\n-import java.net.DatagramSocket;\n+import java.net.InetAddress;\n+import java.net.InetSocketAddress;\nimport java.net.ServerSocket;\n+import java.net.UnknownHostException;\n+import java.util.HashSet;\nimport java.util.NoSuchElementException;\n+import java.util.Set;\n/**\n* Finds currently available server ports.\n@@ -37,11 +41,22 @@ public final class AvailablePortFinder {\n*/\npublic static final int MAX_PORT_NUMBER = 65535;\n+ // Note, this is scoped on the ClassLoader\n+ private static Set<Integer> alreadyUsed = new HashSet<>();\n+\n/**\n- * Creates a new instance.\n+ * Gets the next available port on localhost starting at the lowest port number.\n+ *\n+ * @throws NoSuchElementException if there are no ports available\n*/\n- private AvailablePortFinder() {\n- // Do nothing\n+ public static int getNextAvailable() {\n+ InetAddress addr;\n+ try {\n+ addr = InetAddress.getLocalHost();\n+ } catch (UnknownHostException ex) {\n+ throw new IllegalStateException(ex);\n+ }\n+ return getNextAvailable(addr, MIN_PORT_NUMBER);\n}\n/**\n@@ -49,8 +64,8 @@ public final class AvailablePortFinder {\n*\n* @throws NoSuchElementException if there are no ports available\n*/\n- public static int getNextAvailable() {\n- return getNextAvailable(MIN_PORT_NUMBER);\n+ public static int getNextAvailable(InetAddress addr) {\n+ return getNextAvailable(addr, MIN_PORT_NUMBER);\n}\n/**\n@@ -59,13 +74,12 @@ public final class AvailablePortFinder {\n* @param fromPort the port to scan for availability\n* @throws NoSuchElementException if there are no ports available\n*/\n- public static int getNextAvailable(int fromPort) {\n- if (fromPort < MIN_PORT_NUMBER || fromPort > MAX_PORT_NUMBER) {\n+ public static int getNextAvailable(InetAddress addr, int fromPort) {\n+ if (fromPort < MIN_PORT_NUMBER || fromPort > MAX_PORT_NUMBER)\nthrow new IllegalArgumentException(\"Invalid start port: \" + fromPort);\n- }\nfor (int i = fromPort; i <= MAX_PORT_NUMBER; i++) {\n- if (available(i)) {\n+ if (available(addr, i)) {\nreturn i;\n}\n}\n@@ -78,35 +92,15 @@ public final class AvailablePortFinder {\n*\n* @param port the port to check for availability\n*/\n- public static boolean available(int port) {\n- if (port < MIN_PORT_NUMBER || port > MAX_PORT_NUMBER) {\n- throw new IllegalArgumentException(\"Invalid start port: \" + port);\n- }\n+ public synchronized static boolean available(InetAddress addr, int port) {\n- ServerSocket ss = null;\n- DatagramSocket ds = null;\n- try {\n- ss = new ServerSocket(port);\n- ss.setReuseAddress(true);\n- ds = new DatagramSocket(port);\n- ds.setReuseAddress(true);\n- return true;\n- } catch (IOException e) {\n- // Do nothing\n- } finally {\n- if (ds != null) {\n- ds.close();\n- }\n-\n- if (ss != null) {\n- try {\n- ss.close();\n+ try (ServerSocket ss = new ServerSocket()) {\n+ ss.setReuseAddress(false);\n+ ss.bind(new InetSocketAddress(addr, port));\n} catch (IOException e) {\n- /* should not be thrown */\n- }\n- }\n+ return false;\n}\n- return false;\n+ return alreadyUsed.add(port);\n}\n}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/test/java/org/wildfly/camel/test/common/AvailablePortFinderTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.common;\n+\n+import java.net.InetAddress;\n+import java.net.ServerSocket;\n+\n+import org.junit.Assert;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.utils.AvailablePortFinder;\n+\n+public final class AvailablePortFinderTest {\n+\n+ @Test\n+ public void testSimple() throws Exception {\n+ int portA = AvailablePortFinder.getNextAvailable();\n+ Assert.assertTrue(portA >= AvailablePortFinder.MIN_PORT_NUMBER);\n+ }\n+\n+ @Test\n+ public void testBoundPort() throws Exception {\n+ InetAddress addr = InetAddress.getLocalHost();\n+ int portA = AvailablePortFinder.getNextAvailable(addr);\n+ try (ServerSocket socketA = new ServerSocket(portA, 0, addr)) {\n+ Assert.assertTrue(socketA.isBound());\n+ int portB = AvailablePortFinder.getNextAvailable(addr);\n+ Assert.assertTrue(portA != portB);\n+ }\n+ }\n+\n+ @Test\n+ public void testUnboundPort() throws Exception {\n+ InetAddress addr = InetAddress.getLocalHost();\n+ int portA = AvailablePortFinder.getNextAvailable(addr);\n+ int portB = AvailablePortFinder.getNextAvailable(addr);\n+ Assert.assertTrue(portA != portB);\n+ }\n+\n+ @Test\n+ public void testUnboundPortAnyAddr() throws Exception {\n+ int portA = AvailablePortFinder.getNextAvailable();\n+ int portB = AvailablePortFinder.getNextAvailable();\n+ Assert.assertTrue(portA != portB);\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1599] MllpTcpServerConsumerTest: Address already in use
|
734,358 |
14.02.2017 09:21:56
| -3,600 |
d2d84dd3ab43497167ae0b2d23ae824b48facef5
|
[resolves Catalog reports unsupported items
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/pom.xml",
"new_path": "catalog/pom.xml",
"diff": "</goals>\n<phase>process-classes</phase>\n<configuration>\n- <mainClass>org.apache.camel.catalog.wildfly.WildFlyCatalogCreator</mainClass>\n+ <mainClass>org.wildfly.camel.catalog.WildFlyCatalogCreator</mainClass>\n<systemProperties>\n<property>\n<key>basedir</key>\n"
},
{
"change_type": "RENAME",
"old_path": "catalog/src/main/java/org/apache/camel/catalog/wildfly/WildFlyCatalogCreator.java",
"new_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyCatalogCreator.java",
"diff": "* #L%\n*/\n-package org.apache.camel.catalog.wildfly;\n+package org.wildfly.camel.catalog;\nimport java.io.BufferedReader;\nimport java.io.File;\n@@ -180,7 +180,8 @@ public final class WildFlyCatalogCreator {\nfor (Item item : roadmap.items.values()) {\nPath javaType = Paths.get(item.javaType.replace('.', '/') + \".class\");\nif (rootPath.resolve(javaType).toFile().isFile()) {\n- Path target = outdir.resolve(item.path);\n+ String targetPath = item.path.toString().replace(\"org/apache\", \"org/wildfly\");\n+ Path target = outdir.resolve(Paths.get(targetPath));\nPath source = srcdir.resolve(item.path);\ntarget.getParent().toFile().mkdirs();\nFiles.copy(source, target, StandardCopyOption.REPLACE_EXISTING);\n@@ -192,7 +193,7 @@ public final class WildFlyCatalogCreator {\nprivate void generateProperties() throws IOException {\nfor (RoadMap roadmap : roadmaps.values()) {\n- File outfile = outdir.resolve(\"org/apache/camel/catalog/\" + roadmap.kind + \"s.properties\").toFile();\n+ File outfile = outdir.resolve(\"org/wildfly/camel/catalog/\" + roadmap.kind + \"s.properties\").toFile();\ntry (PrintWriter pw = new PrintWriter(outfile)) {\nfor (String name : roadmap.sortedNames(State.supported)) {\npw.println(name);\n"
},
{
"change_type": "RENAME",
"old_path": "catalog/src/main/java/org/apache/camel/catalog/wildfly/WildFlyRuntimeProvider.java",
"new_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyRuntimeProvider.java",
"diff": "* See the License for the specific language governing permissions and\n* limitations under the License.\n*/\n-package org.apache.camel.catalog.wildfly;\n+package org.wildfly.camel.catalog;\nimport java.io.IOException;\nimport java.io.InputStream;\nimport java.util.ArrayList;\nimport java.util.List;\n-import org.apache.camel.catalog.CamelCatalog;\nimport org.apache.camel.catalog.CatalogHelper;\n+import org.apache.camel.catalog.DefaultRuntimeProvider;\nimport org.apache.camel.catalog.RuntimeProvider;\n/**\n* A WildFly based {@link RuntimeProvider} which only includes the supported Camel components, data formats, and languages\n* for WildFly.\n*/\n-public class WildFlyRuntimeProvider implements RuntimeProvider {\n+public class WildFlyRuntimeProvider extends DefaultRuntimeProvider {\n- private static final String COMPONENT_DIR = \"org/apache/camel/catalog/components\";\n- private static final String DATAFORMAT_DIR = \"org/apache/camel/catalog/dataformats\";\n- private static final String LANGUAGE_DIR = \"org/apache/camel/catalog/languages\";\n- private static final String COMPONENTS_CATALOG = \"org/apache/camel/catalog/components.properties\";\n- private static final String DATA_FORMATS_CATALOG = \"org/apache/camel/catalog/dataformats.properties\";\n- private static final String LANGUAGE_CATALOG = \"org/apache/camel/catalog/languages.properties\";\n-\n- private CamelCatalog camelCatalog;\n-\n- @Override\n- public CamelCatalog getCamelCatalog() {\n- return camelCatalog;\n- }\n-\n- @Override\n- public void setCamelCatalog(CamelCatalog camelCatalog) {\n- this.camelCatalog = camelCatalog;\n- }\n+ private static final String COMPONENT_DIR = \"org/wildfly/camel/catalog/components\";\n+ private static final String DATAFORMAT_DIR = \"org/wildfly/camel/catalog/dataformats\";\n+ private static final String LANGUAGE_DIR = \"org/wildfly/camel/catalog/languages\";\n+ private static final String COMPONENTS_CATALOG = \"org/wildfly/camel/catalog/components.properties\";\n+ private static final String DATA_FORMATS_CATALOG = \"org/wildfly/camel/catalog/dataformats.properties\";\n+ private static final String LANGUAGE_CATALOG = \"org/wildfly/camel/catalog/languages.properties\";\n@Override\npublic String getProviderName() {\n@@ -73,7 +61,7 @@ public class WildFlyRuntimeProvider implements RuntimeProvider {\n@Override\npublic List<String> findComponentNames() {\nList<String> names = new ArrayList<String>();\n- InputStream is = camelCatalog.getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);\n+ InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(COMPONENTS_CATALOG);\nif (is != null) {\ntry {\nCatalogHelper.loadLines(is, names);\n@@ -87,7 +75,7 @@ public class WildFlyRuntimeProvider implements RuntimeProvider {\n@Override\npublic List<String> findDataFormatNames() {\nList<String> names = new ArrayList<String>();\n- InputStream is = camelCatalog.getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);\n+ InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(DATA_FORMATS_CATALOG);\nif (is != null) {\ntry {\nCatalogHelper.loadLines(is, names);\n@@ -101,7 +89,7 @@ public class WildFlyRuntimeProvider implements RuntimeProvider {\n@Override\npublic List<String> findLanguageNames() {\nList<String> names = new ArrayList<String>();\n- InputStream is = camelCatalog.getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);\n+ InputStream is = getCamelCatalog().getVersionManager().getResourceAsStream(LANGUAGE_CATALOG);\nif (is != null) {\ntry {\nCatalogHelper.loadLines(is, names);\n"
},
{
"change_type": "MODIFY",
"old_path": "catalog/src/test/java/org/wildfly/camel/test/catalog/WildFlyRuntimeProviderTest.java",
"new_path": "catalog/src/test/java/org/wildfly/camel/test/catalog/WildFlyRuntimeProviderTest.java",
"diff": "@@ -20,10 +20,10 @@ import java.util.List;\nimport org.apache.camel.catalog.CamelCatalog;\nimport org.apache.camel.catalog.DefaultCamelCatalog;\n-import org.apache.camel.catalog.wildfly.WildFlyRuntimeProvider;\nimport org.junit.Assert;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\n+import org.wildfly.camel.catalog.WildFlyRuntimeProvider;\npublic class WildFlyRuntimeProviderTest {\n@@ -61,6 +61,8 @@ public class WildFlyRuntimeProviderTest {\nAssert.assertTrue(names.contains(\"ftp\"));\nAssert.assertTrue(names.contains(\"jms\"));\nAssert.assertTrue(names.contains(\"ejb\"));\n+\n+ Assert.assertFalse(names.contains(\"apns\"));\n}\n@Test\n@@ -73,6 +75,8 @@ public class WildFlyRuntimeProviderTest {\nAssert.assertTrue(names.contains(\"bindy-csv\"));\nAssert.assertTrue(names.contains(\"zip\"));\nAssert.assertTrue(names.contains(\"zipfile\"));\n+\n+ Assert.assertFalse(names.contains(\"boon\"));\n}\n@Test\n@@ -85,6 +89,8 @@ public class WildFlyRuntimeProviderTest {\nAssert.assertTrue(names.contains(\"simple\"));\nAssert.assertTrue(names.contains(\"spel\"));\nAssert.assertTrue(names.contains(\"xpath\"));\n+\n+ Assert.assertFalse(names.contains(\"sql\"));\n}\n@Test\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1616] Catalog reports unsupported items
|
734,358 |
15.02.2017 15:02:12
| -3,600 |
5bb98b4f1f1ac9a97733d307657e44e6efe5950c
|
[resolves Remove support for domain configuration
|
[
{
"change_type": "MODIFY",
"old_path": "config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java",
"new_path": "config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java",
"diff": "@@ -63,8 +63,6 @@ public final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n@Override\npublic void applyDomainConfigChange(ConfigContext context, boolean enable) {\n- applyStandaloneConfigChange(context, enable);\n- updateServergroup(enable, context);\n}\nprivate static void updateExtension(ConfigContext context, boolean enable) {\n@@ -150,20 +148,6 @@ public final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n}\n}\n- private static void updateServergroup(boolean enable, ConfigContext context) {\n- Element serverGroups = ConfigSupport.findChildElement(context.getDocument().getRootElement(), \"server-groups\", NS_DOMAINS);\n- Element camel = ConfigSupport.findElementWithAttributeValue(serverGroups, \"server-group\", \"name\", \"camel-server-group\", NS_DOMAINS);\n- if (enable && camel == null) {\n- URL resource = WildFlyCamelConfigPlugin.class.getResource(\"/camel-servergroup.xml\");\n- serverGroups.addContent(new Text(\" \"));\n- serverGroups.addContent(ConfigSupport.loadElementFrom(resource));\n- serverGroups.addContent(new Text(\"\\n \"));\n- }\n- if (!enable && camel != null) {\n- camel.getParentElement().removeContent(camel);\n- }\n- }\n-\nprivate static void addProperty(Element systemProperties, Map<String, Element> propertiesByName, String name, String value) {\nNamespace namespace = systemProperties.getNamespace();\nif (!propertiesByName.containsKey(name)) {\n"
},
{
"change_type": "DELETE",
"old_path": "config/src/test/java/org/wildfly/camel/test/config/DomainConfigTest.java",
"new_path": null,
"diff": "-/*\n- * Copyright 2015 JBoss Inc\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- */\n-package org.wildfly.camel.test.config;\n-\n-import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAINS;\n-\n-import java.net.URL;\n-import java.nio.file.Paths;\n-\n-import org.jdom.Document;\n-import org.jdom.Element;\n-import org.jdom.input.SAXBuilder;\n-import org.jdom.output.Format;\n-import org.jdom.output.XMLOutputter;\n-import org.junit.Assert;\n-import org.junit.Test;\n-import org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin;\n-import org.wildfly.extras.config.ConfigContext;\n-import org.wildfly.extras.config.ConfigPlugin;\n-import org.wildfly.extras.config.ConfigSupport;\n-\n-public class DomainConfigTest {\n-\n- @Test\n- public void testDomainConfig() throws Exception {\n-\n- URL resurl = DomainConfigTest.class.getResource(\"/domain.xml\");\n- SAXBuilder jdom = new SAXBuilder();\n- Document doc = jdom.build(resurl);\n-\n- ConfigContext context = ConfigSupport.createContext(null, Paths.get(resurl.toURI()), doc);\n- ConfigPlugin plugin = new WildFlyCamelConfigPlugin();\n- plugin.applyDomainConfigChange(context, true);\n-\n- Element element = ConfigSupport.findChildElement(doc.getRootElement(), \"server-groups\", NS_DOMAINS);\n- Assert.assertNotNull(\"server-groups not null\", element);\n- element = ConfigSupport.findElementWithAttributeValue(element, \"server-group\", \"name\", \"camel-server-group\", NS_DOMAINS);\n- Assert.assertNotNull(\"camel-server-group not null\", element);\n-\n- XMLOutputter output = new XMLOutputter();\n- output.setFormat(Format.getRawFormat());\n- //System.out.println(output.outputString(doc));\n- }\n-}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1611] Remove support for domain configuration
|
734,358 |
15.02.2017 15:59:45
| -3,600 |
3fb035907c6ac78d9f70578eb700d5ef0cf63495
|
[Ignore Cassandra crashes build on AIX
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/cassandra/CassandraIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/cassandra/CassandraIntegrationTest.java",
"diff": "*/\npackage org.wildfly.camel.test.cassandra;\n-\nimport java.util.List;\nimport org.apache.camel.CamelContext;\n@@ -38,6 +37,7 @@ import org.jboss.as.arquillian.container.ManagementClient;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -47,6 +47,8 @@ import org.wildfly.extension.camel.CamelAware;\n@ServerSetup({ CassandraIntegrationTest.CassandraServerSetup.class })\npublic class CassandraIntegrationTest {\n+ static final boolean OS_AIX = System.getProperty(\"os.name\").contains(\"AIX\");\n+\nstatic final String HOST = \"127.0.0.1\";\nstatic final String KEYSPACE = \"camel_ks\";\n@@ -56,12 +58,14 @@ public class CassandraIntegrationTest {\n@Override\npublic void setup(ManagementClient managementClient, String containerId) throws Exception {\n+ Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", OS_AIX);\nEmbeddedCassandraServerHelper.startEmbeddedCassandra(\"/camel-cassandra.yaml\", \"target/camel-cassandra\", 30000);\nnew LoadableCassandraCQLUnit(new ClassPathCQLDataSet(\"cassandra/BasicDataSet.cql\", KEYSPACE), \"/camel-cassandra.yaml\").setup();\n}\n@Override\npublic void tearDown(ManagementClient managementClient, String containerId) throws Exception {\n+ Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", OS_AIX);\nEmbeddedCassandraServerHelper.cleanEmbeddedCassandra();\n}\n@@ -85,12 +89,13 @@ public class CassandraIntegrationTest {\n@Test\npublic void testConsumeAll() throws Exception {\n+ Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", OS_AIX);\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n- from(\"cql://localhost/camel_ks?cql=\" + CQL)\n- .to(\"seda:end\");\n+ from(\"cql://localhost/camel_ks?cql=\" + CQL).to(\"seda:end\");\n}\n});\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[Ignore #1622] Cassandra crashes build on AIX
|
734,358 |
16.02.2017 11:22:23
| -3,600 |
3cc796825e162fdef40871685afd7df93af1e327
|
[resolves Cannot build component catalog on Windows
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyCatalogCreator.java",
"new_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyCatalogCreator.java",
"diff": "@@ -180,8 +180,9 @@ public final class WildFlyCatalogCreator {\nfor (Item item : roadmap.items.values()) {\nPath javaType = Paths.get(item.javaType.replace('.', '/') + \".class\");\nif (rootPath.resolve(javaType).toFile().isFile()) {\n- String targetPath = item.path.toString().replace(\"org/apache\", \"org/wildfly\");\n- Path target = outdir.resolve(Paths.get(targetPath));\n+ Path subpath = item.path.subpath(2, item.path.getNameCount());\n+ Path targetPath = Paths.get(\"org\", \"wildfly\").resolve(subpath);\n+ Path target = outdir.resolve(targetPath);\nPath source = srcdir.resolve(item.path);\ntarget.getParent().toFile().mkdirs();\nFiles.copy(source, target, StandardCopyOption.REPLACE_EXISTING);\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1623] Cannot build component catalog on Windows
|
734,358 |
16.02.2017 11:43:32
| -3,600 |
a928e1016045dae59a941cef18910dd580d970c6
|
[resolves Remove support for switchyard deployments
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"diff": "@@ -24,11 +24,6 @@ import java.nio.file.Path;\nimport java.nio.file.Paths;\nimport java.util.Locale;\n-import org.jboss.modules.Module;\n-import org.jboss.modules.ModuleIdentifier;\n-import org.jboss.modules.ModuleLoadException;\n-import org.jboss.modules.ModuleLoader;\n-\n/**\n* Collection of Environment utilities\n*\n@@ -66,16 +61,6 @@ public final class EnvironmentUtils {\nprivate EnvironmentUtils() {\n}\n- public static boolean switchyardSupport() {\n- try {\n- ModuleLoader moduleLoader = Module.getCallerModuleLoader();\n- moduleLoader.loadModule(ModuleIdentifier.create(\"org.switchyard.runtime\"));\n- return true;\n- } catch (ModuleLoadException ex) {\n- return false;\n- }\n- }\n-\npublic static boolean isLinux() {\nreturn LINUX;\n}\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/switchyard/CamelContextHooksTest.java",
"new_path": null,
"diff": "-/*\n- * #%L\n- * Wildfly Camel :: Testsuite\n- * %%\n- * Copyright (C) 2013 - 2014 RedHat\n- * %%\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- * #L%\n- */\n-\n-package org.wildfly.camel.test.switchyard;\n-\n-import java.io.InputStream;\n-\n-import org.apache.camel.CamelContext;\n-import org.apache.camel.ProducerTemplate;\n-import org.apache.camel.builder.RouteBuilder;\n-import org.apache.camel.impl.DefaultCamelContext;\n-import org.apache.camel.impl.DefaultClassResolver;\n-import org.jboss.arquillian.container.test.api.Deployment;\n-import org.jboss.arquillian.junit.Arquillian;\n-import org.jboss.arquillian.test.api.ArquillianResource;\n-import org.jboss.gravia.resource.ManifestBuilder;\n-import org.jboss.shrinkwrap.api.ShrinkWrap;\n-import org.jboss.shrinkwrap.api.asset.Asset;\n-import org.jboss.shrinkwrap.api.spec.JavaArchive;\n-import org.junit.Assert;\n-import org.junit.Test;\n-import org.junit.runner.RunWith;\n-import org.wildfly.camel.test.switchyard.subA.JavaDSL;\n-import org.wildfly.camel.test.switchyard.subA.JavaDSLBuilder;\n-import org.wildfly.extension.camel.CamelContextRegistry;\n-\n-/**\n- * Verify that a deployment with a META-INF/switchyard.xml file\n- * does not have the CamelContexts enhanced by wildfly-camel\n- */\n-@RunWith(Arquillian.class)\n-public class CamelContextHooksTest {\n-\n- @ArquillianResource\n- CamelContextRegistry contextRegistry;\n-\n- @Deployment\n- public static JavaArchive deployment() {\n- final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"switchyard-camelctx-tests.jar\");\n- archive.addClasses(JavaDSL.class, JavaDSLBuilder.class);\n- archive.addAsManifestResource(\"switchyard/switchyard.xml\", \"switchyard.xml\");\n- archive.addAsManifestResource(\"switchyard/route.xml\", \"route.xml\");\n- archive.setManifest(new Asset() {\n- @Override\n- public InputStream openStream() {\n- ManifestBuilder builder = new ManifestBuilder();\n- builder.addManifestHeader(\"Dependencies\", \"org.wildfly.extension.camel,org.apache.camel.core\");\n- return builder.openStream();\n- }\n- });\n- return archive;\n- }\n-\n- @Test\n- public void testCamelContextNotEnhanced () throws Exception {\n-\n- // Verify that the CamelContext works with the explicit module deps from above\n- CamelContext camelctx = new DefaultCamelContext();\n- camelctx.addRoutes(new RouteBuilder() {\n- @Override\n- public void configure() throws Exception {\n- from(\"direct:start\").transform(body().prepend(\"Hello \"));\n- }\n- });\n-\n- camelctx.start();\n- try {\n-\n- // These properties would be set by the wildfly-camel integration\n- Assert.assertNull(\"Null ApplicationContextClassLoader\", camelctx.getApplicationContextClassLoader());\n- Assert.assertTrue(\"Has DefaultClassResolver\", camelctx.getClassResolver() instanceof DefaultClassResolver);\n- Assert.assertNull(\"Not in CamelContextRegistry\", contextRegistry.getCamelContext(camelctx.getName()));\n-\n- ProducerTemplate producer = camelctx.createProducerTemplate();\n- String result = producer.requestBody(\"direct:start\", \"Kermit\", String.class);\n- Assert.assertEquals(\"Hello Kermit\", result);\n- } finally {\n- camelctx.stop();\n- }\n- }\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/switchyard/SwitchyardDeploymentTest.java",
"new_path": null,
"diff": "-/*\n- * #%L\n- * Wildfly Camel :: Testsuite\n- * %%\n- * Copyright (C) 2013 - 2014 RedHat\n- * %%\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- * #L%\n- */\n-\n-package org.wildfly.camel.test.switchyard;\n-\n-import org.apache.camel.impl.DefaultCamelContext;\n-import org.jboss.arquillian.container.test.api.Deployment;\n-import org.jboss.arquillian.junit.Arquillian;\n-import org.jboss.shrinkwrap.api.ShrinkWrap;\n-import org.jboss.shrinkwrap.api.spec.JavaArchive;\n-import org.junit.Assert;\n-import org.junit.Assume;\n-import org.junit.Test;\n-import org.junit.runner.RunWith;\n-import org.wildfly.camel.test.common.utils.EnvironmentUtils;\n-import org.wildfly.camel.test.switchyard.subA.JavaDSL;\n-import org.wildfly.camel.test.switchyard.subA.JavaDSLBuilder;\n-\n-/**\n- * Verify that a deployment with a META-INF/switchyard.xml file\n- * disables camel from being added to your deployment.\n- */\n-@RunWith(Arquillian.class)\n-public class SwitchyardDeploymentTest {\n-\n- @Deployment\n- public static JavaArchive deployment() {\n- final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"switchyard-modules-tests.jar\");\n- archive.addClasses(JavaDSL.class, JavaDSLBuilder.class, EnvironmentUtils.class);\n- archive.addAsManifestResource(\"switchyard/switchyard.xml\", \"switchyard.xml\");\n- archive.addAsManifestResource(\"switchyard/route.xml\", \"route.xml\");\n- return archive;\n- }\n-\n- @Test\n- public void testCamelDoesNotLoad() throws Exception {\n- Assume.assumeFalse(EnvironmentUtils.switchyardSupport());\n- try {\n- new DefaultCamelContext();\n- Assert.fail(\"NoClassDefFoundError expected\");\n- } catch (NoClassDefFoundError er) {\n- // expected\n- }\n- }\n-\n-}\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/switchyard/subA/JavaDSL.java",
"new_path": null,
"diff": "-/*\n- * #%L\n- * Wildfly Camel :: Testsuite\n- * %%\n- * Copyright (C) 2013 - 2014 RedHat\n- * %%\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- * #L%\n- */\n-package org.wildfly.camel.test.switchyard.subA;\n-\n-\n-public interface JavaDSL {\n-\n- public void acceptMessage(String input);\n-\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/switchyard/subA/JavaDSLBuilder.java",
"new_path": null,
"diff": "-/*\n- * #%L\n- * Wildfly Camel :: Testsuite\n- * %%\n- * Copyright (C) 2013 - 2014 RedHat\n- * %%\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- * #L%\n- */\n-package org.wildfly.camel.test.switchyard.subA;\n-\n-import org.apache.camel.builder.RouteBuilder;\n-\n-public class JavaDSLBuilder extends RouteBuilder {\n-\n- public void configure() {\n- from(\"switchyard://JavaDSL\")\n- .log(\"Message received in Java DSL Route\")\n- .log(\"${body}\")\n- .split(body(String.class).tokenize(\"\\n\"))\n- .filter()\n- .groovy(\"request.getBody().startsWith('sally:')\")\n- .transform().javaScript(\"request.getBody().substring(6, request.getBody().length())\")\n- .to(\"switchyard://XMLService?operationName=acceptMessage\");\n- }\n-}\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/basic/src/main/resources/switchyard/route.xml",
"new_path": null,
"diff": "-<routes xmlns=\"http://camel.apache.org/schema/spring\">\n- <route>\n- <from uri=\"switchyard://XMLService\"/>\n- <log message=\"Inside XML Camel Route\"/>\n-\n- <choice>\n- <when>\n- <ognl>request.body == ' I like cheese'</ognl>\n- <log message=\"[ognl message] 'sally:${body}'\"/>\n- </when>\n- <when>\n- <mvel>request.body == ' And milk too'</mvel>\n- <log message=\"[mvel message] 'sally:${body}'\"/>\n- </when>\n- <otherwise>\n- <log message=\"[message] 'sally:${body}'\"/>\n- </otherwise>\n- </choice>\n- </route>\n-</routes>\n\\ No newline at end of file\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/basic/src/main/resources/switchyard/switchyard.xml",
"new_path": null,
"diff": "-<switchyard xmlns=\"urn:switchyard-config:switchyard:1.0\" xmlns:camel=\"urn:switchyard-component-camel:config:1.0\" xmlns:sca=\"http://docs.oasis-open.org/ns/opencsa/sca/200912\">\n- <sca:composite name=\"camel-service\" targetNamespace=\"urn:switchyard-quickstart:camel-service:0.1.0\">\n- <sca:service name=\"JavaDSL\" promote=\"JavaDSLBuilder/JavaDSL\">\n- <sca:binding.sca/>\n- </sca:service>\n- <sca:component name=\"JavaDSLBuilder\">\n- <camel:implementation.camel>\n- <camel:java class=\"org.wildfly.camel.test.switchyard.subA.JavaDSLBuilder\"/>\n- </camel:implementation.camel>\n- <sca:service name=\"JavaDSL\">\n- <sca:interface.java interface=\"org.wildfly.camel.test.switchyard.subA.JavaDSL\"/>\n- </sca:service>\n- <sca:reference name=\"XMLService\">\n- <interface.esb inputType=\"java:java.lang.String\"/>\n- </sca:reference>\n- </sca:component>\n- <sca:component name=\"XMLComponent\">\n- <camel:implementation.camel>\n- <camel:xml path=\"META-INF/route.xml\"/>\n- </camel:implementation.camel>\n- <sca:service name=\"XMLService\">\n- <interface.esb inputType=\"java:java.lang.String\"/>\n- </sca:service>\n- </sca:component>\n- </sca:composite>\n-</switchyard>\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "subsystem/core/src/main/java/org/wildfly/extension/camel/CamelConstants.java",
"new_path": "subsystem/core/src/main/java/org/wildfly/extension/camel/CamelConstants.java",
"diff": "@@ -53,9 +53,6 @@ public interface CamelConstants {\n/** This file hold the components to use. */\nString CAMEL_COMPONENTS_FILE_NAME = \"META-INF/jboss-camel-components.properties\";\n- /** The Switchyard marker file */\n- String SWITCHYARD_MARKER_FILE = \"META-INF/switchyard.xml\";\n-\n/** The deployment names for repository content deployments */\nString REPOSITORY_CONTENT_FILE_SUFFIX = \"-repository-content.xml\";\nString REPOSITORY_CONTENT_FILE_NAME = \"META-INF/jboss-repository-content.xml\";\n"
},
{
"change_type": "MODIFY",
"old_path": "subsystem/core/src/main/java/org/wildfly/extension/camel/deployment/CamelDeploymentSettingsProcessor.java",
"new_path": "subsystem/core/src/main/java/org/wildfly/extension/camel/deployment/CamelDeploymentSettingsProcessor.java",
"diff": "*/\npackage org.wildfly.extension.camel.deployment;\n+import static org.wildfly.extension.camel.CamelLogger.LOGGER;\n+\nimport java.util.HashMap;\nimport java.util.List;\nimport java.util.Map;\n@@ -32,10 +34,6 @@ import org.jboss.as.server.deployment.annotation.CompositeIndex;\nimport org.jboss.jandex.AnnotationInstance;\nimport org.jboss.jandex.AnnotationValue;\nimport org.jboss.jandex.DotName;\n-import org.jboss.vfs.VirtualFile;\n-import org.wildfly.extension.camel.CamelConstants;\n-\n-import static org.wildfly.extension.camel.CamelLogger.LOGGER;\npublic final class CamelDeploymentSettingsProcessor implements DeploymentUnitProcessor {\n@@ -94,12 +92,6 @@ public final class CamelDeploymentSettingsProcessor implements DeploymentUnitPro\nboolean result = true;\n- // Skip wiring wfc for SwitchYard deployments\n- VirtualFile rootFile = depUnit.getAttachment(Attachments.DEPLOYMENT_ROOT).getRoot();\n- if (rootFile.getChild(CamelConstants.SWITCHYARD_MARKER_FILE).exists()) {\n- result = false;\n- }\n-\n// Skip wiring wfc for hawtio and resource adapter deployments\nString runtimeName = depUnit.getName();\nif (runtimeName.startsWith(\"hawtio\") && runtimeName.endsWith(\".war\") || runtimeName.endsWith(\".rar\")) {\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1626] Remove support for switchyard deployments
|
734,358 |
17.02.2017 08:00:36
| -3,600 |
4c4c3e674859f6d11d4d1b6cbfd903e837b14fa0
|
[Ignore ExecIntegrationTest fails on Windows
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/exec/ExecIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/exec/ExecIntegrationTest.java",
"diff": "@@ -29,6 +29,7 @@ import org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.utils.EnvironmentUtils;\n@@ -46,6 +47,9 @@ public class ExecIntegrationTest {\n@Test\npublic void testExecProducer() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1628] ExecIntegrationTest fails on Windows\", EnvironmentUtils.isWindows());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[Ignore #1628] ExecIntegrationTest fails on Windows
|
734,358 |
17.02.2017 08:04:40
| -3,600 |
5c29b7e7e3633e713468caa58ddc02fc6b7e23ef
|
[Ignore SchematronIntegrationTest fails on Windows
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/schematron/SchematronIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/schematron/SchematronIntegrationTest.java",
"diff": "@@ -31,8 +31,10 @@ import org.jboss.gravia.utils.IOUtils;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -45,11 +47,15 @@ public class SchematronIntegrationTest {\n.addAsResource(\"schematron/person.sch\", \"schematron/person.sch\")\n.addAsResource(\"schematron/person.xsd\", \"schematron/person.xsd\")\n.addAsResource(\"schematron/person-invalid.xml\", \"schematron/person-invalid.xml\")\n- .addAsResource(\"schematron/person-valid.xml\", \"schematron/person-valid.xml\");\n+ .addAsResource(\"schematron/person-valid.xml\", \"schematron/person-valid.xml\")\n+ .addClasses(EnvironmentUtils.class);\n}\n@Test\npublic void testSchematronValidation() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1629] SchematronIntegrationTest fails on Windows\", EnvironmentUtils.isWindows());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[Ignore #1629] SchematronIntegrationTest fails on Windows
|
734,358 |
17.02.2017 09:21:09
| -3,600 |
6703cee1e4d8efab1e1bdc2486af8828ff9a2ee1
|
[Ignore SegmentationError with elasticsearch on AIX
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"diff": "@@ -32,6 +32,7 @@ import java.util.Locale;\n*/\npublic final class EnvironmentUtils {\n+ private static final boolean AIX;\nprivate static final boolean LINUX;\nprivate static final boolean MAC;\nprivate static final boolean WINDOWS;\n@@ -40,6 +41,7 @@ public final class EnvironmentUtils {\nstatic {\nfinal String os = System.getProperty(\"os.name\").toLowerCase(Locale.ROOT);\n+ AIX = os.equals(\"aix\");\nLINUX = os.equals(\"linux\");\nMAC = os.startsWith(\"mac\");\nWINDOWS = os.contains(\"win\");\n@@ -61,6 +63,10 @@ public final class EnvironmentUtils {\nprivate EnvironmentUtils() {\n}\n+ public static boolean isAix() {\n+ return AIX;\n+ }\n+\npublic static boolean isLinux() {\nreturn LINUX;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/cassandra/CassandraIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/cassandra/CassandraIntegrationTest.java",
"diff": "@@ -40,6 +40,7 @@ import org.junit.Assert;\nimport org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -47,8 +48,6 @@ import org.wildfly.extension.camel.CamelAware;\n@ServerSetup({ CassandraIntegrationTest.CassandraServerSetup.class })\npublic class CassandraIntegrationTest {\n- static final boolean OS_AIX = System.getProperty(\"os.name\").contains(\"AIX\");\n-\nstatic final String HOST = \"127.0.0.1\";\nstatic final String KEYSPACE = \"camel_ks\";\n@@ -58,16 +57,18 @@ public class CassandraIntegrationTest {\n@Override\npublic void setup(ManagementClient managementClient, String containerId) throws Exception {\n- Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", OS_AIX);\n+ if (!EnvironmentUtils.isAix()) {\nEmbeddedCassandraServerHelper.startEmbeddedCassandra(\"/camel-cassandra.yaml\", \"target/camel-cassandra\", 30000);\nnew LoadableCassandraCQLUnit(new ClassPathCQLDataSet(\"cassandra/BasicDataSet.cql\", KEYSPACE), \"/camel-cassandra.yaml\").setup();\n}\n+ }\n@Override\npublic void tearDown(ManagementClient managementClient, String containerId) throws Exception {\n- Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", OS_AIX);\n+ if (!EnvironmentUtils.isAix()) {\nEmbeddedCassandraServerHelper.cleanEmbeddedCassandra();\n}\n+ }\nstatic class LoadableCassandraCQLUnit extends CassandraCQLUnit {\n@@ -83,13 +84,14 @@ public class CassandraIntegrationTest {\n@Deployment\npublic static JavaArchive createdeployment() {\n- return ShrinkWrap.create(JavaArchive.class, \"cassandra-tests\");\n+ return ShrinkWrap.create(JavaArchive.class, \"cassandra-tests\")\n+ .addClasses(EnvironmentUtils.class);\n}\n@Test\npublic void testConsumeAll() throws Exception {\n- Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", OS_AIX);\n+ Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", EnvironmentUtils.isAix());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/elasticsearch/ElasticSearchIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/elasticsearch/ElasticSearchIntegrationTest.java",
"diff": "@@ -45,9 +45,11 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.asset.EmptyAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.camel.test.elasticsearch.subA.ElasticSearchClientProducer;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -62,9 +64,13 @@ public class ElasticSearchIntegrationTest {\n@Deployment\npublic static JavaArchive createDeployment() {\n- return ShrinkWrap.create(JavaArchive.class, \"camel-elasticsearch-tests.jar\")\n- .addClass(ElasticSearchClientProducer.class)\n- .addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"camel-elasticsearch-tests.jar\");\n+ archive.addClasses(EnvironmentUtils.class);\n+ if (!EnvironmentUtils.isAix()) {\n+ archive.addClasses(ElasticSearchClientProducer.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ }\n+ return archive;\n}\n@BeforeClass\n@@ -75,6 +81,8 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testIndexContentUsingHeaders() throws Exception {\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n@@ -105,6 +113,9 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testGetContent() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n@@ -137,6 +148,9 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testDeleteContent() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n@@ -179,6 +193,9 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testSearchContent() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[Ignore #1632] SegmentationError with elasticsearch on AIX
|
734,358 |
17.02.2017 10:44:10
| -3,600 |
bde074e1fc676c97928c59bb7d15986c8c16ac6c
|
Ignore various wildfly-camel failures on AIX
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"diff": "@@ -63,7 +63,7 @@ public final class EnvironmentUtils {\nprivate EnvironmentUtils() {\n}\n- public static boolean isAix() {\n+ public static boolean isAIX() {\nreturn AIX;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/cassandra/CassandraIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/cassandra/CassandraIntegrationTest.java",
"diff": "@@ -57,7 +57,7 @@ public class CassandraIntegrationTest {\n@Override\npublic void setup(ManagementClient managementClient, String containerId) throws Exception {\n- if (!EnvironmentUtils.isAix()) {\n+ if (!EnvironmentUtils.isAIX()) {\nEmbeddedCassandraServerHelper.startEmbeddedCassandra(\"/camel-cassandra.yaml\", \"target/camel-cassandra\", 30000);\nnew LoadableCassandraCQLUnit(new ClassPathCQLDataSet(\"cassandra/BasicDataSet.cql\", KEYSPACE), \"/camel-cassandra.yaml\").setup();\n}\n@@ -65,7 +65,7 @@ public class CassandraIntegrationTest {\n@Override\npublic void tearDown(ManagementClient managementClient, String containerId) throws Exception {\n- if (!EnvironmentUtils.isAix()) {\n+ if (!EnvironmentUtils.isAIX()) {\nEmbeddedCassandraServerHelper.cleanEmbeddedCassandra();\n}\n}\n@@ -91,7 +91,7 @@ public class CassandraIntegrationTest {\n@Test\npublic void testConsumeAll() throws Exception {\n- Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", EnvironmentUtils.isAix());\n+ Assume.assumeFalse(\"[#1622] Cassandra crashes build on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/castor/CastorIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/castor/CastorIntegrationTest.java",
"diff": "@@ -29,9 +29,11 @@ import org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.types.Customer;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -43,7 +45,7 @@ public class CastorIntegrationTest {\n@Deployment\npublic static JavaArchive createdeployment() {\nfinal JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"castor-dataformat-tests\");\n- archive.addClasses(Customer.class);\n+ archive.addClasses(Customer.class, EnvironmentUtils.class);\narchive.addAsResource(\"castor/castor-mapping.xml\", \"castor-mapping.xml\");\nreturn archive;\n}\n@@ -51,6 +53,8 @@ public class CastorIntegrationTest {\n@Test\npublic void testMarshal() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6586] CastorIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/classloading/DOMRegistryTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/classloading/DOMRegistryTest.java",
"diff": "@@ -25,10 +25,12 @@ import org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.w3c.dom.DOMImplementation;\nimport org.w3c.dom.bootstrap.DOMImplementationRegistry;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -38,6 +40,7 @@ public class DOMRegistryTest {\n@Deployment\npublic static JavaArchive deployment() {\nfinal JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"dom-registry-tests\");\n+ archive.addClasses(EnvironmentUtils.class);\nreturn archive;\n}\n@@ -57,6 +60,9 @@ public class DOMRegistryTest {\n@Test\npublic void testDeploymentClassloader() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6587] DOMRegistryTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nClassLoader tccl = Thread.currentThread().getContextClassLoader();\ntry {\nClassLoader classLoader = DOMRegistryTest.class.getClassLoader();\n@@ -71,6 +77,9 @@ public class DOMRegistryTest {\n@Test\npublic void testDefaultClassloader() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6587] DOMRegistryTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nDOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();\nDOMImplementation domImpl = registry.getDOMImplementation(\"LS 3.0\");\nAssert.assertNotNull(\"DOMImplementation not null\", domImpl);\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/elasticsearch/ElasticSearchIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/elasticsearch/ElasticSearchIntegrationTest.java",
"diff": "@@ -66,7 +66,7 @@ public class ElasticSearchIntegrationTest {\npublic static JavaArchive createDeployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"camel-elasticsearch-tests.jar\");\narchive.addClasses(EnvironmentUtils.class);\n- if (!EnvironmentUtils.isAix()) {\n+ if (!EnvironmentUtils.isAIX()) {\narchive.addClasses(ElasticSearchClientProducer.class);\narchive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n}\n@@ -81,7 +81,7 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testIndexContentUsingHeaders() throws Exception {\n- Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@@ -114,7 +114,7 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testGetContent() throws Exception {\n- Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@@ -149,7 +149,7 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testDeleteContent() throws Exception {\n- Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@@ -194,7 +194,7 @@ public class ElasticSearchIntegrationTest {\n@Test\npublic void testSearchContent() throws Exception {\n- Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAix());\n+ Assume.assumeFalse(\"[#1632] SegmentationError with elasticsearch on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/exec/ExecIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/exec/ExecIntegrationTest.java",
"diff": "@@ -29,6 +29,7 @@ import org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.utils.EnvironmentUtils;\n@@ -46,6 +47,9 @@ public class ExecIntegrationTest {\n@Test\npublic void testExecProducer() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6585] ExecIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/SftpIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/SftpIntegrationTest.java",
"diff": "@@ -38,6 +38,7 @@ import org.jboss.shrinkwrap.api.asset.StringAsset;\nimport org.jboss.shrinkwrap.api.spec.WebArchive;\nimport org.junit.After;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n@@ -70,10 +71,12 @@ public class SftpIntegrationTest {\n@Before\npublic void setUp() throws Exception {\n+ if (!EnvironmentUtils.isAIX()) {\nrecursiveDelete(resolvePath(FTP_ROOT_DIR).toFile());\nsshServer = new EmbeddedSSHServer(FTP_ROOT_DIR);\nsshServer.start();\n}\n+ }\n@After\npublic void tearDown() throws Exception {\n@@ -84,6 +87,9 @@ public class SftpIntegrationTest {\n@Test\npublic void testSendFile() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6588] SftpIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nFile testFile = resolvePath(FTP_ROOT_DIR).resolve(\"test.txt\").toFile();\nCamelContext camelctx = new DefaultCamelContext();\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/jsch/JschIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/jsch/JschIntegrationTest.java",
"diff": "@@ -38,6 +38,7 @@ import org.jboss.shrinkwrap.api.asset.StringAsset;\nimport org.jboss.shrinkwrap.api.spec.WebArchive;\nimport org.junit.After;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n@@ -69,9 +70,11 @@ public class JschIntegrationTest {\n@Before\npublic void setUp() throws Exception {\n+ if (!EnvironmentUtils.isAIX()) {\nsshServer = new EmbeddedSSHServer(SSHD_ROOT_DIR);\nsshServer.start();\n}\n+ }\n@After\npublic void tearDown() throws Exception {\n@@ -82,6 +85,9 @@ public class JschIntegrationTest {\n@Test\npublic void testScpFile() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6589] JschIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nFile testFile = resolvePath(SSHD_ROOT_DIR).resolve(\"test.txt\").toFile();\nCamelContext camelctx = new DefaultCamelContext();\ntry {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/mongodb/MongoDBIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/mongodb/MongoDBIntegrationTest.java",
"diff": "@@ -37,10 +37,12 @@ import org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.After;\nimport org.junit.AfterClass;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Before;\nimport org.junit.BeforeClass;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\nimport com.mongodb.BasicDBObject;\n@@ -62,24 +64,28 @@ public class MongoDBIntegrationTest {\n@Deployment\npublic static JavaArchive createDeployment() {\nreturn ShrinkWrap.create(JavaArchive.class, \"camel-mongodb-tests\")\n- .addClass(EmbeddedMongoServer.class);\n+ .addClasses(EmbeddedMongoServer.class, EnvironmentUtils.class);\n}\n@BeforeClass\npublic static void beforeClass() throws Exception {\n+ if (!EnvironmentUtils.isAIX()) {\nif (mongoServer == null) {\nmongoServer = new EmbeddedMongoServer(PORT);\n}\nmongoServer.start();\n}\n+ }\n@AfterClass\npublic static void afterClass() {\n+ if (mongoServer != null)\nmongoServer.stop();\n}\n@Before\npublic void setUp() throws Exception {\n+ if (!EnvironmentUtils.isAIX()) {\nMongoClient client = new MongoClient(\"localhost\", PORT);\nMongoDatabase db = client.getDatabase(\"test\");\n@@ -98,15 +104,22 @@ public class MongoDBIntegrationTest {\nsetupTestData();\n}\n+ }\n@After\npublic void tearDown() throws Exception {\n+ if (!EnvironmentUtils.isAIX()) {\nInitialContext context = new InitialContext();\ncontext.unbind(\"mongoConnection\");\n}\n+ }\n@Test\n+ @SuppressWarnings(\"unchecked\")\npublic void testMongoFindAll() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6590] MongoDBIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java",
"diff": "@@ -26,10 +26,12 @@ import org.jboss.gravia.resource.ManifestBuilder;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.optaplanner.examples.cloudbalancing.domain.CloudBalance;\nimport org.optaplanner.examples.cloudbalancing.persistence.CloudBalancingGenerator;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -39,6 +41,7 @@ public class OptaPlannerIntegrationTest {\n@Deployment\npublic static JavaArchive createDeployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"camel-optaplanner-tests\");\n+ archive.addClasses(EnvironmentUtils.class);\narchive.addPackages(true, \"org.optaplanner.examples.common.app\");\narchive.addPackages(true, \"org.optaplanner.examples.common.domain\");\narchive.addPackages(true, \"org.optaplanner.examples.common.persistence\");\n@@ -57,6 +60,8 @@ public class OptaPlannerIntegrationTest {\n@Test\npublic void testSynchronousProblemSolving() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6591] OptaPlannerIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCloudBalancingGenerator generator = new CloudBalancingGenerator(true);\nfinal CloudBalance planningProblem = generator.createCloudBalance(4, 12);\nAssert.assertNull(planningProblem.getScore());\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/paho/PahoIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/paho/PahoIntegrationTest.java",
"diff": "@@ -49,9 +49,11 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.asset.StringAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.utils.AvailablePortFinder;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@@ -86,6 +88,7 @@ public class PahoIntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"mqtt-tests\");\n+ archive.addClasses(EnvironmentUtils.class);\narchive.addAsResource(new StringAsset(BrokerSetup.TCP_CONNECTION), \"tcp-connection\");\nreturn archive;\n}\n@@ -93,6 +96,8 @@ public class PahoIntegrationTest {\n@Test\npublic void testPahoConsumer() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6592] PahoIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n@@ -129,6 +134,8 @@ public class PahoIntegrationTest {\n@Test\npublic void testMQTTProducer() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6592] PahoIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/protobuf/ProtobufIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/protobuf/ProtobufIntegrationTest.java",
"diff": "@@ -32,8 +32,10 @@ import org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.camel.test.protobuf.model.AddressBookProtos;\nimport org.wildfly.camel.test.protobuf.model.AddressBookProtos.Person;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -45,13 +47,15 @@ public class ProtobufIntegrationTest {\n@Deployment\npublic static JavaArchive createdeployment() {\nfinal JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"protobuf-tests\");\n- archive.addClasses(AddressBookProtos.class);\n+ archive.addClasses(AddressBookProtos.class, EnvironmentUtils.class);\nreturn archive;\n}\n@Test\npublic void testMarshall() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6593] ProtobufIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nfinal ProtobufDataFormat format = new ProtobufDataFormat(Person.getDefaultInstance());\nCamelContext camelctx = new DefaultCamelContext();\n@@ -77,6 +81,8 @@ public class ProtobufIntegrationTest {\n@Test\npublic void testUnmarshall() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6593] ProtobufIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nfinal ProtobufDataFormat format = new ProtobufDataFormat(Person.getDefaultInstance());\nCamelContext camelctx = new DefaultCamelContext();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sjms/SJMSIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sjms/SJMSIntegrationTest.java",
"diff": "@@ -51,8 +51,10 @@ import org.jboss.as.arquillian.container.ManagementClient;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.camel.test.common.utils.JMSUtils;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -82,12 +84,15 @@ public class SJMSIntegrationTest {\n@Deployment\npublic static JavaArchive createdeployment() {\n- return ShrinkWrap.create(JavaArchive.class, \"camel-jms-tests\");\n+ return ShrinkWrap.create(JavaArchive.class, \"camel-jms-tests\")\n+ .addClasses(EnvironmentUtils.class);\n}\n@Test\npublic void testMessageConsumerRoute() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6594] SJMSIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n@@ -121,6 +126,8 @@ public class SJMSIntegrationTest {\n@Test\npublic void testMessageProviderRoute() throws Exception {\n+ Assume.assumeFalse(\"[ENTESB-6594] SJMSIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"diff": "@@ -15,6 +15,7 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.After;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Before;\nimport org.junit.Ignore;\nimport org.junit.Test;\n@@ -44,9 +45,11 @@ public class SSHIntegrationTest {\n@Before\npublic void setUp() throws Exception {\n+ if (!EnvironmentUtils.isAIX()) {\nsshServer = new EmbeddedSSHServer(SSHD_ROOT_DIR, AvailablePortFinder.getNextAvailable());\nsshServer.start();\n}\n+ }\n@After\npublic void tearDown() throws Exception {\n@@ -57,6 +60,9 @@ public class SSHIntegrationTest {\n@Test\npublic void testSSHConsumer() throws Exception {\n+\n+ Assume.assumeFalse(\"[ENTESB-6595] SSHIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/xmlsecurity/XmlSecurityIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/xmlsecurity/XmlSecurityIntegrationTest.java",
"diff": "@@ -33,10 +33,12 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.WebArchive;\nimport org.junit.After;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.w3c.dom.Node;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\nimport javax.naming.InitialContext;\n@@ -65,6 +67,7 @@ public class XmlSecurityIntegrationTest {\n@Deployment\npublic static WebArchive createDeployment() {\nfinal WebArchive archive = ShrinkWrap.create(WebArchive.class, \"camel-test.war\");\n+ archive.addClasses(EnvironmentUtils.class);\nreturn archive;\n}\n@@ -83,8 +86,10 @@ public class XmlSecurityIntegrationTest {\n@Test\npublic void testXmlSigning() throws Exception {\n- CamelContext camelctx = new DefaultCamelContext();\n+ Assume.assumeFalse(\"[ENTESB-6596] XmlSecurityIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\n+ CamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n@@ -108,8 +113,10 @@ public class XmlSecurityIntegrationTest {\n@Test\npublic void testXmlVerifySigning() throws Exception {\n- CamelContext camelctx = new DefaultCamelContext();\n+ Assume.assumeFalse(\"[ENTESB-6596] XmlSecurityIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\n+ CamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/braintree/BraintreeIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/braintree/BraintreeIntegrationTest.java",
"diff": "@@ -43,6 +43,7 @@ import org.junit.Assert;\nimport org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\nimport com.braintreegateway.Customer;\n@@ -78,11 +79,15 @@ public class BraintreeIntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\n- return ShrinkWrap.create(JavaArchive.class, \"camel-braintree-tests\");\n+ return ShrinkWrap.create(JavaArchive.class, \"camel-braintree-tests\")\n+ .addClasses(EnvironmentUtils.class);\n}\n@Test\npublic void testBraintreeClientTokenGateway() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1698] BraintreeIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nMap<String, Object> braintreeOptions = createBraintreeOptions();\n// Do nothing if the required credentials are not present\n@@ -123,6 +128,9 @@ public class BraintreeIntegrationTest {\n@Test\npublic void testBraintreeCustomerGateway() throws Exception {\n+\n+ Assume.assumeFalse(\"[#1698] BraintreeIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+\nMap<String, Object> braintreeOptions = createBraintreeOptions();\n// Do nothing if the required credentials are not present\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[ENTESB-6584] Ignore various wildfly-camel failures on AIX
|
734,358 |
21.02.2017 10:06:50
| -3,600 |
24a35dbb3d8e2a102df3d0ffcc9d0da8256d56ef
|
[resolves Module checker misses duplicate dependency ecj
|
[
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/other-modules.xml",
"new_path": "feature/etc/smartics/other-modules.xml",
"diff": "</dependencies>\n</module>\n- <module name=\"org.eclipse.jdt.compiler\">\n- <include artifact=\"org.eclipse.jdt.core.compiler:ecj\" />\n- </module>\n-\n<module name=\"org.eclipse.jetty\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/wildfly-modules.xml",
"new_path": "feature/etc/smartics/wildfly-modules.xml",
"diff": "<include artifact=\":dom4j\" />\n</module>\n+ <module name=\"org.eclipse.jdt.ecj\" skip=\"true\">\n+ <include artifact=\"org.eclipse.jdt.core.compiler:ecj\" />\n+ </module>\n+\n<module name=\"org.hibernate\" skip=\"true\">\n<include artifact=\":hibernate-core\" />\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<properties>\n<wildfly.patch>${project.build.directory}/${project.artifactId}-${project.version}</wildfly.patch>\n- <wildfly.module.dir>${project.build.directory}/wildfly-${version.wildfly}/modules/system/layers/base</wildfly.module.dir>\n<smartics.module.dir>${project.build.directory}/wildfly-patch/modules/system/layers/fuse</smartics.module.dir>\n</properties>\n</execution>\n</executions>\n</plugin>\n- <plugin>\n- <groupId>org.codehaus.gmaven</groupId>\n- <artifactId>groovy-maven-plugin</artifactId>\n- <executions>\n- <execution>\n- <id>module-check</id>\n- <goals>\n- <goal>execute</goal>\n- </goals>\n- <phase>verify</phase>\n- <configuration>\n- <source>${project.basedir}/scripts/module-checker.groovy</source>\n- </configuration>\n- </execution>\n- </executions>\n- </plugin>\n<plugin>\n<groupId>org.apache.maven.plugins</groupId>\n<artifactId>maven-assembly-plugin</artifactId>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/drools/compiler/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/drools/compiler/main/module.xml",
"diff": "<module name=\"org.antlr\" />\n<module name=\"org.apache.camel.component.protobuf\" />\n<module name=\"org.drools.core\" />\n- <module name=\"org.eclipse.jdt.compiler\" />\n+ <module name=\"org.eclipse.jdt.ecj\" />\n<module name=\"org.kie.api\" />\n<module name=\"org.kie.internal\" />\n<module name=\"org.mvel.mvel2\" />\n"
},
{
"change_type": "DELETE",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/eclipse/jdt/compiler/main/module.xml",
"new_path": null,
"diff": "-<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n-<module xmlns=\"urn:jboss:module:1.1\" name=\"org.eclipse.jdt.compiler\">\n- <resources>\n- <artifact name=\"${org.eclipse.jdt.core.compiler:ecj}\" />\n- </resources>\n- <dependencies />\n-</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/pom.xml",
"new_path": "itests/standalone/pom.xml",
"diff": "<executions>\n<execution>\n<id>server-provisioning</id>\n+ <phase>generate-resources</phase>\n<goals>\n<goal>build</goal>\n</goals>\n- <phase>generate-resources</phase>\n<configuration>\n<config-file>src/main/resources/server-provisioning.xml</config-file>\n<server-name>wildfly-${version.wildfly}</server-name>\n<executions>\n<execution>\n<id>run-fuseconfig</id>\n+ <phase>generate-resources</phase>\n<goals>\n<goal>exec</goal>\n</goals>\n- <phase>generate-resources</phase>\n<configuration>\n<executable>java</executable>\n<environmentVariables>\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/eclipse/aether/main/aether-transport-file-1.0.2.v20150114.jar\n/org/eclipse/aether/main/aether-transport-http-1.0.2.v20150114.jar\n/org/eclipse/aether/main/maven-aether-provider-3.3.3.jar\n-/org/eclipse/jdt/compiler/main/ecj-4.5.1.jar\n/org/eclipse/jetty/main/jetty-client-9.2.19.v20160908.jar\n/org/eclipse/jetty/main/jetty-http-9.2.19.v20160908.jar\n/org/eclipse/jetty/main/jetty-io-9.2.19.v20160908.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/pom.xml",
"new_path": "patch/pom.xml",
"diff": "<!-- Properties -->\n<properties>\n- <jboss.home>${project.build.directory}/wildfly-camel-${version.wildfly}</jboss.home>\n+ <jboss.server.name>wildfly-${version.wildfly}</jboss.server.name>\n+ <jboss.home>${project.build.directory}/wildfly-patch</jboss.home>\n+ <wildfly.module.dir>${project.build.directory}/${jboss.server.name}/modules/system/layers/base</wildfly.module.dir>\n+ <smartics.module.dir>${jboss.home}/modules/system/layers/fuse</smartics.module.dir>\n</properties>\n<!-- Dependencies -->\n<phase>generate-resources</phase>\n<configuration>\n<config-file>scripts/wildfly-provisioning.xml</config-file>\n- <server-name>wildfly-${version.wildfly}</server-name>\n+ <server-name>${jboss.server.name}</server-name>\n</configuration>\n</execution>\n<execution>\n<phase>generate-resources</phase>\n<configuration>\n<config-file>scripts/wildfly-camel-provisioning.xml</config-file>\n- <server-name>wildfly-camel-${version.wildfly}</server-name>\n+ <server-name>wildfly-patch</server-name>\n</configuration>\n</execution>\n</executions>\n<artifactId>groovy-maven-plugin</artifactId>\n<executions>\n<execution>\n- <id>module-list-generate</id>\n+ <id>module-check</id>\n+ <phase>generate-resources</phase>\n<goals>\n<goal>execute</goal>\n</goals>\n+ <configuration>\n+ <source>${project.basedir}/scripts/module-checker.groovy</source>\n+ </configuration>\n+ </execution>\n+ <execution>\n+ <id>module-list-generate</id>\n<phase>verify</phase>\n+ <goals>\n+ <goal>execute</goal>\n+ </goals>\n<configuration>\n<source>${project.basedir}/scripts/module-list-generate.groovy</source>\n</configuration>\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/scripts/assembly-wildfly-patch.xml",
"new_path": "patch/scripts/assembly-wildfly-patch.xml",
"diff": "<fileSets>\n<fileSet>\n- <directory>target/wildfly-camel-${version.wildfly}</directory>\n+ <directory>target/wildfly-patch</directory>\n<outputDirectory>/</outputDirectory>\n<excludes>\n<exclude>standalone/configuration/*.bak</exclude>\n"
},
{
"change_type": "RENAME",
"old_path": "feature/scripts/module-checker.groovy",
"new_path": "patch/scripts/module-checker.groovy",
"diff": ""
},
{
"change_type": "MODIFY",
"old_path": "patch/scripts/sync-resources.xml",
"new_path": "patch/scripts/sync-resources.xml",
"diff": "<!-- Setup -->\n<!-- ================================================================== -->\n<property name=\"output.dir\" value=\"${basedir}/target\" />\n- <property name=\"wildfly.home.dir\" value=\"${output.dir}/wildfly-camel-${version.wildfly}\" />\n+ <property name=\"wildfly.home.dir\" value=\"${output.dir}/wildfly-patch\" />\n<property name=\"wildfly.config.dir\" value=\"${wildfly.home.dir}/standalone/configuration\" />\n<!-- ================================================================== -->\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1637] Module checker misses duplicate dependency ecj
|
734,358 |
22.02.2017 12:32:04
| -3,600 |
22bbd0f04c7ac182c4f4d9515a4a17adb580c19b
|
Reference github issues for failing tests on AIX
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/castor/CastorIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/castor/CastorIntegrationTest.java",
"diff": "@@ -53,7 +53,7 @@ public class CastorIntegrationTest {\n@Test\npublic void testMarshal() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6586] CastorIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1642] CastorIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/classloading/DOMRegistryTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/classloading/DOMRegistryTest.java",
"diff": "@@ -61,7 +61,7 @@ public class DOMRegistryTest {\n@Test\npublic void testDeploymentClassloader() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6587] DOMRegistryTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1643] DOMRegistryTest fails on AIX\", EnvironmentUtils.isAIX());\nClassLoader tccl = Thread.currentThread().getContextClassLoader();\ntry {\n@@ -78,7 +78,7 @@ public class DOMRegistryTest {\n@Test\npublic void testDefaultClassloader() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6587] DOMRegistryTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1643] DOMRegistryTest fails on AIX\", EnvironmentUtils.isAIX());\nDOMImplementationRegistry registry = DOMImplementationRegistry.newInstance();\nDOMImplementation domImpl = registry.getDOMImplementation(\"LS 3.0\");\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/SftpIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/ftp/SftpIntegrationTest.java",
"diff": "@@ -88,7 +88,7 @@ public class SftpIntegrationTest {\n@Test\npublic void testSendFile() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6588] SftpIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1644] SftpIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nFile testFile = resolvePath(FTP_ROOT_DIR).resolve(\"test.txt\").toFile();\nCamelContext camelctx = new DefaultCamelContext();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/jsch/JschIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/jsch/JschIntegrationTest.java",
"diff": "@@ -86,7 +86,7 @@ public class JschIntegrationTest {\n@Test\npublic void testScpFile() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6589] JschIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1645] JschIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nFile testFile = resolvePath(SSHD_ROOT_DIR).resolve(\"test.txt\").toFile();\nCamelContext camelctx = new DefaultCamelContext();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/mongodb/MongoDBIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/mongodb/MongoDBIntegrationTest.java",
"diff": "@@ -118,7 +118,7 @@ public class MongoDBIntegrationTest {\n@SuppressWarnings(\"unchecked\")\npublic void testMongoFindAll() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6590] MongoDBIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1646] MongoDBIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/optaplanner/OptaPlannerIntegrationTest.java",
"diff": "@@ -60,7 +60,7 @@ public class OptaPlannerIntegrationTest {\n@Test\npublic void testSynchronousProblemSolving() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6591] OptaPlannerIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1647] OptaPlannerIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCloudBalancingGenerator generator = new CloudBalancingGenerator(true);\nfinal CloudBalance planningProblem = generator.createCloudBalance(4, 12);\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/paho/PahoIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/paho/PahoIntegrationTest.java",
"diff": "@@ -96,7 +96,7 @@ public class PahoIntegrationTest {\n@Test\npublic void testPahoConsumer() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6592] PahoIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1648] PahoIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@@ -134,7 +134,7 @@ public class PahoIntegrationTest {\n@Test\npublic void testMQTTProducer() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6592] PahoIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1648] PahoIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/protobuf/ProtobufIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/protobuf/ProtobufIntegrationTest.java",
"diff": "@@ -54,7 +54,7 @@ public class ProtobufIntegrationTest {\n@Test\npublic void testMarshall() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6593] ProtobufIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1649] ProtobufIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nfinal ProtobufDataFormat format = new ProtobufDataFormat(Person.getDefaultInstance());\n@@ -81,7 +81,7 @@ public class ProtobufIntegrationTest {\n@Test\npublic void testUnmarshall() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6593] ProtobufIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1649] ProtobufIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nfinal ProtobufDataFormat format = new ProtobufDataFormat(Person.getDefaultInstance());\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sjms/SJMSIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sjms/SJMSIntegrationTest.java",
"diff": "@@ -91,7 +91,7 @@ public class SJMSIntegrationTest {\n@Test\npublic void testMessageConsumerRoute() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6594] SJMSIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1650] SJMSIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@@ -126,7 +126,7 @@ public class SJMSIntegrationTest {\n@Test\npublic void testMessageProviderRoute() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6594] SJMSIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1650] SJMSIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/sshd/SSHIntegrationTest.java",
"diff": "@@ -61,7 +61,7 @@ public class SSHIntegrationTest {\n@Test\npublic void testSSHConsumer() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6595] SSHIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1651] SSHIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/xmlsecurity/XmlSecurityIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/xmlsecurity/XmlSecurityIntegrationTest.java",
"diff": "@@ -87,7 +87,7 @@ public class XmlSecurityIntegrationTest {\n@Test\npublic void testXmlSigning() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6596] XmlSecurityIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1652] XmlSecurityIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@@ -114,7 +114,7 @@ public class XmlSecurityIntegrationTest {\n@Test\npublic void testXmlVerifySigning() throws Exception {\n- Assume.assumeFalse(\"[ENTESB-6596] XmlSecurityIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1652] XmlSecurityIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/braintree/BraintreeIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/braintree/BraintreeIntegrationTest.java",
"diff": "@@ -86,7 +86,7 @@ public class BraintreeIntegrationTest {\n@Test\npublic void testBraintreeClientTokenGateway() throws Exception {\n- Assume.assumeFalse(\"[#1698] BraintreeIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\n+ Assume.assumeFalse(\"[#1653] BraintreeIntegrationTest fails on AIX\", EnvironmentUtils.isAIX());\nMap<String, Object> braintreeOptions = createBraintreeOptions();\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
Reference github issues for failing tests on AIX
|
734,358 |
06.03.2017 13:07:23
| -3,600 |
28d8b34f4976734f1207bd830964befe66a2b99d
|
[resolves Reject support for component spark
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -148,8 +148,6 @@ nagios\nnetty4-http\nrabbitmq\nsnmp\n-spark\n-spark-rest\nsplunk\nspring-batch\nspring-integration\n@@ -216,6 +214,8 @@ slack\nsolr\nsolrCloud\nsolrs\n+spark\n+spark-rest\nstomp\nstring-template\ntelegram\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1469] Reject support for component spark
|
734,358 |
06.03.2017 13:32:45
| -3,600 |
022fcb5d6829364b29edf1fe63f1a88ae1a6424a
|
[resolves AtomIntegrationTest fails intermittently
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/atom/AtomIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/atom/AtomIntegrationTest.java",
"diff": "@@ -66,7 +66,7 @@ public class AtomIntegrationTest {\ncamelctx.start();\ntry {\n- Entry result = pollingConsumer.receive(3000).getIn().getBody(Entry.class);\n+ Entry result = pollingConsumer.receive(5000).getIn().getBody(Entry.class);\nAssert.assertEquals(FeedConstants.ENTRY_TITLE, result.getTitle());\nAssert.assertEquals(FeedConstants.ENTRY_CONTENT, result.getContent());\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1666] AtomIntegrationTest fails intermittently
|
734,358 |
06.03.2017 14:59:46
| -3,600 |
e5407481af629a973fb58bc6c9fab7a81099e501
|
[resolves Add support for component splunk
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -83,6 +83,7 @@ smpp\nsmpps\nsmtp\nsmtps\n+splunk\nspring-event\nsql\nsql-stored\n@@ -148,7 +149,6 @@ nagios\nnetty4-http\nrabbitmq\nsnmp\n-splunk\nspring-batch\nspring-integration\nspring-ldap\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-splunk.adoc",
"diff": "+### camel-splunk\n+\n+The http://camel.apache.org/splunk.html[splunk,window=_blank] component provides access to http://docs.splunk.com/Documentation/Splunk/latest[Splunk,window=_blank], via the Splunk provided client Rest API, allowing you to publish and search for events in Splunk.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -140,6 +140,8 @@ include::camel-spring.adoc[]\ninclude::camel-sjms.adoc[]\n+include::camel-splunk.adoc[]\n+\ninclude::camel-sql.adoc[]\ninclude::camel-ssh.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<module name=\"org.apache.camel.component.smpp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.snakeyaml\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.soap\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.splunk\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.spring.security\" export=\"true\" services=\"export\" optional=\"true\" >\n<imports>\n<include path=\"META-INF\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.apache.camel.component.splunk\">\n+ <include artifact=\"org.apache.camel:camel-splunk\" />\n+ <include artifact=\"org.apache.servicemix.bundles:org.apache.servicemix.bundles.splunk\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"javax.api\"/>\n+ <module name=\"org.slf4j\"/>\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.sql\">\n<include artifact=\"org.apache.camel:camel-sql\" />\n<apply-to-dependencies skip=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/skipped-modules.xml",
"new_path": "feature/etc/smartics/skipped-modules.xml",
"diff": "</module>\n<module name=\"org.apache.servicemix.bundles\" skip=\"true\">\n- <include artifact=\"org.apache.servicemix.bundles:(.*)\" />\n+ <include artifact=\"org.apache.servicemix.bundles:org.apache.servicemix.bundles.javax-cache-api\" />\n</module>\n<module name=\"org.apache.tomcat.embed\" skip=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<groupId>org.apache.camel</groupId>\n<artifactId>camel-servicenow</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-splunk</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-soap</artifactId>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<module name=\"org.apache.camel.component.smpp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.snakeyaml\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.soap\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.splunk\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.spring.security\" export=\"true\" services=\"export\" optional=\"true\" >\n<imports>\n<include path=\"META-INF\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/splunk/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.apache.camel.component.splunk\">\n+ <resources>\n+ <artifact name=\"${org.apache.camel:camel-splunk}\" />\n+ <artifact name=\"${org.apache.servicemix.bundles:org.apache.servicemix.bundles.splunk}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"org.slf4j\" />\n+ <module name=\"com.google.code.gson\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"org.apache.camel.core\" />\n+ <module name=\"org.joda.time\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/splunk/SplunkIntegrationTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2015 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.splunk;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.apache.camel.component.splunk.event.SplunkEvent;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.extension.camel.CamelAware;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class SplunkIntegrationTest {\n+\n+ @Deployment\n+ public static JavaArchive createdeployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"camel-splunk-tests\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void testSalesforceQuery() throws Exception {\n+\n+ String SPLUNK_USERNAME = System.getenv(\"SPLUNK_USERNAME\");\n+ String SPLUNK_PASSWORD = System.getenv(\"SPLUNK_PASSWORD\");\n+ Assume.assumeNotNull(SPLUNK_USERNAME, SPLUNK_PASSWORD);\n+\n+ SplunkEvent splunkEvent = new SplunkEvent();\n+ splunkEvent.addPair(\"key1\", \"value1\");\n+ splunkEvent.addPair(\"key2\", \"value2\");\n+ splunkEvent.addPair(\"key3\", \"value1\");\n+\n+ CamelContext camelctx = new DefaultCamelContext();\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:submit\")\n+ .to(\"splunk://submit?username=\" + SPLUNK_USERNAME + \"&password=\" + SPLUNK_PASSWORD + \"&sourceType=testSource&source=test\")\n+ .to(\"mock:result\");\n+ }\n+ });\n+\n+ MockEndpoint mock = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ mock.expectedMinimumMessageCount(1);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.sendBody(\"direct:submit\", splunkEvent);\n+ mock.assertIsSatisfied();\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"diff": "^com/google/protobuf\n^com/mongodb(.*)\n^com/opengamma(.*)\n+ ^com/splunk(.*)\n^com/sun/syndication(.*)\n^groovy(.*)\n^io/nats(.*)\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"diff": "@@ -368,6 +368,8 @@ com/mongodb/operation\ncom/mongodb/selector\ncom/mongodb/util\ncom/opengamma/elsql\n+com/splunk\n+com/splunk/modularinput\ncom/sun/syndication/feed\ncom/sun/syndication/feed/atom\ncom/sun/syndication/feed/module\n@@ -714,6 +716,9 @@ org/apache/camel/component/sjms/taskmanager\norg/apache/camel/component/sjms/tx\norg/apache/camel/component/smpp\norg/apache/camel/component/snakeyaml\n+org/apache/camel/component/splunk\n+org/apache/camel/component/splunk/event\n+org/apache/camel/component/splunk/support\norg/apache/camel/component/spring\norg/apache/camel/component/spring/security\norg/apache/camel/component/spring/security/config\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/apache/camel/component/smpp/main/jsmpp-2.3.2.jar\n/org/apache/camel/component/snakeyaml/main/camel-snakeyaml-2.18.2.jar\n/org/apache/camel/component/soap/main/camel-soap-2.18.2.jar\n+/org/apache/camel/component/splunk/main/camel-splunk-2.18.2.jar\n+/org/apache/camel/component/splunk/main/org.apache.servicemix.bundles.splunk-1.5.0.0_1.jar\n/org/apache/camel/component/spring/security/main/camel-spring-security-2.18.2.jar\n/org/apache/camel/component/sql/main/camel-sql-2.18.2.jar\n/org/apache/camel/component/ssh/main/camel-ssh-2.18.2.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1471] Add support for component splunk
|
734,358 |
07.03.2017 12:04:10
| -3,600 |
33103dd9ea3fe7e58a98545af0d375faeb175305
|
[resolves Add issue references to test assumptions
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/rule/ExecutableResource.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/rule/ExecutableResource.java",
"diff": "@@ -44,9 +44,7 @@ public class ExecutableResource extends ExternalResource {\n@Override\nprotected void before() throws Throwable {\n- // Don't run on platforms that we don't recognise\n- Assume.assumeFalse(EnvironmentUtils.isUnknown());\n-\n+ Assume.assumeFalse(\"Unknown environment: \" + EnvironmentUtils.getOSName(), EnvironmentUtils.isUnknown());\ndownloadExecutable();\nstartProcess();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/EnvironmentUtils.java",
"diff": "@@ -41,7 +41,7 @@ public final class EnvironmentUtils {\nprivate static final Path JAVA_HOME;\nstatic {\n- final String os = System.getProperty(\"os.name\").toLowerCase(Locale.ROOT);\n+ final String os = getOSName();\nAIX = os.equals(\"aix\");\nLINUX = os.equals(\"linux\");\nMAC = os.startsWith(\"mac\");\n@@ -62,6 +62,10 @@ public final class EnvironmentUtils {\nJAVA_HOME = Paths.get(javaHome);\n}\n+ public static String getOSName() {\n+ return System.getProperty(\"os.name\").toLowerCase(Locale.ROOT);\n+ }\n+\n// hide ctor\nprivate EnvironmentUtils() {\n}\n@@ -83,7 +87,7 @@ public final class EnvironmentUtils {\n}\npublic static boolean isUnknown() {\n- return !LINUX && !MAC && !WINDOWS;\n+ return !AIX && !LINUX && !MAC && !WINDOWS;\n}\npublic static boolean isIbmJDK() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/braintree/BraintreeIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/braintree/BraintreeIntegrationTest.java",
"diff": "@@ -104,8 +104,8 @@ public class BraintreeIntegrationTest {\nMap<String, Object> braintreeOptions = createBraintreeOptions();\n- // Do nothing if the required credentials are not present\n- Assume.assumeTrue(braintreeOptions.size() == BraintreeOption.values().length);\n+ Assume.assumeTrue(\"[#1679] Enable Braintree testing in Jenkins\",\n+ braintreeOptions.size() == BraintreeOption.values().length);\nfinal CountDownLatch latch = new CountDownLatch(1);\nfinal CamelContext camelctx = new DefaultCamelContext();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/irc/IRCIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/irc/IRCIntegrationTest.java",
"diff": "@@ -43,6 +43,9 @@ import org.wildfly.extension.camel.CamelAware;\n@RunWith(Arquillian.class)\npublic class IRCIntegrationTest {\n+ static final String IRC_HOST = System.getenv(\"IRC_HOST\");\n+ static final String IRC_CHANNEL = System.getenv(\"IRC_CHANNEL\");\n+\n@Deployment\npublic static JavaArchive createDeployment() {\nreturn ShrinkWrap.create(JavaArchive.class, \"camel-irc-tests\");\n@@ -50,17 +53,14 @@ public class IRCIntegrationTest {\n@Test\npublic void testIRCComponent() throws Exception {\n- String ircHost = System.getenv(\"IRC_HOST\");\n- String ircChannel = System.getenv(\"IRC_CHANNEL\");\n- // [#1327] Provide CI testing for camel-irc\n- Assume.assumeNotNull(ircHost, ircChannel);\n+ Assume.assumeNotNull(\"[#1678] Enable IRC testing in Jenkins\", IRC_HOST, IRC_CHANNEL);\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n- from(\"irc:kermit@\" + ircHost + \"/#\" + ircChannel)\n+ from(\"irc:kermit@\" + IRC_HOST + \"/#\" + IRC_CHANNEL)\n.to(\"mock:messages\");\n}\n});\n@@ -74,7 +74,7 @@ public class IRCIntegrationTest {\ncamelctx.start();\ntry {\nProducerTemplate template = camelctx.createProducerTemplate();\n- template.requestBody(\"irc:piggy@\" + ircHost + \"/#\" + ircChannel, \"Hello Kermit!\");\n+ template.requestBody(\"irc:piggy@\" + IRC_HOST + \"/#\" + IRC_CHANNEL, \"Hello Kermit!\");\nendpoint.assertIsSatisfied(5000);\n} finally {\ncamelctx.stop();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/linkedin/LinkedInIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/linkedin/LinkedInIntegrationTest.java",
"diff": "@@ -52,8 +52,8 @@ public class LinkedInIntegrationTest {\npublic void testSearchCompanies() throws Exception {\nMap<String, Object> linkedInOptions = createLinkedInOptions();\n- // [#1328] Provide CI testing for camel-linkedin\n- Assume.assumeTrue(linkedInOptions.size() == LinkedInOption.values().length);\n+ Assume.assumeTrue(\"[#1677] Enable LinkedIn testing in Jenkins\",\n+ linkedInOptions.size() == LinkedInOption.values().length);\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/salesforce/SalesforceIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/salesforce/SalesforceIntegrationTest.java",
"diff": "@@ -64,7 +64,9 @@ public class SalesforceIntegrationTest {\n@Test\npublic void testSalesforceQuery() throws Exception {\nMap<String, Object> salesforceOptions = createSalesforceOptions();\n- Assume.assumeTrue(salesforceOptions.size() == SalesforceOption.values().length);\n+\n+ Assume.assumeTrue(\"[#1676] Enable Salesforce testing in Jenkins\",\n+ salesforceOptions.size() == SalesforceOption.values().length);\nSalesforceLoginConfig loginConfig = new SalesforceLoginConfig();\nIntrospectionSupport.setProperties(loginConfig, salesforceOptions);\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/sap/netweaver/SAPNetweaverIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/sap/netweaver/SAPNetweaverIntegrationTest.java",
"diff": "@@ -47,7 +47,10 @@ import org.wildfly.extension.camel.CamelAware;\n@RunWith(Arquillian.class)\npublic class SAPNetweaverIntegrationTest {\n- private static final String SAP_GATEWAY_URL = \"https4://sapes4.sapdevcenter.com/sap/opu/odata/IWFND/RMTSAMPLEFLIGHT\";\n+ static final String SAP_GATEWAY_URL = \"https4://sapes4.sapdevcenter.com/sap/opu/odata/IWFND/RMTSAMPLEFLIGHT\";\n+\n+ static final String SAP_USERNAME = System.getenv(\"SAP_USERNAME\");\n+ static final String SAP_PASSWORD = System.getenv(\"SAP_PASSWORD\");\n@Deployment\npublic static JavaArchive createDeployment() {\n@@ -56,17 +59,15 @@ public class SAPNetweaverIntegrationTest {\n@Test\npublic void testSAPNetweaverEndpoint() throws Exception {\n- String username = System.getenv(\"SAP_USERNAME\");\n- String password = System.getenv(\"SAP_PASSWORD\");\n- Assume.assumeTrue(username != null && password != null);\n+ Assume.assumeTrue(\"[#1675] Enable SAP testing in Jenkins\", SAP_USERNAME != null && SAP_PASSWORD != null);\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\nfrom(\"direct:start\")\n- .toF(\"sap-netweaver:%s?username=%s&password=%s\", SAP_GATEWAY_URL, username, password);\n+ .toF(\"sap-netweaver:%s?username=%s&password=%s\", SAP_GATEWAY_URL, SAP_USERNAME, SAP_PASSWORD);\n}\n});\n@@ -77,7 +78,7 @@ public class SAPNetweaverIntegrationTest {\n// Flight data is constantly updated, so fetch a valid flight from the flight collection feed\nString sapRssFeedUri = String.format(\"rss:%s/%s?username=%s&password=%s\", SAP_GATEWAY_URL.replace(\"https4\", \"https\"),\n- \"FlightCollection\", username, password);\n+ \"FlightCollection\", SAP_USERNAME, SAP_PASSWORD);\nSyndFeed feed = consumer.receiveBody(sapRssFeedUri, SyndFeed.class);\nAssert.assertNotNull(feed);\nAssert.assertTrue(feed.getEntries().size() > 0);\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/servicenow/ServiceNowIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/servicenow/ServiceNowIntegrationTest.java",
"diff": "@@ -68,12 +68,13 @@ public class ServiceNowIntegrationTest {\n}\n@Test\n+ @SuppressWarnings(\"unchecked\")\n@Betamax(tape=\"servicenow-search-incidents\")\npublic void testSearchIncidents() throws Exception {\nMap<String, Object> serviceNowOptions = createServiceNowOptions();\n- // Do nothing if the required options are not present\n- Assume.assumeTrue(serviceNowOptions.size() == ServiceNowIntegrationTest.ServiceNowOption.values().length);\n+ Assume.assumeTrue(\"[#1674] Enable ServiceNow testing in Jenkins\",\n+ serviceNowOptions.size() == ServiceNowIntegrationTest.ServiceNowOption.values().length);\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/splunk/SplunkIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/splunk/SplunkIntegrationTest.java",
"diff": "@@ -50,7 +50,7 @@ public class SplunkIntegrationTest {\nString SPLUNK_USERNAME = System.getenv(\"SPLUNK_USERNAME\");\nString SPLUNK_PASSWORD = System.getenv(\"SPLUNK_PASSWORD\");\n- Assume.assumeNotNull(SPLUNK_USERNAME, SPLUNK_PASSWORD);\n+ Assume.assumeNotNull(\"[#1673] Enable Splunk testing in Jenkins\", SPLUNK_USERNAME, SPLUNK_PASSWORD);\nSplunkEvent splunkEvent = new SplunkEvent();\nsplunkEvent.addPair(\"key1\", \"value1\");\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/twitter/TwitterIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/twitter/TwitterIntegrationTest.java",
"diff": "@@ -63,9 +63,7 @@ public class TwitterIntegrationTest {\n}\n});\n- // Assume that the twitter credentials are available\n- // https://apps.twitter.com/app/12618845/keys\n- Assume.assumeTrue(twitter.hasUriTokens());\n+ Assume.assumeTrue(\"[#1672] Enable Twitter testing in Jenkins\", twitter.hasUriTokens());\ncamelctx.start();\ntry {\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1680] Add issue references to test assumptions
|
734,358 |
24.01.2017 15:43:38
| -3,600 |
6fb3518f62e50a966cb3c989029f951fc8d2de0c
|
[resolves Upgrade to camel-2.18.3
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"diff": "@@ -208,6 +208,7 @@ org/springframework/mail/javamail\norg/springframework/objenesis\norg/springframework/objenesis/instantiator\norg/springframework/objenesis/instantiator/android\n+org/springframework/objenesis/instantiator/annotations\norg/springframework/objenesis/instantiator/basic\norg/springframework/objenesis/instantiator/gcj\norg/springframework/objenesis/instantiator/perc\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/apache/activemq/main/activemq-pool-5.14.3.jar\n/org/apache/activemq/main/activemq-spring-5.14.3.jar\n/org/apache/camel/component/activemq/main/activemq-camel-5.14.3.jar\n-/org/apache/camel/component/atom/main/camel-atom-2.18.2.jar\n-/org/apache/camel/component/avro/main/camel-avro-2.18.2.jar\n-/org/apache/camel/component/barcode/main/camel-barcode-2.18.2.jar\n+/org/apache/camel/component/atom/main/camel-atom-2.18.3.jar\n+/org/apache/camel/component/avro/main/camel-avro-2.18.3.jar\n+/org/apache/camel/component/barcode/main/camel-barcode-2.18.3.jar\n/org/apache/camel/component/barcode/main/core-3.2.1.jar\n/org/apache/camel/component/barcode/main/javase-3.2.1.jar\n-/org/apache/camel/component/base64/main/camel-base64-2.18.2.jar\n-/org/apache/camel/component/bean/validator/main/camel-bean-validator-2.18.2.jar\n+/org/apache/camel/component/base64/main/camel-base64-2.18.3.jar\n+/org/apache/camel/component/bean/validator/main/camel-bean-validator-2.18.3.jar\n/org/apache/camel/component/beanio/main/beanio-2.1.0.jar\n-/org/apache/camel/component/beanio/main/camel-beanio-2.18.2.jar\n-/org/apache/camel/component/bindy/main/camel-bindy-2.18.2.jar\n+/org/apache/camel/component/beanio/main/camel-beanio-2.18.3.jar\n+/org/apache/camel/component/bindy/main/camel-bindy-2.18.3.jar\n/org/apache/camel/component/braintree/main/braintree-java-2.63.0.jar\n-/org/apache/camel/component/braintree/main/camel-braintree-2.18.2.jar\n-/org/apache/camel/component/cassandra/main/camel-cassandraql-2.18.2.jar\n+/org/apache/camel/component/braintree/main/camel-braintree-2.18.3.jar\n+/org/apache/camel/component/cassandra/main/camel-cassandraql-2.18.3.jar\n/org/apache/camel/component/cassandra/main/cassandra-driver-core-3.1.0.jar\n-/org/apache/camel/component/castor/main/camel-castor-2.18.2.jar\n+/org/apache/camel/component/castor/main/camel-castor-2.18.3.jar\n/org/apache/camel/component/castor/main/castor-core-1.3.3.jar\n/org/apache/camel/component/castor/main/castor-xml-1.3.3.jar\n-/org/apache/camel/component/cdi/main/camel-cdi-2.18.2.jar\n-/org/apache/camel/component/context/main/camel-context-2.18.2.jar\n-/org/apache/camel/component/crypto/main/camel-crypto-2.18.2.jar\n-/org/apache/camel/component/csv/main/camel-csv-2.18.2.jar\n-/org/apache/camel/component/cxf/main/camel-cxf-2.18.2.jar\n-/org/apache/camel/component/cxf/main/camel-cxf-transport-2.18.2.jar\n-/org/apache/camel/component/dns/main/camel-dns-2.18.2.jar\n+/org/apache/camel/component/cdi/main/camel-cdi-2.18.3.jar\n+/org/apache/camel/component/context/main/camel-context-2.18.3.jar\n+/org/apache/camel/component/crypto/main/camel-crypto-2.18.3.jar\n+/org/apache/camel/component/csv/main/camel-csv-2.18.3.jar\n+/org/apache/camel/component/cxf/main/camel-cxf-2.18.3.jar\n+/org/apache/camel/component/cxf/main/camel-cxf-transport-2.18.3.jar\n+/org/apache/camel/component/dns/main/camel-dns-2.18.3.jar\n/org/apache/camel/component/dns/main/dnsjava-2.1.7.jar\n-/org/apache/camel/component/dozer/main/camel-dozer-2.18.2.jar\n-/org/apache/camel/component/ejb/main/camel-ejb-2.18.2.jar\n-/org/apache/camel/component/elasticsearch/main/camel-elasticsearch-2.18.2.jar\n-/org/apache/camel/component/elsql/main/camel-elsql-2.18.2.jar\n+/org/apache/camel/component/dozer/main/camel-dozer-2.18.3.jar\n+/org/apache/camel/component/ejb/main/camel-ejb-2.18.3.jar\n+/org/apache/camel/component/elasticsearch/main/camel-elasticsearch-2.18.3.jar\n+/org/apache/camel/component/elsql/main/camel-elsql-2.18.3.jar\n/org/apache/camel/component/elsql/main/elsql-1.2.jar\n-/org/apache/camel/component/exec/main/camel-exec-2.18.2.jar\n-/org/apache/camel/component/flatpack/main/camel-flatpack-2.18.2.jar\n+/org/apache/camel/component/exec/main/camel-exec-2.18.3.jar\n+/org/apache/camel/component/flatpack/main/camel-flatpack-2.18.3.jar\n/org/apache/camel/component/flatpack/main/flatpack-3.4.3.jar\n-/org/apache/camel/component/freemarker/main/camel-freemarker-2.18.2.jar\n+/org/apache/camel/component/freemarker/main/camel-freemarker-2.18.3.jar\n/org/apache/camel/component/freemarker/main/freemarker-2.3.23.jar\n-/org/apache/camel/component/ftp/main/camel-ftp-2.18.2.jar\n+/org/apache/camel/component/ftp/main/camel-ftp-2.18.3.jar\n/org/apache/camel/component/git/main/JavaEWAH-0.7.9.jar\n-/org/apache/camel/component/git/main/camel-git-2.18.2.jar\n+/org/apache/camel/component/git/main/camel-git-2.18.3.jar\n/org/apache/camel/component/git/main/org.eclipse.jgit-4.5.0.201609210915-r.jar\n-/org/apache/camel/component/groovy/main/camel-groovy-2.18.2.jar\n-/org/apache/camel/component/gson/main/camel-gson-2.18.2.jar\n-/org/apache/camel/component/hl7/main/camel-hl7-2.18.2.jar\n+/org/apache/camel/component/groovy/main/camel-groovy-2.18.3.jar\n+/org/apache/camel/component/gson/main/camel-gson-2.18.3.jar\n+/org/apache/camel/component/hl7/main/camel-hl7-2.18.3.jar\n/org/apache/camel/component/hl7/main/hapi-base-2.2.jar\n/org/apache/camel/component/hl7/main/hapi-structures-v24-2.2.jar\n/org/apache/camel/component/hl7/main/hapi-structures-v25-2.2.jar\n-/org/apache/camel/component/http/common/main/camel-http-common-2.18.2.jar\n-/org/apache/camel/component/http4/main/camel-http4-2.18.2.jar\n-/org/apache/camel/component/hystrix/main/camel-hystrix-2.18.2.jar\n-/org/apache/camel/component/infinispan/main/camel-infinispan-2.18.2.jar\n-/org/apache/camel/component/irc/main/camel-irc-2.18.2.jar\n+/org/apache/camel/component/http/common/main/camel-http-common-2.18.3.jar\n+/org/apache/camel/component/http4/main/camel-http4-2.18.3.jar\n+/org/apache/camel/component/hystrix/main/camel-hystrix-2.18.3.jar\n+/org/apache/camel/component/infinispan/main/camel-infinispan-2.18.3.jar\n+/org/apache/camel/component/irc/main/camel-irc-2.18.3.jar\n/org/apache/camel/component/irc/main/irclib-1.10.jar\n-/org/apache/camel/component/jackson/main/camel-jackson-2.18.2.jar\n-/org/apache/camel/component/jacksonxml/main/camel-jacksonxml-2.18.2.jar\n-/org/apache/camel/component/jasypt/main/camel-jasypt-2.18.2.jar\n-/org/apache/camel/component/jaxb/main/camel-jaxb-2.18.2.jar\n-/org/apache/camel/component/jbpm/main/camel-jbpm-2.18.2.jar\n-/org/apache/camel/component/jcache/main/camel-jcache-2.18.2.jar\n-/org/apache/camel/component/jdbc/main/camel-jdbc-2.18.2.jar\n-/org/apache/camel/component/jgroups/main/camel-jgroups-2.18.2.jar\n-/org/apache/camel/component/jms/main/camel-jms-2.18.2.jar\n-/org/apache/camel/component/jmx/main/camel-jmx-2.18.2.jar\n-/org/apache/camel/component/jpa/main/camel-jpa-2.18.2.jar\n-/org/apache/camel/component/jsch/main/camel-jsch-2.18.2.jar\n+/org/apache/camel/component/jackson/main/camel-jackson-2.18.3.jar\n+/org/apache/camel/component/jacksonxml/main/camel-jacksonxml-2.18.3.jar\n+/org/apache/camel/component/jasypt/main/camel-jasypt-2.18.3.jar\n+/org/apache/camel/component/jaxb/main/camel-jaxb-2.18.3.jar\n+/org/apache/camel/component/jbpm/main/camel-jbpm-2.18.3.jar\n+/org/apache/camel/component/jcache/main/camel-jcache-2.18.3.jar\n+/org/apache/camel/component/jdbc/main/camel-jdbc-2.18.3.jar\n+/org/apache/camel/component/jgroups/main/camel-jgroups-2.18.3.jar\n+/org/apache/camel/component/jms/main/camel-jms-2.18.3.jar\n+/org/apache/camel/component/jmx/main/camel-jmx-2.18.3.jar\n+/org/apache/camel/component/jpa/main/camel-jpa-2.18.3.jar\n+/org/apache/camel/component/jsch/main/camel-jsch-2.18.3.jar\n/org/apache/camel/component/jsonpath/main/accessors-smart-1.1.jar\n-/org/apache/camel/component/jsonpath/main/camel-jsonpath-2.18.2.jar\n+/org/apache/camel/component/jsonpath/main/camel-jsonpath-2.18.3.jar\n/org/apache/camel/component/jsonpath/main/json-path-2.1.0.jar\n/org/apache/camel/component/jsonpath/main/json-smart-2.2.1.jar\n-/org/apache/camel/component/kafka/main/camel-kafka-2.18.2.jar\n-/org/apache/camel/component/ldap/main/camel-ldap-2.18.2.jar\n-/org/apache/camel/component/linkedin/main/camel-linkedin-2.18.2.jar\n-/org/apache/camel/component/linkedin/main/camel-linkedin-api-2.18.2.jar\n-/org/apache/camel/component/lucene/main/camel-lucene-2.18.2.jar\n-/org/apache/camel/component/mail/main/camel-mail-2.18.2.jar\n-/org/apache/camel/component/metrics/main/camel-metrics-2.18.2.jar\n+/org/apache/camel/component/kafka/main/camel-kafka-2.18.3.jar\n+/org/apache/camel/component/ldap/main/camel-ldap-2.18.3.jar\n+/org/apache/camel/component/linkedin/main/camel-linkedin-2.18.3.jar\n+/org/apache/camel/component/linkedin/main/camel-linkedin-api-2.18.3.jar\n+/org/apache/camel/component/lucene/main/camel-lucene-2.18.3.jar\n+/org/apache/camel/component/mail/main/camel-mail-2.18.3.jar\n+/org/apache/camel/component/metrics/main/camel-metrics-2.18.3.jar\n/org/apache/camel/component/metrics/main/metrics-core-3.1.2.jar\n/org/apache/camel/component/metrics/main/metrics-json-3.1.2.jar\n-/org/apache/camel/component/mina2/main/camel-mina2-2.18.2.jar\n-/org/apache/camel/component/mllp/main/camel-mllp-2.18.2.jar\n-/org/apache/camel/component/mongodb/main/camel-mongodb-2.18.2.jar\n+/org/apache/camel/component/mina2/main/camel-mina2-2.18.3.jar\n+/org/apache/camel/component/mllp/main/camel-mllp-2.18.3.jar\n+/org/apache/camel/component/mongodb/main/camel-mongodb-2.18.3.jar\n/org/apache/camel/component/mongodb/main/mongo-java-driver-3.3.0.jar\n-/org/apache/camel/component/mqtt/main/camel-mqtt-2.18.2.jar\n-/org/apache/camel/component/mvel/main/camel-mvel-2.18.2.jar\n-/org/apache/camel/component/mybatis/main/camel-mybatis-2.18.2.jar\n+/org/apache/camel/component/mqtt/main/camel-mqtt-2.18.3.jar\n+/org/apache/camel/component/mvel/main/camel-mvel-2.18.3.jar\n+/org/apache/camel/component/mybatis/main/camel-mybatis-2.18.3.jar\n/org/apache/camel/component/mybatis/main/mybatis-3.4.1.jar\n-/org/apache/camel/component/nats/main/camel-nats-2.18.2.jar\n+/org/apache/camel/component/nats/main/camel-nats-2.18.3.jar\n/org/apache/camel/component/nats/main/jnats-0.5.3.jar\n-/org/apache/camel/component/netty4/main/camel-netty4-2.18.2.jar\n-/org/apache/camel/component/ognl/main/camel-ognl-2.18.2.jar\n-/org/apache/camel/component/olingo2/main/camel-olingo2-2.18.2.jar\n-/org/apache/camel/component/olingo2/main/camel-olingo2-api-2.18.2.jar\n-/org/apache/camel/component/optaplanner/main/camel-optaplanner-2.18.2.jar\n+/org/apache/camel/component/netty4/main/camel-netty4-2.18.3.jar\n+/org/apache/camel/component/ognl/main/camel-ognl-2.18.3.jar\n+/org/apache/camel/component/olingo2/main/camel-olingo2-2.18.3.jar\n+/org/apache/camel/component/olingo2/main/camel-olingo2-api-2.18.3.jar\n+/org/apache/camel/component/optaplanner/main/camel-optaplanner-2.18.3.jar\n/org/apache/camel/component/optaplanner/main/optaplanner-core-6.4.0.Final.jar\n-/org/apache/camel/component/paho/main/camel-paho-2.18.2.jar\n+/org/apache/camel/component/paho/main/camel-paho-2.18.3.jar\n/org/apache/camel/component/paho/main/org.eclipse.paho.client.mqttv3-1.0.2.jar\n-/org/apache/camel/component/pdf/main/camel-pdf-2.18.2.jar\n-/org/apache/camel/component/protobuf/main/camel-protobuf-2.18.2.jar\n+/org/apache/camel/component/pdf/main/camel-pdf-2.18.3.jar\n+/org/apache/camel/component/protobuf/main/camel-protobuf-2.18.3.jar\n/org/apache/camel/component/protobuf/main/protobuf-java-3.1.0.jar\n-/org/apache/camel/component/quartz2/main/camel-quartz2-2.18.2.jar\n-/org/apache/camel/component/rss/main/camel-rss-2.18.2.jar\n+/org/apache/camel/component/quartz2/main/camel-quartz2-2.18.3.jar\n+/org/apache/camel/component/rss/main/camel-rss-2.18.3.jar\n/org/apache/camel/component/salesforce/main/bayeux-api-3.0.10.jar\n-/org/apache/camel/component/salesforce/main/camel-salesforce-2.18.2.jar\n+/org/apache/camel/component/salesforce/main/camel-salesforce-2.18.3.jar\n/org/apache/camel/component/salesforce/main/cometd-java-client-3.0.10.jar\n/org/apache/camel/component/salesforce/main/cometd-java-common-3.0.10.jar\n-/org/apache/camel/component/sap/netweaver/main/camel-sap-netweaver-2.18.2.jar\n-/org/apache/camel/component/saxon/main/camel-saxon-2.18.2.jar\n-/org/apache/camel/component/schematron/main/camel-schematron-2.18.2.jar\n-/org/apache/camel/component/script/main/camel-script-2.18.2.jar\n-/org/apache/camel/component/servicenow/main/camel-servicenow-2.18.2.jar\n-/org/apache/camel/component/servlet/main/camel-servlet-2.18.2.jar\n-/org/apache/camel/component/sjms/main/camel-sjms-2.18.2.jar\n-/org/apache/camel/component/smpp/main/camel-smpp-2.18.2.jar\n-/org/apache/camel/component/smpp/main/jsmpp-2.3.2.jar\n-/org/apache/camel/component/snakeyaml/main/camel-snakeyaml-2.18.2.jar\n-/org/apache/camel/component/snmp/main/camel-snmp-2.18.2.jar\n+/org/apache/camel/component/sap/netweaver/main/camel-sap-netweaver-2.18.3.jar\n+/org/apache/camel/component/saxon/main/camel-saxon-2.18.3.jar\n+/org/apache/camel/component/schematron/main/camel-schematron-2.18.3.jar\n+/org/apache/camel/component/script/main/camel-script-2.18.3.jar\n+/org/apache/camel/component/servicenow/main/camel-servicenow-2.18.3.jar\n+/org/apache/camel/component/servlet/main/camel-servlet-2.18.3.jar\n+/org/apache/camel/component/sjms/main/camel-sjms-2.18.3.jar\n+/org/apache/camel/component/smpp/main/camel-smpp-2.18.3.jar\n+/org/apache/camel/component/smpp/main/jsmpp-2.3.4.jar\n+/org/apache/camel/component/snakeyaml/main/camel-snakeyaml-2.18.3.jar\n+/org/apache/camel/component/snmp/main/camel-snmp-2.18.3.jar\n/org/apache/camel/component/snmp/main/org.apache.servicemix.bundles.snmp4j-2.3.4_1.jar\n-/org/apache/camel/component/soap/main/camel-soap-2.18.2.jar\n-/org/apache/camel/component/splunk/main/camel-splunk-2.18.2.jar\n+/org/apache/camel/component/soap/main/camel-soap-2.18.3.jar\n+/org/apache/camel/component/splunk/main/camel-splunk-2.18.3.jar\n/org/apache/camel/component/splunk/main/org.apache.servicemix.bundles.splunk-1.5.0.0_1.jar\n-/org/apache/camel/component/spring/security/main/camel-spring-security-2.18.2.jar\n-/org/apache/camel/component/sql/main/camel-sql-2.18.2.jar\n-/org/apache/camel/component/ssh/main/camel-ssh-2.18.2.jar\n-/org/apache/camel/component/stax/main/camel-stax-2.18.2.jar\n-/org/apache/camel/component/stream/main/camel-stream-2.18.2.jar\n-/org/apache/camel/component/swagger/main/camel-swagger-java-2.18.2.jar\n+/org/apache/camel/component/spring/security/main/camel-spring-security-2.18.3.jar\n+/org/apache/camel/component/sql/main/camel-sql-2.18.3.jar\n+/org/apache/camel/component/ssh/main/camel-ssh-2.18.3.jar\n+/org/apache/camel/component/stax/main/camel-stax-2.18.3.jar\n+/org/apache/camel/component/stream/main/camel-stream-2.18.3.jar\n+/org/apache/camel/component/swagger/main/camel-swagger-java-2.18.3.jar\n/org/apache/camel/component/swagger/main/swagger-annotations-1.5.12.jar\n/org/apache/camel/component/swagger/main/swagger-core-1.5.12.jar\n/org/apache/camel/component/swagger/main/swagger-jaxrs-1.5.12.jar\n/org/apache/camel/component/swagger/main/swagger-models-1.5.12.jar\n-/org/apache/camel/component/swagger/main/swagger-parser-1.0.22.jar\n-/org/apache/camel/component/syslog/main/camel-syslog-2.18.2.jar\n-/org/apache/camel/component/tagsoup/main/camel-tagsoup-2.18.2.jar\n+/org/apache/camel/component/swagger/main/swagger-parser-1.0.25.jar\n+/org/apache/camel/component/syslog/main/camel-syslog-2.18.3.jar\n+/org/apache/camel/component/tagsoup/main/camel-tagsoup-2.18.3.jar\n/org/apache/camel/component/tagsoup/main/tagsoup-1.2.1.jar\n-/org/apache/camel/component/tarfile/main/camel-tarfile-2.18.2.jar\n-/org/apache/camel/component/twitter/main/camel-twitter-2.18.2.jar\n+/org/apache/camel/component/tarfile/main/camel-tarfile-2.18.3.jar\n+/org/apache/camel/component/twitter/main/camel-twitter-2.18.3.jar\n/org/apache/camel/component/twitter/main/twitter4j-core-4.0.5.jar\n/org/apache/camel/component/twitter/main/twitter4j-stream-4.0.5.jar\n-/org/apache/camel/component/undertow/main/camel-undertow-2.18.2.jar\n-/org/apache/camel/component/velocity/main/camel-velocity-2.18.2.jar\n-/org/apache/camel/component/vertx/main/camel-vertx-2.18.2.jar\n+/org/apache/camel/component/undertow/main/camel-undertow-2.18.3.jar\n+/org/apache/camel/component/velocity/main/camel-velocity-2.18.3.jar\n+/org/apache/camel/component/vertx/main/camel-vertx-2.18.3.jar\n/org/apache/camel/component/vertx/main/vertx-core-3.3.3.jar\n-/org/apache/camel/component/weather/main/camel-weather-2.18.2.jar\n-/org/apache/camel/component/xmlbeans/main/camel-xmlbeans-2.18.2.jar\n-/org/apache/camel/component/xmlsecurity/main/camel-xmlsecurity-2.18.2.jar\n-/org/apache/camel/component/xstream/main/camel-xstream-2.18.2.jar\n-/org/apache/camel/component/zipfile/main/camel-zipfile-2.18.2.jar\n+/org/apache/camel/component/weather/main/camel-weather-2.18.3.jar\n+/org/apache/camel/component/xmlbeans/main/camel-xmlbeans-2.18.3.jar\n+/org/apache/camel/component/xmlsecurity/main/camel-xmlsecurity-2.18.3.jar\n+/org/apache/camel/component/xstream/main/camel-xstream-2.18.3.jar\n+/org/apache/camel/component/zipfile/main/camel-zipfile-2.18.3.jar\n/org/apache/camel/component/zipkin/main/brave-core-3.7.0.jar\n/org/apache/camel/component/zipkin/main/brave-spancollector-scribe-3.7.0.jar\n-/org/apache/camel/component/zipkin/main/camel-zipkin-2.18.2.jar\n+/org/apache/camel/component/zipkin/main/camel-zipkin-2.18.3.jar\n/org/apache/camel/component/zipkin/main/libthrift-0.9.0.jar\n-/org/apache/camel/component/zookeeper/main/camel-zookeeper-2.18.2.jar\n-/org/apache/camel/core/main/camel-core-2.18.2.jar\n-/org/apache/camel/core/xml/main/camel-core-xml-2.18.2.jar\n-/org/apache/camel/script/groovy/main/groovy-all-2.4.8.jar\n+/org/apache/camel/component/zookeeper/main/camel-zookeeper-2.18.3.jar\n+/org/apache/camel/core/main/camel-core-2.18.3.jar\n+/org/apache/camel/core/xml/main/camel-core-xml-2.18.3.jar\n+/org/apache/camel/script/groovy/main/groovy-all-2.4.9.jar\n/org/apache/camel/script/jruby/main/jruby-complete-1.7.18.jar\n/org/apache/camel/script/jruby/main/scriptengines-jruby-1.1.1.jar\n/org/apache/camel/script/python/main/jython-2.5.3.jar\n/org/apache/camel/script/rhino/main/js-1.7R2.jar\n/org/apache/camel/script/rhino/main/livetribe-jsr223-2.0.3.jar\n/org/apache/camel/script/rhino/main/scriptengines-javascript-1.1.1.jar\n-/org/apache/camel/spring/main/camel-spring-2.18.2.jar\n+/org/apache/camel/spring/main/camel-spring-2.18.3.jar\n/org/apache/commons/compress/main/commons-compress-1.12.jar\n/org/apache/commons/configuration/main/commons-configuration-1.8.jar\n/org/apache/commons/csv/main/commons-csv-1.4.jar\n/org/apache/commons/math3/main/commons-math3-3.4.1.jar\n/org/apache/commons/net/main/commons-net-3.3.jar\n/org/apache/commons/pool2/main/commons-pool2-2.4.2.jar\n-/org/apache/cxf/ext/main/cxf-rt-frontend-jaxrs-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-client-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-extension-providers-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-json-basic-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-security-jose-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-security-jose-jaxrs-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-security-oauth-3.1.9.jar\n-/org/apache/cxf/ext/main/cxf-rt-rs-security-oauth2-3.1.9.jar\n+/org/apache/cxf/ext/main/cxf-rt-frontend-jaxrs-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-client-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-extension-providers-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-json-basic-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-security-jose-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-security-jose-jaxrs-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-security-oauth-3.1.10.jar\n+/org/apache/cxf/ext/main/cxf-rt-rs-security-oauth2-3.1.10.jar\n/org/apache/cxf/ext/main/oauth-20100527.jar\n/org/apache/cxf/ext/main/oauth-provider-20100527.jar\n/org/apache/httpcomponents/4.5.2/httpclient-4.5.2.jar\n/org/reflections/main/reflections-0.9.10.jar\n/org/scala/library/main/scala-library-2.11.7.jar\n/org/scala/modules/main/scala-parser-combinators_2.11-1.0.4.jar\n-/org/springframework/aop/main/spring-aop-4.3.5.RELEASE.jar\n-/org/springframework/beans/main/spring-beans-4.3.5.RELEASE.jar\n-/org/springframework/context-support/main/spring-context-support-4.3.5.RELEASE.jar\n-/org/springframework/context/main/spring-context-4.3.5.RELEASE.jar\n-/org/springframework/core/main/spring-core-4.3.5.RELEASE.jar\n-/org/springframework/expression/main/spring-expression-4.3.5.RELEASE.jar\n-/org/springframework/jdbc/main/spring-jdbc-4.3.5.RELEASE.jar\n-/org/springframework/jms/main/spring-jms-4.3.5.RELEASE.jar\n-/org/springframework/orm/main/spring-orm-4.3.5.RELEASE.jar\n+/org/springframework/aop/main/spring-aop-4.3.7.RELEASE.jar\n+/org/springframework/beans/main/spring-beans-4.3.7.RELEASE.jar\n+/org/springframework/context-support/main/spring-context-support-4.3.7.RELEASE.jar\n+/org/springframework/context/main/spring-context-4.3.7.RELEASE.jar\n+/org/springframework/core/main/spring-core-4.3.7.RELEASE.jar\n+/org/springframework/expression/main/spring-expression-4.3.7.RELEASE.jar\n+/org/springframework/jdbc/main/spring-jdbc-4.3.7.RELEASE.jar\n+/org/springframework/jms/main/spring-jms-4.3.7.RELEASE.jar\n+/org/springframework/orm/main/spring-orm-4.3.7.RELEASE.jar\n/org/springframework/security/main/spring-security-config-4.0.4.RELEASE.jar\n/org/springframework/security/main/spring-security-core-4.0.4.RELEASE.jar\n-/org/springframework/tx/main/spring-tx-4.3.5.RELEASE.jar\n+/org/springframework/tx/main/spring-tx-4.3.7.RELEASE.jar\n/org/w3c/css/sac/main/sac-1.3.jar\n/org/wildfly/extension/camel/main/gravia-container-wildfly-extension-1.3.1.jar\n/org/wildfly/extras/config/main/fuse-patch-config-2.6.0.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<properties>\n<!-- Camel versions -->\n- <version.apache.camel>2.18.2</version.apache.camel>\n+ <version.apache.camel>2.18.3</version.apache.camel>\n<!-- WildFly versions -->\n<version.wildfly>10.1.0.Final</version.wildfly>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1584] Upgrade to camel-2.18.3
|
734,358 |
16.03.2017 10:46:47
| -3,600 |
c2fd782d4f80df4d42ff2eb6e61d436082dfa112
|
[resolve Add support for component spring-ldap
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -88,6 +88,7 @@ splunk\nspring-batch\nspring-event\nspring-integration\n+spring-ldap\nsql\nsql-stored\nssh\n@@ -148,7 +149,6 @@ jclouds\nkubernetes\nnagios\nrabbitmq\n-spring-ldap\nspring-redis\nspring-ws\nwebsocket\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<include path=\"META-INF\" />\n</exports>\n</module>\n+ <module name=\"org.apache.camel.component.spring.ldap\" export=\"true\" services=\"export\" optional=\"true\" >\n+ <imports>\n+ <include path=\"META-INF\" />\n+ </imports>\n+ <exports>\n+ <include path=\"META-INF\" />\n+ </exports>\n+ </module>\n<module name=\"org.apache.camel.component.spring.security\" export=\"true\" services=\"export\" optional=\"true\" >\n<imports>\n<include path=\"META-INF\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.apache.camel.component.sjms\">\n+ <include artifact=\"org.apache.camel:camel-sjms\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"javax.api\"/>\n+ <module name=\"org.slf4j\"/>\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.smpp\">\n<include artifact=\"org.apache.camel:camel-smpp\" />\n<include artifact=\"org.jsmpp:jsmpp\" />\n</exports>\n</module>\n+ <module name=\"org.apache.camel.component.splunk\">\n+ <include artifact=\"org.apache.camel:camel-splunk\" />\n+ <include artifact=\"org.apache.servicemix.bundles:org.apache.servicemix.bundles.splunk\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"javax.api\"/>\n+ <module name=\"org.slf4j\"/>\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.spring.batch\">\n<include artifact=\"org.apache.camel:camel-spring-batch\" />\n<apply-to-dependencies skip=\"true\">\n</dependencies>\n</module>\n+ <module name=\"org.apache.camel.component.spring.ldap\">\n+ <include artifact=\"org.apache.camel:camel-spring-ldap\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ <include module=\"org.springframework.skip\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"javax.api\"/>\n+ <module name=\"org.slf4j\"/>\n+ <module name=\"org.springframework.ldap\" export=\"true\" />\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.spring.security\">\n<include artifact=\"org.apache.camel:camel-spring-security\" />\n<apply-to-dependencies skip=\"true\">\n</dependencies>\n</module>\n- <module name=\"org.apache.camel.component.sjms\">\n- <include artifact=\"org.apache.camel:camel-sjms\" />\n- <apply-to-dependencies skip=\"true\">\n- <include module=\"org.apache.camel.apt\" />\n- <include module=\"org.springframework.boot\" />\n- </apply-to-dependencies>\n- <dependencies>\n- <module name=\"javax.api\"/>\n- <module name=\"org.slf4j\"/>\n- </dependencies>\n- </module>\n-\n- <module name=\"org.apache.camel.component.splunk\">\n- <include artifact=\"org.apache.camel:camel-splunk\" />\n- <include artifact=\"org.apache.servicemix.bundles:org.apache.servicemix.bundles.splunk\" />\n- <apply-to-dependencies skip=\"true\">\n- <include module=\"org.apache.camel.apt\" />\n- <include module=\"org.springframework.boot\" />\n- </apply-to-dependencies>\n- <dependencies>\n- <module name=\"javax.api\"/>\n- <module name=\"org.slf4j\"/>\n- </dependencies>\n- </module>\n-\n<module name=\"org.apache.camel.component.sql\">\n<include artifact=\"org.apache.camel:camel-sql\" />\n<apply-to-dependencies skip=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/skipped-modules.xml",
"new_path": "feature/etc/smartics/skipped-modules.xml",
"diff": "<include artifact=\"com.sun.codemodel:codemodel\" />\n</module>\n+ <module name=\"com.sun.ldapbp\" skip=\"true\">\n+ <include artifact=\"com.sun:ldapbp\" />\n+ </module>\n+\n<module name=\"com.sun.mail\" skip=\"true\">\n<include artifact=\"com.sun.mail:javax.mail\" />\n</module>\n</module>\n<module name=\"org.springframework.boot\" skip=\"true\">\n- <include artifact=\"org.springframework.boot:spring-boot\" />\n- <include artifact=\"org.springframework.boot:spring-boot-autoconfigure\" />\n- <include artifact=\"org.springframework.boot:spring-boot-configuration-processor\" />\n+ <include artifact=\":spring-boot\" />\n+ <include artifact=\":spring-boot-autoconfigure\" />\n+ <include artifact=\":spring-boot-configuration-processor\" />\n+ </module>\n+\n+ <module name=\"org.springframework.skip\" skip=\"true\">\n+ <include artifact=\":spring-ldap-ldif-batch\" />\n+ <include artifact=\":spring-ldap-ldif-core\" />\n+ <include artifact=\":spring-ldap-odm\" />\n</module>\n</modules>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/spring-modules.xml",
"new_path": "feature/etc/smartics/spring-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.springframework.ldap\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\"/>\n+ </properties>\n+ <include artifact=\":spring-ldap-core\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"com.sun.ldapbp\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"org.apache.commons.logging\" />\n+ <module name=\"sun.jdk\" />\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.springframework.messaging\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<groupId>org.apache.camel</groupId>\n<artifactId>camel-spring-integration</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-spring-ldap</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-spring-security</artifactId>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<include path=\"META-INF\" />\n</exports>\n</module>\n+ <module name=\"org.apache.camel.component.spring.ldap\" export=\"true\" services=\"export\" optional=\"true\" >\n+ <imports>\n+ <include path=\"META-INF\" />\n+ </imports>\n+ <exports>\n+ <include path=\"META-INF\" />\n+ </exports>\n+ </module>\n<module name=\"org.apache.camel.component.spring.security\" export=\"true\" services=\"export\" optional=\"true\" >\n<imports>\n<include path=\"META-INF\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/spring/ldap/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.apache.camel.component.spring.ldap\">\n+ <resources>\n+ <artifact name=\"${org.apache.camel:camel-spring-ldap}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"org.slf4j\" />\n+ <module name=\"org.springframework.ldap\" export=\"true\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"org.apache.camel.core\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/springframework/ldap/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.springframework.ldap\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\" />\n+ </properties>\n+ <resources>\n+ <artifact name=\"${org.springframework.ldap:spring-ldap-core}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"org.apache.commons.logging\" />\n+ <module name=\"sun.jdk\" />\n+ <module name=\"org.slf4j\" />\n+ <module name=\"org.springframework.beans\" />\n+ <module name=\"org.springframework.core\" />\n+ <module name=\"org.springframework.tx\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "RENAME",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/LDAPIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/LdapIntegrationTest.java",
"diff": "*/\npackage org.wildfly.camel.test.ldap;\n-import java.io.BufferedReader;\nimport java.io.File;\n-import java.io.FileReader;\nimport java.io.FileWriter;\n-import java.io.IOException;\nimport java.io.PrintWriter;\nimport java.net.InetAddress;\nimport java.nio.file.Path;\nimport java.nio.file.Paths;\nimport java.util.Collection;\n+import java.util.HashMap;\nimport java.util.Hashtable;\n+import java.util.List;\n+import java.util.Map;\nimport javax.naming.Context;\n+import javax.naming.directory.BasicAttributes;\nimport javax.naming.directory.SearchResult;\nimport javax.naming.ldap.InitialLdapContext;\nimport javax.naming.ldap.LdapContext;\nimport org.apache.camel.CamelContext;\n-import org.apache.camel.Endpoint;\n-import org.apache.camel.Exchange;\n+import org.apache.camel.ProducerTemplate;\nimport org.apache.camel.builder.RouteBuilder;\nimport org.apache.camel.impl.DefaultCamelContext;\nimport org.apache.camel.impl.SimpleRegistry;\n+import org.apache.camel.spring.SpringCamelContext;\nimport org.apache.directory.api.ldap.codec.api.LdapApiService;\nimport org.apache.directory.api.ldap.codec.standalone.StandaloneLdapApiService;\nimport org.apache.directory.api.ldap.util.JndiUtils;\n@@ -50,6 +51,7 @@ import org.apache.directory.server.constants.ServerDNConstants;\nimport org.apache.directory.server.core.annotations.ApplyLdifFiles;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.arquillian.test.api.ArquillianResource;\nimport org.jboss.as.arquillian.api.ServerSetup;\nimport org.jboss.as.arquillian.api.ServerSetupTask;\nimport org.jboss.as.arquillian.container.ManagementClient;\n@@ -57,26 +59,29 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.WebArchive;\nimport org.jboss.shrinkwrap.resolver.api.maven.Maven;\nimport org.junit.Assert;\n-import org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.ldap.DirectoryServiceBuilder.SetupResult;\nimport org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.CamelContextRegistry;\n@CamelAware\n@RunWith(Arquillian.class)\n-@ServerSetup({ LDAPIntegrationTest.LDAPServerSetupTask.class })\n-public class LDAPIntegrationTest {\n+@ServerSetup({ LdapIntegrationTest.LdapServerSetupTask.class })\n+public class LdapIntegrationTest {\n+\n+ @ArquillianResource\n+ CamelContextRegistry contextRegistry;\n@CreateLdapServer(transports = { @CreateTransport(protocol = \"LDAP\") })\n@ApplyLdifFiles(\"ldap/LdapRouteTest.ldif\")\n- static class LDAPServerSetupTask implements ServerSetupTask {\n+ static class LdapServerSetupTask implements ServerSetupTask {\nprivate SetupResult setupResult;\n@Override\npublic void setup(final ManagementClient managementClient, String containerId) throws Exception {\n- setupResult = DirectoryServiceBuilder.setupDirectoryService(LDAPServerSetupTask.class);\n+ setupResult = DirectoryServiceBuilder.setupDirectoryService(LdapServerSetupTask.class);\nint port = setupResult.getLdapServer().getPort();\nPath filePath = Paths.get(System.getProperty(\"jboss.home\"), \"standalone\", \"data\", \"ldap-port\");\ntry (PrintWriter fw = new PrintWriter(new FileWriter(filePath.toFile()))) {\n@@ -102,23 +107,17 @@ public class LDAPIntegrationTest {\n.withTransitivity().asFile();\nfinal WebArchive archive = ShrinkWrap.create(WebArchive.class, \"camel-ldap-tests.war\");\n+ archive.addAsResource(\"spring/ldap/producer-camel-context.xml\");\n+ archive.addClasses(SpringLdapContextSource.class);\narchive.addAsLibraries(libs);\nreturn archive;\n}\n- int ldapPort;\n-\n- @Before\n- public void before() throws IOException {\n- File ldapPortFile = new File (System.getProperty(\"jboss.server.data.dir\"), \"ldap-port\");\n- try (BufferedReader fw = new BufferedReader(new FileReader(ldapPortFile))) {\n- ldapPort = Integer.parseInt(fw.readLine());\n- }\n- }\n-\n@Test\n+ @SuppressWarnings(\"unchecked\")\npublic void testLdapRouteStandard() throws Exception {\n+ int ldapPort = SpringLdapContextSource.getLdapPort();\nSimpleRegistry reg = new SimpleRegistry();\nreg.put(\"localhost:\" + ldapPort, getWiredContext(ldapPort));\n@@ -132,35 +131,20 @@ public class LDAPIntegrationTest {\ncamelctx.start();\ntry {\n-\n- Endpoint endpoint = camelctx.getEndpoint(\"direct:start\");\n- Exchange exchange = endpoint.createExchange();\n- // then we set the LDAP filter on the in body\n- exchange.getIn().setBody(\"(!(ou=test1))\");\n-\n- // now we send the exchange to the endpoint, and receives the response from Camel\n- Exchange out = camelctx.createProducerTemplate().send(endpoint, exchange);\n- Collection<SearchResult> searchResults = defaultLdapModuleOutAssertions(out);\n-\n- Assert.assertFalse(contains(\"uid=test1,ou=test,ou=system\", searchResults));\n- Assert.assertTrue(contains(\"uid=test2,ou=test,ou=system\", searchResults));\n- Assert.assertTrue(contains(\"uid=testNoOU,ou=test,ou=system\", searchResults));\n- Assert.assertTrue(contains(\"uid=tcruise,ou=actors,ou=system\", searchResults));\n+ ProducerTemplate template = camelctx.createProducerTemplate();\n+ Collection<SearchResult> searchResults = template.requestBody(\"direct:start\", \"(!(ou=test1))\", Collection.class);\n+ Assert.assertNotNull(searchResults);\n+\n+ Assert.assertFalse(containsResult(searchResults, \"uid=test1,ou=test,ou=system\"));\n+ Assert.assertTrue(containsResult(searchResults, \"uid=test2,ou=test,ou=system\"));\n+ Assert.assertTrue(containsResult(searchResults, \"uid=testNoOU,ou=test,ou=system\"));\n+ Assert.assertTrue(containsResult(searchResults, \"uid=tcruise,ou=actors,ou=system\"));\n} finally {\ncamelctx.stop();\n}\n}\n- @SuppressWarnings(\"unchecked\")\n- private Collection<SearchResult> defaultLdapModuleOutAssertions(Exchange out) {\n- Assert.assertNotNull(out);\n- Assert.assertNotNull(out.getOut());\n- Collection<SearchResult> data = out.getOut().getBody(Collection.class);\n- Assert.assertNotNull(\"out body could not be converted to a Collection - was: \" + out.getOut().getBody(), data);\n- return data;\n- }\n-\n- private boolean contains(String dn, Collection<SearchResult> results) {\n+ private boolean containsResult(Collection<SearchResult> results, String dn) {\nfor (SearchResult result : results) {\nif (result.getNameInNamespace().equals(dn)) {\nreturn true;\n@@ -169,13 +153,29 @@ public class LDAPIntegrationTest {\nreturn false;\n}\n+ @Test\n+ @SuppressWarnings(\"unchecked\")\n+ public void testCamelSpringLdapRoute() throws Exception {\n+\n+ SpringCamelContext camelctx = (SpringCamelContext) contextRegistry.getCamelContext(\"camel\");\n+ Assert.assertNotNull(camelctx);\n+\n+ Map<String, String> map = new HashMap<>();\n+ map.put(\"filter\", \"(!(ou=test1))\");\n+ map.put(\"dn\", \"ou=system\");\n+\n+ ProducerTemplate template = camelctx.createProducerTemplate();\n+ List<BasicAttributes> searchResults = template.requestBody(\"direct:start\", map, List.class);\n+ Assert.assertNotNull(searchResults);\n+ Assert.assertTrue(searchResults.size() > 0);\n+ }\n+\nprivate LdapContext getWiredContext(int port) throws Exception {\nHashtable<String, String> env = new Hashtable<String, String>();\nenv.put(Context.INITIAL_CONTEXT_FACTORY, \"com.sun.jndi.ldap.LdapCtxFactory\");\nenv.put(Context.PROVIDER_URL, \"ldap://\" + InetAddress.getLocalHost().getHostName() + \":\" + port);\nenv.put(Context.SECURITY_PRINCIPAL, ServerDNConstants.ADMIN_SYSTEM_DN);\nenv.put(Context.SECURITY_CREDENTIALS, \"secret\");\n- env.put(Context.SECURITY_AUTHENTICATION, \"simple\");\nLdapApiService ldapApiService = new StandaloneLdapApiService();\nreturn new InitialLdapContext(env, JndiUtils.toJndiControls(ldapApiService));\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/SpringLdapContextSource.java",
"diff": "+/*\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing,\n+ * software distributed under the License is distributed on an\n+ * \"AS IS\" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY\n+ * KIND, either express or implied. See the License for the\n+ * specific language governing permissions and limitations\n+ * under the License.\n+ */\n+package org.wildfly.camel.test.ldap;\n+\n+import java.io.BufferedReader;\n+import java.io.File;\n+import java.io.FileReader;\n+import java.net.InetAddress;\n+import java.net.UnknownHostException;\n+\n+import org.springframework.ldap.core.support.LdapContextSource;\n+\n+public class SpringLdapContextSource extends LdapContextSource {\n+\n+ public SpringLdapContextSource() {\n+ try {\n+ setUrl(\"ldap://\" + InetAddress.getLocalHost().getHostName() + \":\" + getLdapPort());\n+ } catch (UnknownHostException ex) {\n+ throw new IllegalStateException(ex);\n+ }\n+ }\n+\n+ static int getLdapPort() {\n+ try {\n+ File ldapPortFile = new File (System.getProperty(\"jboss.server.data.dir\"), \"ldap-port\");\n+ try (BufferedReader fw = new BufferedReader(new FileReader(ldapPortFile))) {\n+ return Integer.parseInt(fw.readLine());\n+ }\n+ } catch (Exception ex) {\n+ throw new IllegalStateException(ex);\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"diff": "@@ -748,6 +748,7 @@ org/apache/camel/component/spring/integration/adapter/config\norg/apache/camel/component/spring/integration/converter\norg/apache/camel/component/spring/security\norg/apache/camel/component/spring/security/config\n+org/apache/camel/component/springldap\norg/apache/camel/component/sql\norg/apache/camel/component/sql/stored\norg/apache/camel/component/sql/stored/template\n@@ -2130,6 +2131,33 @@ org/springframework/integration/transaction\norg/springframework/integration/transformer\norg/springframework/integration/transformer/support\norg/springframework/integration/util\n+org/springframework/ldap\n+org/springframework/ldap/authentication\n+org/springframework/ldap/config\n+org/springframework/ldap/control\n+org/springframework/ldap/core\n+org/springframework/ldap/core/support\n+org/springframework/ldap/filter\n+org/springframework/ldap/odm\n+org/springframework/ldap/odm/annotations\n+org/springframework/ldap/odm/core\n+org/springframework/ldap/odm/core/impl\n+org/springframework/ldap/odm/typeconversion\n+org/springframework/ldap/odm/typeconversion/impl\n+org/springframework/ldap/odm/typeconversion/impl/converters\n+org/springframework/ldap/pool\n+org/springframework/ldap/pool/factory\n+org/springframework/ldap/pool/validation\n+org/springframework/ldap/query\n+org/springframework/ldap/repository\n+org/springframework/ldap/repository/config\n+org/springframework/ldap/repository/query\n+org/springframework/ldap/repository/support\n+org/springframework/ldap/support\n+org/springframework/ldap/transaction\n+org/springframework/ldap/transaction/compensating\n+org/springframework/ldap/transaction/compensating/manager\n+org/springframework/ldap/transaction/compensating/support\norg/springframework/orm/jpa\norg/springframework/security\norg/springframework/security/access\n@@ -2137,6 +2165,9 @@ org/springframework/security/authentication\norg/springframework/security/core\norg/springframework/security/core/authority\norg/springframework/security/core/userdetails\n+org/springframework/transaction\n+org/springframework/transaction/compensating\n+org/springframework/transaction/compensating/support\norg/xbill\norg/xbill/DNS\norg/xmlsoap\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/main/resources/spring/ldap/producer-camel-context.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!--\n+ Licensed to the Apache Software Foundation (ASF) under one or more\n+ contributor license agreements. See the NOTICE file distributed with\n+ this work for additional information regarding copyright ownership.\n+ The ASF licenses this file to You under the Apache License, Version 2.0\n+ (the \"License\"); you may not use this file except in compliance with\n+ the License. You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+-->\n+<spring:beans xmlns=\"http://camel.apache.org/schema/spring\"\n+ xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xmlns:spring=\"http://www.springframework.org/schema/beans\"\n+ xsi:schemaLocation=\"\n+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd\n+ http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd\">\n+\n+ <spring:bean id=\"ldapTemplate\" class=\"org.springframework.ldap.core.LdapTemplate\">\n+ <spring:constructor-arg ref=\"ldapContextSource\" />\n+ </spring:bean>\n+\n+ <spring:bean id=\"ldapContextSource\" class=\"org.wildfly.camel.test.ldap.SpringLdapContextSource\">\n+ <spring:property name=\"contextFactory\" value=\"com.sun.jndi.ldap.LdapCtxFactory\" />\n+ <!-- spring:property name=\"url\" value=\"ldap://localhost:???\" / -->\n+ <spring:property name=\"userDn\" value=\"uid=admin,ou=system\" />\n+ <spring:property name=\"password\" value=\"secret\" />\n+ </spring:bean>\n+\n+ <camelContext id=\"camel\" xmlns=\"http://camel.apache.org/schema/spring\">\n+ <route>\n+ <from uri=\"direct:start\"/>\n+ <to uri=\"spring-ldap:ldapTemplate?operation=search\"/>\n+ </route>\n+ </camelContext>\n+\n+</spring:beans>\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/apache/camel/component/splunk/main/org.apache.servicemix.bundles.splunk-1.5.0.0_1.jar\n/org/apache/camel/component/spring/batch/main/camel-spring-batch-2.18.3.jar\n/org/apache/camel/component/spring/integration/main/camel-spring-integration-2.18.3.jar\n+/org/apache/camel/component/spring/ldap/main/camel-spring-ldap-2.18.3.jar\n/org/apache/camel/component/spring/security/main/camel-spring-security-2.18.3.jar\n/org/apache/camel/component/sql/main/camel-sql-2.18.3.jar\n/org/apache/camel/component/ssh/main/camel-ssh-2.18.3.jar\n/org/springframework/integration/main/spring-integration-core-4.3.7.RELEASE.jar\n/org/springframework/jdbc/main/spring-jdbc-4.3.7.RELEASE.jar\n/org/springframework/jms/main/spring-jms-4.3.7.RELEASE.jar\n+/org/springframework/ldap/main/spring-ldap-core-2.0.4.RELEASE.jar\n/org/springframework/messaging/main/spring-messaging-4.3.7.RELEASE.jar\n/org/springframework/orm/main/spring-orm-4.3.7.RELEASE.jar\n/org/springframework/retry/main/spring-retry-1.1.3.RELEASE.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolve #1474] Add support for component spring-ldap
|
734,358 |
17.03.2017 15:11:44
| -3,600 |
2cc9d81098f4215216a180685c2d8fcc11b57380
|
[resolves Reject support for component spring-ws
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -150,7 +150,6 @@ jclouds\nkubernetes\nnagios\nrabbitmq\n-spring-ws\nwebsocket\n[undecided]\n@@ -216,6 +215,7 @@ solrCloud\nsolrs\nspark\nspark-rest\n+spring-ws\nstomp\nstring-template\ntelegram\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1476] Reject support for component spring-ws
|
734,358 |
17.03.2017 15:24:39
| -3,600 |
a43028c73860713dc9f4cbf91591dba7c3283685
|
[resolves Reject support for component atmosphere-websocket
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -115,7 +115,6 @@ ahc\nahc-ws\nahc-wss\namqp\n-atmosphere-websocket\naws-cw\naws-ddb\naws-ddbstream\n@@ -159,6 +158,7 @@ http4s\napns\nasterisk\natmos\n+atmosphere-websocket\ncache\nchronicle-engine\nchunk\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1406] Reject support for component atmosphere-websocket
|
734,358 |
17.03.2017 18:46:22
| -3,600 |
daf528cf199782116c2eac3a91aa48ed00cf0b81
|
[resolves NPE thrown from ZookeeperConsumerIntegrationTest
|
[
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/AvailablePortFinder.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/utils/AvailablePortFinder.java",
"diff": "@@ -88,7 +88,7 @@ public final class AvailablePortFinder {\nreturn alreadyUsed.add(port);\n}\n- public static Path storePortInfo(String filename, int port) {\n+ public static Path storeServerData(String filename, Object port) {\nString jbossHome = System.getProperty(\"jboss.home\");\nIllegalStateAssertion.assertNotNull(jbossHome, \"Property 'jboss.home' not set\");\nIllegalStateAssertion.assertTrue(new File(jbossHome).isDirectory(), \"Not a directory: \" + jbossHome);\n@@ -101,14 +101,14 @@ public final class AvailablePortFinder {\nreturn filePath;\n}\n- public static int readPortInfo(String filename) {\n+ public static String readServerData(String filename) {\nString dataDir = System.getProperty(\"jboss.server.data.dir\");\nIllegalStateAssertion.assertNotNull(dataDir, \"Property 'jboss.server.data.dir' not set\");\nIllegalStateAssertion.assertTrue(new File(dataDir).isDirectory(), \"Not a directory: \" + dataDir);\nPath filePath = Paths.get(dataDir, filename);\ntry {\ntry (BufferedReader fw = new BufferedReader(new FileReader(filePath.toFile()))) {\n- return Integer.parseInt(fw.readLine());\n+ return fw.readLine().trim();\n}\n} catch (Exception ex) {\nthrow new IllegalStateException(ex);\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/zookeeper/ZookeeperConsumerIntegrationTest.java",
"new_path": "itests/standalone/basic/src/main/java/org/wildfly/camel/test/zookeeper/ZookeeperConsumerIntegrationTest.java",
"diff": "@@ -29,11 +29,11 @@ import org.apache.camel.component.mock.MockEndpoint;\nimport org.apache.camel.impl.DefaultCamelContext;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.as.arquillian.api.ServerSetup;\n+import org.jboss.as.arquillian.api.ServerSetupTask;\n+import org.jboss.as.arquillian.container.ManagementClient;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\n-import org.junit.After;\n-import org.junit.Before;\n-import org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.common.utils.AvailablePortFinder;\n@@ -42,54 +42,62 @@ import org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@RunWith(Arquillian.class)\n+@ServerSetup({ ZookeeperConsumerIntegrationTest.EmbeddedZookeeperSetupTask.class })\npublic class ZookeeperConsumerIntegrationTest {\n- static EmbeddedZookeeper server;\n- @Deployment\n- public static JavaArchive deployment() {\n- final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"zookeeper-integration-tests\");\n- archive.addClasses(EmbeddedZookeeper.class, AvailablePortFinder.class);\n- return archive;\n- }\n+ static class EmbeddedZookeeperSetupTask implements ServerSetupTask {\n+\n+ EmbeddedZookeeper server;\n- @Before\n- public void before() throws Exception {\n- server = new EmbeddedZookeeper().startup(1, TimeUnit.SECONDS);\n+ @Override\n+ public void setup(final ManagementClient managementClient, String containerId) throws Exception {\n+ server = new EmbeddedZookeeper().startup(10, TimeUnit.SECONDS);\n+ AvailablePortFinder.storeServerData(\"zkcon\", server.getConnection());\n}\n- @After\n- public void after() throws Exception {\n+ @Override\n+ public void tearDown(final ManagementClient managementClient, String containerId) throws Exception {\nif (server != null) {\nserver.shutdown();\n}\n}\n+ }\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"zookeeper-integration-tests\");\n+ archive.addClasses(AvailablePortFinder.class);\n+ return archive;\n+ }\n@Test\n- @Ignore(\"[#1506] NullPointerException thrown from ZookeeperConsumerIntegrationTest\")\npublic void testZookeeperConsumer() throws Exception {\n+ String zkcon = AvailablePortFinder.readServerData(\"zkcon\");\n+\nCamelContext camelctx = new DefaultCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n- from(\"zookeeper://\" + server.getConnection() + \"/somenode\")\n+ from(\"direct:start\")\n+ .to(\"zookeeper://\" + zkcon + \"/somenode\")\n.to(\"mock:end\");\n}\n});\n- camelctx.start();\n- try {\nMockEndpoint mockEndpoint = camelctx.getEndpoint(\"mock:end\", MockEndpoint.class);\n- mockEndpoint.expectedMessageCount(1);\nmockEndpoint.expectedBodiesReceived(\"Kermit\");\n+ mockEndpoint.expectedMessageCount(1);\n+ camelctx.start();\n+ try {\n// Write payload to znode\nProducerTemplate producer = camelctx.createProducerTemplate();\n- producer.sendBody(\"zookeeper://\" + server.getConnection() + \"/somenode?create=true\", \"Kermit\");\n+ producer.sendBody(\"direct:start\", \"Kermit\");\n// Read back from the znode\n- mockEndpoint.assertIsSatisfied(10000);\n+ mockEndpoint.assertIsSatisfied(5000);\n} finally {\ncamelctx.stop();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/LdapIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/LdapIntegrationTest.java",
"diff": "@@ -80,7 +80,7 @@ public class LdapIntegrationTest {\npublic void setup(final ManagementClient managementClient, String containerId) throws Exception {\nsetupResult = DirectoryServiceBuilder.setupDirectoryService(LdapServerSetupTask.class);\nint port = setupResult.getLdapServer().getPort();\n- AvailablePortFinder.storePortInfo(\"ldap-port\", port);\n+ AvailablePortFinder.storeServerData(\"ldap-port\", port);\n}\n@Override\n@@ -111,7 +111,7 @@ public class LdapIntegrationTest {\n@SuppressWarnings(\"unchecked\")\npublic void testLdapRouteStandard() throws Exception {\n- int ldapPort = AvailablePortFinder.readPortInfo(\"ldap-port\");\n+ int ldapPort = Integer.parseInt(AvailablePortFinder.readServerData(\"ldap-port\"));\nSimpleRegistry reg = new SimpleRegistry();\nreg.put(\"localhost:\" + ldapPort, getWiredContext(ldapPort));\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/SpringLdapContextSource.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/ldap/SpringLdapContextSource.java",
"diff": "@@ -28,7 +28,7 @@ public class SpringLdapContextSource extends LdapContextSource {\npublic SpringLdapContextSource() {\ntry {\n- int port = AvailablePortFinder.readPortInfo(\"ldap-port\");\n+ int port = Integer.parseInt(AvailablePortFinder.readServerData(\"ldap-port\"));\nsetUrl(\"ldap://\" + InetAddress.getLocalHost().getHostName() + \":\" + port);\n} catch (UnknownHostException ex) {\nthrow new IllegalStateException(ex);\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/spring/redis/SpringRedisIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/spring/redis/SpringRedisIntegrationTest.java",
"diff": "@@ -63,7 +63,7 @@ public class SpringRedisIntegrationTest {\n@Override\npublic void setup(final ManagementClient managementClient, String containerId) throws Exception {\nint port = AvailablePortFinder.getNextAvailable(6379);\n- AvailablePortFinder.storePortInfo(\"redis-port\", port);\n+ AvailablePortFinder.storeServerData(\"redis-port\", port);\nredisServer = new RedisServer(port);\nredisServer.start();\n}\n@@ -102,9 +102,9 @@ public class SpringRedisIntegrationTest {\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n- int redisPort = AvailablePortFinder.readPortInfo(\"redis-port\");\n+ int port = Integer.parseInt(AvailablePortFinder.readServerData(\"redis-port\"));\nfrom(\"direct:start\")\n- .to(\"spring-redis://localhost:\" + redisPort + \"?redisTemplate=#redisTemplate\");\n+ .to(\"spring-redis://localhost:\" + port + \"?redisTemplate=#redisTemplate\");\n}\n});\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1506] NPE thrown from ZookeeperConsumerIntegrationTest
|
734,358 |
20.03.2017 11:08:22
| -3,600 |
d84c752cde516ef7edd9959794cb997e1bb3831d
|
Ignore cannot start Redis server on AIX/Windows
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/spring/redis/SpringRedisIntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/spring/redis/SpringRedisIntegrationTest.java",
"diff": "@@ -36,11 +36,13 @@ import org.jboss.gravia.runtime.ServiceLocator;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\n+import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.springframework.data.redis.connection.jedis.JedisConnectionFactory;\nimport org.springframework.data.redis.core.RedisTemplate;\nimport org.wildfly.camel.test.common.utils.AvailablePortFinder;\n+import org.wildfly.camel.test.common.utils.EnvironmentUtils;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.CamelContextFactory;\nimport org.wildfly.extension.camel.CamelContextRegistry;\n@@ -62,6 +64,7 @@ public class SpringRedisIntegrationTest {\n@Override\npublic void setup(final ManagementClient managementClient, String containerId) throws Exception {\n+ Assume.assumeFalse(\"[#1701] Cannot start Redis server on AIX/Windows\", EnvironmentUtils.isAIX() || EnvironmentUtils.isWindows());\nint port = AvailablePortFinder.getNextAvailable(6379);\nAvailablePortFinder.storeServerData(\"redis-port\", port);\nredisServer = new RedisServer(port);\n@@ -79,7 +82,7 @@ public class SpringRedisIntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"camel-redis-tests\");\n- archive.addClasses(AvailablePortFinder.class);\n+ archive.addClasses(AvailablePortFinder.class, EnvironmentUtils.class);\nreturn archive;\n}\n@@ -87,6 +90,8 @@ public class SpringRedisIntegrationTest {\n@SuppressWarnings(\"rawtypes\")\npublic void testRedisRoute() throws Exception {\n+ Assume.assumeFalse(\"[#1701] Cannot start Redis server on AIX/Windows\", EnvironmentUtils.isAIX() || EnvironmentUtils.isWindows());\n+\nJedisConnectionFactory connectionFactory = new JedisConnectionFactory();\nconnectionFactory.afterPropertiesSet();\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[#1701] Ignore cannot start Redis server on AIX/Windows
|
734,358 |
21.03.2017 10:04:12
| -3,600 |
bbb716392078a3930efbb011586c39efc5d66f56
|
[resolves Upgrade to OpenShift 3.4
|
[
{
"change_type": "DELETE",
"old_path": "Vagrantfile",
"new_path": null,
"diff": "-# -*- mode: ruby -*-\n-# vi: set ft=ruby :\n-\n-# All Vagrant configuration is done below. The \"2\" in Vagrant.configure\n-# configures the configuration version (we support older styles for\n-# backwards compatibility). Please don't change it unless you know what\n-# you're doing.\n-Vagrant.configure(2) do |config|\n- # The most common configuration options are documented and commented below.\n- # For a complete reference, please see the online documentation at\n- # https://docs.vagrantup.com.\n-\n- # Every Vagrant development environment requires a box. You can search for\n- # boxes at https://atlas.hashicorp.com/search.\n- config.vm.box = \"openshift/origin-all-in-one\"\n-\n- # Disable automatic box update checking. If you disable this, then\n- # boxes will only be checked for updates when the user runs\n- # `vagrant box outdated`. This is not recommended.\n- # config.vm.box_check_update = false\n-\n- # Create a forwarded port mapping which allows access to a specific port\n- # within the machine from a port on the host machine. In the example below,\n- # accessing \"localhost:8080\" will access port 80 on the guest machine.\n- # config.vm.network \"forwarded_port\", guest: 80, host: 8080\n- config.vm.network \"forwarded_port\", guest: 8080, host: 8080\n- config.vm.network \"forwarded_port\", guest: 8443, host: 8443\n- config.vm.network \"forwarded_port\", guest: 2375, host: 2375\n-\n- # Create a private network, which allows host-only access to the machine\n- # using a specific IP.\n- # config.vm.network \"private_network\", ip: \"192.168.33.10\"\n-\n- # Create a public network, which generally matched to bridged network.\n- # Bridged networks make the machine appear as another physical device on\n- # your network.\n- # config.vm.network \"public_network\"\n-\n- # Share an additional folder to the guest VM. The first argument is\n- # the path on the host to the actual folder. The second argument is\n- # the path on the guest to mount the folder. And the optional third\n- # argument is a set of non-required options.\n- # config.vm.synced_folder \"../data\", \"/vagrant_data\"\n-\n- # Provider-specific configuration so you can fine-tune various\n- # backing providers for Vagrant. These expose provider-specific options.\n- # Example for VirtualBox:\n- #\n- # config.vm.provider \"virtualbox\" do |vb|\n- # # Display the VirtualBox GUI when booting the machine\n- # vb.gui = true\n- #\n- # # Customize the amount of memory on the VM:\n- # vb.memory = \"1024\"\n- # end\n- #\n- # View the documentation for the provider you are using for more\n- # information on available options.\n-\n- # Define a Vagrant Push strategy for pushing to Atlas. Other push strategies\n- # such as FTP and Heroku are also available. See the documentation at\n- # https://docs.vagrantup.com/v2/push/atlas.html for more information.\n- # config.push.define \"atlas\" do |push|\n- # push.app = \"YOUR_ATLAS_USERNAME/YOUR_APPLICATION_NAME\"\n- # end\n-\n- # Enable provisioning with a shell script. Additional provisioners such as\n- # Puppet, Chef, Ansible, Salt, and Docker are also available. Please see the\n- # documentation for more information about their specific syntax and use.\n- # config.vm.provision \"shell\", inline: <<-SHELL\n- # sudo apt-get update\n- # sudo apt-get install -y apache2\n- # SHELL\n-\n-docker_config = <<EOF\n- if ! grep 2375 /etc/sysconfig/docker > /dev/null || ! grep docker.sock /etc/sysconfig/docker > /dev/null; then\n- echo \"Modifying /etc/sysconfig/docker\"\n- sed -i \"s/^OPTIONS.*/OPTIONS=\\\\'--selinux-enabled --storage-opt dm.loopdatasize=30G -H tcp:\\\\/\\\\/0.0.0.0:2375 -H unix:\\\\/\\\\/\\\\/var\\\\/run\\\\/docker.sock\\\\'/g\" /etc/sysconfig/docker\n- echo \"Restarting docker\"\n- systemctl restart docker\n- fi\n-EOF\n-\n- config.vm.provision :shell, :privileged => true, :inline => docker_config\n-\n- config.vm.provider \"virtualbox\" do |vb|\n- vb.memory = \"4096\"\n- vb.cpus = 2\n- end\n-\n-end\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/cloud/openshift-local.adoc",
"new_path": "docs/guide/cloud/openshift-local.adoc",
"diff": "### OpenShift Local\nHere we follow the instructions on https://www.openshift.org[Try Origin,window=_blank].\n-We use the https://www.openshift.org/vm[all-in-one VM,window=_blank] approach through a Vagrant VirtualBox VM.\n+We use the https://www.openshift.org/vm[All-In-One VM,window=_blank] approach through https://www.openshift.org/minishift[Minishift,window=_blank] on VirtualBox VM.\n-After having installed Vagrant and VirtualBox, we run:\n+After having installed Minishift and VirtualBox, we run:\n[source,options=\"nowrap\"]\n----\n-$ vagrant init openshift/origin-all-in-one\n-$ vagrant up --provider=virtualbox\n+$ minishift start --vm-driver=virtualbox --memory 12048 --cpus 3\n...\n-Successfully started and provisioned VM with 2 cores and 5 G of memory.\n-To modify the number of cores and/or available memory modify your local Vagrantfile\n-----\n-\n-We can now access the OpenShift console on: https://10.2.2.2:8443/console[,window=_blank]\n-\n-Configured users are:\n+ OpenShift server started.\n+ The server is accessible via web console at:\n+ https://192.168.99.100:8443\n- admin/admin\n- user/user\n-\n-This should now also allow us to ssh into the VM\n-\n-[source,options=\"nowrap\"]\n-$ vagrant ssh\n-Last login: Mon Feb 8 09:06:26 2016 from 10.0.2.2\n+ You are logged in as:\n+ User: developer\n+ Password: developer\n-and use the OpenShift command line client.\n+ To login as administrator:\n+ oc login -u system:admin\n+----\n==== Client Tools\n-The client tools are available https://10.2.2.2:8443/console/command-line[from the console,window=_blank].\n-\n-==== Docker access\n-\n-The docker deamon running in the Vagrant VM needs be exposed on the network.\n-The easiest way to do this is to use the provided https://github.com/wildfly-extras/wildfly-camel/blob/master/Vagrantfile[Vagrantfile,window=_blank].\n-\n-The provided Vagrantfile adds port forwarding, a few docker deamon options and restarts the docker deamon.\n+The client tools are available from the Minishift installation.\n-[source,options=\"nowrap\"]\n- config.vm.network \"forwarded_port\", guest: 8080, host: 8080\n- config.vm.network \"forwarded_port\", guest: 8443, host: 8443\n- config.vm.network \"forwarded_port\", guest: 2375, host: 2375\n+----\n+$ export PATH=$PATH:~/.minishift/cache/oc/v1.4.1\n+----\n+==== Docker access\n-[source,options=\"nowrap\"]\n-[vagrant@localhost ~]$ sudo vi /etc/sysconfig/docker\n-# Additional startup options for the Docker daemon\n-OPTIONS=\"-H tcp://0.0.0.0:2375 -H unix:///var/run/docker.sock\"\n+When running OpenShift in a single VM, it is recommended to reuse the Docker daemon which Minishift uses for pure Docker use-cases as well. By using the same docker daemon as Minishift, you can speed up your local experiments.\n-[source,options=\"nowrap\"]\n-[vagrant@localhost ~]$ sudo systemctl restart docker\n+To be able to work with the docker daemon on your Mac or GNU/Linux host use the docker-env command in your shell:\n-On you local machine, setup a route to the Vagrant VM\n-\n- $ sudo cat /etc/hosts\n- 10.2.2.2 origin\n+----\n+$ eval $(minishift docker-env)\n+----\n-and export a few Docker related environment variables for maven builds.\n+You should now be able to use docker on the command line of your host, talking to the docker daemon inside the Minishift VM:\n- export DOCKER_HOST=tcp://origin:2375\n- export DOCKER_IP=origin\n+----\n+$ docker ps\n+----\n#### Running WildFly-Camel\n@@ -73,11 +54,11 @@ You can run the standalone container like this\n[source,options=\"nowrap\"]\n$ docker run --rm -ti -e WILDFLY_MANAGEMENT_USER=admin -e WILDFLY_MANAGEMENT_PASSWORD=admin -p 8080:8080 -p 9990:9990 wildflyext/wildfly-camel\n-and access the admin console like this: http://10.2.2.2:9990/console[,window=_blank]\n+and access the admin console like this: http://192.168.99.100:9990/console[,window=_blank]\nimage::console-standalone.png[]\n-The Hawt.io console is available at: http://10.2.2.2:8080/hawtio[,window=_blank]\n+The Hawt.io console is available at: http://192.168.99.100:8080/hawtio[,window=_blank]\nimage::hawtio-camel-01.png[]\n@@ -94,6 +75,7 @@ that we access via https://github.com/GoogleCloudPlatform/kubernetes/blob/v1.0.0\nA project allows us to create deployments, pods, services, routes, etc. under our own custom 'wildfly-camel' namespace.\n+ $ oc login -u user -p user\n$ oc new-project wildfly-camel\n##### Create a new application\n@@ -120,7 +102,7 @@ Now, lets expose the HTTP root context of the running wildlfy server.\nFrom a remote client, you should now be able to access the service like this\n-http://example-camel-rest-wildfly-camel.apps.10.2.2.2.xip.io/rest/greet/hello/Kermit[,window=_blank]\n+http://example-camel-rest-wildfly-camel.192.168.99.100.nip.io/rest/greet/hello/Kermit[,window=_blank]\nHello Kermit from 172.17.0.8\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/images/console-standalone.png",
"new_path": "docs/guide/images/console-standalone.png",
"diff": "Binary files a/docs/guide/images/console-standalone.png and b/docs/guide/images/console-standalone.png differ\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1583] Upgrade to OpenShift 3.4
|
734,358 |
21.03.2017 13:44:52
| -3,600 |
4b0ac2af24d7286f11d1151bc80ea20a3455af51
|
[resolves wildflyext/wildfly-camel fails on OpenShift
|
[
{
"change_type": "MODIFY",
"old_path": "docker/pom.xml",
"new_path": "docker/pom.xml",
"diff": "<tag>${project.version}</tag>\n</tags>\n<runCmds>\n- <run>usermod -g root jboss</run>\n<run>chmod -R g+rw /opt/jboss/wildfly</run>\n</runCmds>\n<assembly>\n<basedir>/opt/jboss/wildfly</basedir>\n<descriptor>${project.basedir}/standalone/assembly-artifacts.xml</descriptor>\n- <user>jboss:root:root</user>\n+ <user>jboss:0:0</user>\n</assembly>\n<user>jboss</user>\n<!--\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1705] wildflyext/wildfly-camel fails on OpenShift
|
734,358 |
04.04.2017 09:37:24
| -7,200 |
a70aabb312c2eac24091e6491956149bc6d7f902
|
[resolves Provide wildfly-swarm fraction generator
|
[
{
"change_type": "MODIFY",
"old_path": ".gitignore",
"new_path": ".gitignore",
"diff": "-.idea\n+.DS_Store\n.classpath\n.project\n.settings\n-.vagrant\n-target\n+.idea\n*.iml\n-.DS_Store\n-dependency-reduced-pom.xml\n+*.log\n+target\n"
},
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<version.apache.httpcomponents>4.5.2</version.apache.httpcomponents>\n<version.apache.karaf>2.4.3</version.apache.karaf>\n<version.apache.xmlbeans>2.6.0</version.apache.xmlbeans>\n+ <version.args4j>2.0.31</version.args4j>\n<version.arquillian.cube>1.0.1</version.arquillian.cube>\n<version.codehaus.plexus.utils>3.0.15</version.codehaus.plexus.utils>\n<version.eclipse.egit.github>2.1.5</version.eclipse.egit.github>\n<module>cxfhttp</module>\n<module>feature</module>\n<module>subsystem</module>\n+ <module>swarm</module>\n<module>testenricher</module>\n<module>itests</module>\n</modules>\n<dependencyManagement>\n<dependencies>\n+ <dependency>\n+ <groupId>args4j</groupId>\n+ <artifactId>args4j</artifactId>\n+ <version>${version.args4j}</version>\n+ </dependency>\n+\n<!-- ActiveMQ -->\n<!-- [FIXME #1713] Remove explicit version for ActiveMQ -->\n<dependency>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/README.md",
"diff": "+# WildFly-Camel Swarm\n+\n+Provides Swarm fractions for the WildFly-Camel subsystem.\n+\n+To re-generate the camel fractions, do\n+\n+ rm -r ../wildfly-swarm/fractions/camel/components\n+ mvn clean install -pl swarm -Doutdir=../wildfly-swarm/fractions/camel\n+\n+Then in wildfly-swarm, do\n+\n+ mvn clean install -f fractions/camel\n+ mvn clean install -pl testsuite/testsuite-camel-core,testsuite/testsuite-camel-cdi,testsuite/testsuite-camel-cxf,testsuite/testsuite-camel-ejb,testsuite/testsuite-camel-jms,testsuite/testsuite-camel-jmx,testsuite/testsuite-camel-jpa,testsuite/testsuite-camel-ognl\n+\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/pom.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!--\n+ #%L\n+ WildFly Swarm Camel\n+ %%\n+ Copyright (C) 2016 RedHat\n+ %%\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ #L%\n+ -->\n+\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n+ <modelVersion>4.0.0</modelVersion>\n+\n+ <parent>\n+ <groupId>org.wildfly.camel</groupId>\n+ <artifactId>wildfly-camel</artifactId>\n+ <version>4.7.0-SNAPSHOT</version>\n+ </parent>\n+\n+ <name>Wildfly Camel :: Swarm</name>\n+\n+ <artifactId>wildfly-camel-swarm</artifactId>\n+\n+ <properties>\n+ <outdir>${basedir}/target/generated</outdir>\n+ </properties>\n+\n+ <!-- Dependencies -->\n+ <dependencies>\n+ <dependency>\n+ <groupId>org.wildfly.camel</groupId>\n+ <artifactId>wildfly-camel-catalog</artifactId>\n+ <version>${project.version}</version>\n+ </dependency>\n+\n+ <dependency>\n+ <groupId>args4j</groupId>\n+ <artifactId>args4j</artifactId>\n+ </dependency>\n+ <dependency>\n+ <groupId>com.fasterxml.jackson.core</groupId>\n+ <artifactId>jackson-databind</artifactId>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.apache.velocity</groupId>\n+ <artifactId>velocity</artifactId>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.jboss.gravia</groupId>\n+ <artifactId>gravia-runtime-api</artifactId>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.slf4j</groupId>\n+ <artifactId>slf4j-api</artifactId>\n+ </dependency>\n+\n+ <!-- Provided -->\n+ <dependency>\n+ <groupId>org.slf4j</groupId>\n+ <artifactId>slf4j-log4j12</artifactId>\n+ <scope>provided</scope>\n+ </dependency>\n+ </dependencies>\n+\n+ <!-- Build -->\n+ <build>\n+ <resources>\n+ <resource>\n+ <directory>src/main/resources</directory>\n+ <filtering>true</filtering>\n+ </resource>\n+ </resources>\n+ <plugins>\n+ <plugin>\n+ <groupId>org.apache.maven.plugins</groupId>\n+ <artifactId>maven-antrun-plugin</artifactId>\n+ <executions>\n+ <execution>\n+ <goals>\n+ <goal>run</goal>\n+ </goals>\n+ <phase>test</phase>\n+ <configuration>\n+ <target>\n+ <java classname=\"org.wildfly.swarm.camel.generator.Main\" classpathref=\"maven.test.classpath\" failonerror=\"true\">\n+ <arg value=\"--outdir=${outdir}\" />\n+ </java>\n+ </target>\n+ </configuration>\n+ </execution>\n+ </executions>\n+ </plugin>\n+ <plugin>\n+ <groupId>org.apache.maven.plugins</groupId>\n+ <artifactId>maven-assembly-plugin</artifactId>\n+ <executions>\n+ <execution>\n+ <phase>package</phase>\n+ <goals>\n+ <goal>single</goal>\n+ </goals>\n+ <configuration>\n+ <appendAssemblyId>false</appendAssemblyId>\n+ <descriptors>\n+ <descriptor>scripts/assembly.xml</descriptor>\n+ </descriptors>\n+ </configuration>\n+ </execution>\n+ </executions>\n+ </plugin>\n+ </plugins>\n+ </build>\n+\n+</project>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/scripts/assembly.xml",
"diff": "+<!--\n+ #%L\n+ Wildfly Camel :: Patch\n+ %%\n+ Copyright (C) 2013 - 2014 RedHat\n+ %%\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ #L%\n+ -->\n+<assembly xmlns=\"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:schemaLocation=\"http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd\">\n+\n+ <id>distro</id>\n+ <formats>\n+ <format>tar.gz</format>\n+ </formats>\n+ <includeBaseDirectory>false</includeBaseDirectory>\n+\n+ <fileSets>\n+ <fileSet>\n+ <directory>${outdir}</directory>\n+ <outputDirectory>/</outputDirectory>\n+ <includes>\n+ <include>components/pom.xml</include>\n+ <include>components/*/pom.xml</include>\n+ <include>components/*/module.conf</include>\n+ </includes>\n+ </fileSet>\n+ </fileSets>\n+\n+</assembly>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/java/org/wildfly/swarm/camel/generator/FractionsGenerator.java",
"diff": "+package org.wildfly.swarm.camel.generator;\n+\n+import java.io.BufferedReader;\n+import java.io.BufferedWriter;\n+import java.io.File;\n+import java.io.FileWriter;\n+import java.io.IOException;\n+import java.io.InputStream;\n+import java.io.InputStreamReader;\n+import java.io.PrintWriter;\n+import java.nio.file.Path;\n+import java.nio.file.Paths;\n+import java.util.ArrayList;\n+import java.util.Collections;\n+import java.util.HashMap;\n+import java.util.List;\n+import java.util.Map;\n+import java.util.SortedSet;\n+import java.util.TreeSet;\n+\n+import org.apache.camel.catalog.CamelCatalog;\n+import org.apache.camel.catalog.DefaultCamelCatalog;\n+import org.apache.velocity.VelocityContext;\n+import org.apache.velocity.app.VelocityEngine;\n+import org.apache.velocity.runtime.RuntimeConstants;\n+import org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader;\n+import org.jboss.gravia.utils.IllegalArgumentAssertion;\n+import org.slf4j.Logger;\n+import org.slf4j.LoggerFactory;\n+import org.wildfly.camel.catalog.WildFlyRuntimeProvider;\n+\n+import com.fasterxml.jackson.core.type.TypeReference;\n+import com.fasterxml.jackson.databind.JsonNode;\n+import com.fasterxml.jackson.databind.ObjectMapper;\n+\n+public class FractionsGenerator {\n+\n+ public static final Logger LOG = LoggerFactory.getLogger(Main.class.getPackage().getName());\n+\n+ private final Path outpath;\n+ private Map<String, Config> configs = new HashMap<>();\n+\n+ public static class Dependency {\n+ String groupId;\n+ String artifactId;\n+ Map<String, Boolean> flags = new HashMap<>();\n+\n+ static Dependency parse(String line) {\n+ Map<String, Boolean> flags = new HashMap<>();\n+ int idx = line.lastIndexOf(\",\");\n+ while (idx > 0) {\n+ String flag = line.substring(idx + 1);\n+ String[] tok = flag.split(\"=\");\n+ flags.put(tok[0], Boolean.parseBoolean(tok[1]));\n+ line = line.substring(0, idx);\n+ idx = line.lastIndexOf(\",\");\n+ }\n+ Dependency result = new Dependency();\n+ String[] tok = line.split(\":\");\n+ result.groupId = tok[0];\n+ result.artifactId = tok[1];\n+ result.flags = flags;\n+ return result;\n+ }\n+\n+ public String getSpec() {\n+ return groupId + \":\" + artifactId;\n+ }\n+\n+ public String getGroupId() {\n+ return groupId;\n+ }\n+\n+ public String getArtifactId() {\n+ return artifactId;\n+ }\n+\n+ public boolean isExclusions() {\n+ Boolean result = flags.get(\"exclusions\");\n+ return result != null ? result : false;\n+ }\n+ }\n+\n+ public static class Component implements Comparable<Component> {\n+ String compId;\n+ String description;\n+ Component(String compId, String description) {\n+ this.compId = compId;\n+ this.description = description;\n+ }\n+ public String getCompId() {\n+ return compId;\n+ }\n+ public String getDescription() {\n+ return description;\n+ }\n+ @Override\n+ public int compareTo(Component obj) {\n+ return compId.compareTo(obj.compId);\n+ }\n+ }\n+\n+ public static class Config {\n+ public String moduleId;\n+ public List<String> dependencies = Collections.emptyList();\n+ public List<String> features = Collections.emptyList();\n+ public List<String> modules = Collections.emptyList();\n+ }\n+\n+ public FractionsGenerator(Path outpath) throws IOException {\n+ this.outpath = outpath;\n+\n+ try (InputStreamReader reader = new InputStreamReader(Main.class.getResourceAsStream(\"/fractions.config\"))) {\n+ configs = new ObjectMapper().readValue(reader, new TypeReference<Map<String, Config>>() {\n+ });\n+ }\n+ }\n+\n+ public void generate() throws IOException {\n+ allComponents(getComponents());\n+ }\n+\n+ private void allComponents(SortedSet<Component> components) throws IOException {\n+ IllegalArgumentAssertion.assertNotNull(components, \"components\");\n+\n+ VelocityEngine ve = newVelocityEngine();\n+ VelocityContext context = new VelocityContext();\n+ context.put(\"components\", components);\n+\n+ String tmplPath = \"templates/parent-pom.vm\";\n+ ClassLoader classLoader = Main.class.getClassLoader();\n+ try (InputStreamReader reader = new InputStreamReader(classLoader.getResourceAsStream(tmplPath))) {\n+ Path path = Paths.get(\"components\", \"pom.xml\");\n+ FractionsGenerator.LOG.info(\"Generating: {}\", path);\n+\n+ File outfile = outpath.resolve(path).toFile();\n+ outfile.getParentFile().mkdirs();\n+ try (BufferedWriter writer = new BufferedWriter(new FileWriter(outfile))) {\n+ ve.evaluate(context, writer, tmplPath, reader);\n+ }\n+ }\n+\n+ for (Component comp : components) {\n+ singleComponent(comp);\n+ }\n+ }\n+\n+ private void singleComponent(Component comp) throws IOException {\n+ IllegalArgumentAssertion.assertNotNull(comp, \"comp\");\n+\n+ Config config = configs.get(comp.compId);\n+ if (config == null) {\n+ config = new Config();\n+ }\n+ if (config.moduleId == null) {\n+ config.moduleId = comp.compId;\n+ }\n+\n+ VelocityEngine ve = newVelocityEngine();\n+ VelocityContext context = new VelocityContext();\n+ context.put(\"modId\", config.moduleId);\n+ context.put(\"modules\", config.modules);\n+ context.put(\"dependencies\", getDependencies(config));\n+ context.put(\"features\", getFeatures(config));\n+ context.put(\"compName\", getComponentName(comp.compId));\n+ context.put(\"comp\", comp);\n+ context.put(\"compId\", comp.compId);\n+\n+ // Write the component POM\n+ String tmplPath = \"templates/pom.vm\";\n+ ClassLoader classLoader = Main.class.getClassLoader();\n+ try (InputStreamReader reader = new InputStreamReader(classLoader.getResourceAsStream(tmplPath))) {\n+ Path path = Paths.get(\"components\", comp.compId, \"pom.xml\");\n+ FractionsGenerator.LOG.info(\"Generating: {}\", path);\n+\n+ File outfile = outpath.resolve(path).toFile();\n+ outfile.getParentFile().mkdirs();\n+ try (BufferedWriter writer = new BufferedWriter(new FileWriter(outfile))) {\n+ ve.evaluate(context, writer, tmplPath, reader);\n+ }\n+ }\n+\n+ // Write the component module.conf\n+ Path path = Paths.get(\"components\", comp.compId, \"module.conf\");\n+ File outfile = outpath.resolve(path).toFile();\n+ try (PrintWriter writer = new PrintWriter(new FileWriter(outfile))) {\n+ tmplPath = \"templates/module.conf\";\n+ InputStream input = classLoader.getResourceAsStream(tmplPath);\n+ try (InputStreamReader reader = new InputStreamReader(input)) {\n+ ve.evaluate(context, writer, tmplPath, reader);\n+ }\n+ }\n+ }\n+\n+ private SortedSet<Component> getComponents() throws IOException {\n+ SortedSet<Component> components = new TreeSet<>();\n+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(Main.class.getResourceAsStream(\"/whitelist.txt\")))) {\n+ String line = reader.readLine();\n+ while (line != null) {\n+ String compId = line.trim();\n+ components.add(new Component(compId, \"Component \" + compId));\n+ line = reader.readLine();\n+ }\n+ }\n+ List<String> blacklist = new ArrayList<>();\n+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(Main.class.getResourceAsStream(\"/blacklist.txt\")))) {\n+ String line = reader.readLine();\n+ while (line != null) {\n+ blacklist.add(line.trim());\n+ line = reader.readLine();\n+ }\n+ }\n+ CamelCatalog catalog = new DefaultCamelCatalog();\n+ catalog.setRuntimeProvider(new WildFlyRuntimeProvider());\n+ for (String name : catalog.findComponentNames()) {\n+ String schema = catalog.componentJSonSchema(name);\n+ Component comp = getComponent(new ObjectMapper().readTree(schema).get(\"component\"));\n+ if (comp != null && !blacklist.contains(comp.compId)) {\n+ components.add(comp);\n+ }\n+ }\n+ for (String name : catalog.findDataFormatNames()) {\n+ String schema = catalog.dataFormatJSonSchema(name);\n+ Component comp = getComponent(new ObjectMapper().readTree(schema).get(\"dataformat\"));\n+ if (comp != null && !blacklist.contains(comp.compId)) {\n+ components.add(comp);\n+ }\n+ }\n+ for (String name : catalog.findLanguageNames()) {\n+ String schema = catalog.languageJSonSchema(name);\n+ Component comp = getComponent(new ObjectMapper().readTree(schema).get(\"language\"));\n+ if (comp != null && !blacklist.contains(comp.compId)) {\n+ components.add(comp);\n+ }\n+ }\n+ return components;\n+ }\n+\n+ private Component getComponent(JsonNode node) throws IOException {\n+ String groupId = node.get(\"groupId\").asText();\n+ String artifactId = node.get(\"artifactId\").asText();\n+ String description = node.get(\"description\").asText();\n+ Component result = null;\n+ if (!groupId.equals(\"org.apache.camel\") || !artifactId.startsWith(\"camel-\")) {\n+ LOG.info(\"Ignore: {}:{}\", groupId, artifactId);\n+ } else if (!artifactId.equals(\"camel-core\")) {\n+ result = new Component(artifactId.substring(\"camel-\".length()), description);\n+ }\n+ return result;\n+ }\n+\n+ private List<Dependency> getDependencies(Config config) throws IOException {\n+ List<Dependency> result = new ArrayList<>();\n+ for (String line : config.dependencies) {\n+ result.add(Dependency.parse(line));\n+ }\n+ return result;\n+ }\n+\n+ private List<Dependency> getFeatures(Config config) throws IOException {\n+ List<Dependency> result = new ArrayList<>();\n+ for (String line : config.features) {\n+ result.add(Dependency.parse(line));\n+ }\n+ return result;\n+ }\n+\n+ private String getComponentName(String compId) {\n+ return compId.toUpperCase().charAt(0) + compId.substring(1);\n+ }\n+\n+ private VelocityEngine newVelocityEngine() {\n+ VelocityEngine ve = new VelocityEngine();\n+ ve.setProperty(RuntimeConstants.RESOURCE_LOADER, \"classpath\");\n+ ve.setProperty(\"classpath.resource.loader.class\", ClasspathResourceLoader.class.getName());\n+ ve.init();\n+ return ve;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/java/org/wildfly/swarm/camel/generator/Main.java",
"diff": "+/*\n+ * #%L\n+ * Fuse Patch :: Core\n+ * %%\n+ * Copyright (C) 2015 Private\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.swarm.camel.generator;\n+\n+import static org.wildfly.swarm.camel.generator.FractionsGenerator.LOG;\n+\n+import java.io.IOException;\n+import java.nio.file.Path;\n+\n+import org.kohsuke.args4j.CmdLineException;\n+import org.kohsuke.args4j.CmdLineParser;\n+\n+public class Main {\n+\n+ public static void main(String[] args) {\n+ try {\n+ new Main().process(args);\n+ } catch (Throwable th) {\n+ Runtime.getRuntime().exit(1);\n+ }\n+ }\n+\n+ // Entry point with no system exit\n+ public void process(String[] args) throws Throwable {\n+\n+ Options options = new Options();\n+ CmdLineParser parser = new CmdLineParser(options);\n+ try {\n+ parser.parseArgument(args);\n+ } catch (CmdLineException ex) {\n+ helpScreen(parser);\n+ throw ex;\n+ }\n+\n+ try {\n+ generate(options.outpath);\n+ } catch (Throwable th) {\n+ LOG.error(\"Error executing command\", th);\n+ throw th;\n+ }\n+ }\n+\n+ private void generate(Path outpath) throws IOException {\n+ FractionsGenerator tool = new FractionsGenerator(outpath);\n+ tool.generate();\n+ }\n+\n+ private static void helpScreen(CmdLineParser cmdParser) {\n+ cmdParser.printUsage(System.err);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/java/org/wildfly/swarm/camel/generator/Options.java",
"diff": "+/*\n+ * #%L\n+ * Fuse Patch :: Core\n+ * %%\n+ * Copyright (C) 2015 Private\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.swarm.camel.generator;\n+\n+import java.nio.file.Path;\n+\n+import org.kohsuke.args4j.Option;\n+\n+final class Options {\n+\n+ @Option(name = \"--help\", help = true)\n+ boolean help;\n+\n+ @Option(name = \"--outdir\", required = true, usage = \"Output path for generated artefacts (required)\")\n+ Path outpath;\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/resources/blacklist.txt",
"diff": "+# components\n+spring\n+\n+# data formats\n+\n+# languages\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/resources/fractions.config",
"diff": "+{\n+ \"activemq\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:camel-jms\", \"org.apache.activemq:activemq-camel,exclusions=true\" ],\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\" ]\n+ },\n+ \"bean-validator\" : {\n+ \"moduleId\" : \"bean.validator\"\n+ },\n+ \"cassandraql\" : {\n+ \"moduleId\" : \"cassandra\"\n+ },\n+ \"cxf\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:jaxrs\", \"org.wildfly.swarm:webservices\" ],\n+ \"modules\" : [ \"org.wildfly.extension.camel.undertow\" ]\n+ },\n+ \"cdi\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:cdi\" ],\n+ \"modules\" : [ \"org.wildfly.extension.camel.cdi\" ]\n+ },\n+ \"ejb\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:ejb\" ]\n+ },\n+ \"jaxb\" : {\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\" ]\n+ },\n+ \"jms\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:messaging\" ],\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\" ]\n+ },\n+ \"jmx\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:ee\" ],\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\" ]\n+ },\n+ \"jpa\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:jpa\" ],\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\" ]\n+ },\n+ \"mail\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:mail\" ]\n+ },\n+ \"ognl\" : {\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\" ]\n+ },\n+ \"sap-netweaver\" : {\n+ \"moduleId\" : \"sap.netweaver\"\n+ },\n+ \"spring-security\" : {\n+ \"moduleId\" : \"spring.security\"\n+ },\n+ \"swagger\" : {\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\", \"org.wildfly:wildfly-servlet-feature-pack\" ]\n+ },\n+ \"undertow\" : {\n+ \"dependencies\" : [ \"org.wildfly.swarm:undertow\" ],\n+ \"features\" : [ \"org.wildfly:wildfly-feature-pack\", \"org.wildfly.core:wildfly-core-feature-pack\" ],\n+ \"modules\" : [ \"org.wildfly.extension.camel.undertow\" ]\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/resources/templates/module.conf",
"diff": "+#foreach( $auxId in $modules )\n+$auxId\n+#end\n+org.apache.camel.component.$modId\n+org.wildfly.swarm.camel.core\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/resources/templates/parent-pom.vm",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!--\n+ #%L\n+ WildFly Swarm Camel\n+ %%\n+ Copyright (C) 2016 RedHat\n+ %%\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ #L%\n+ -->\n+\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n+ <modelVersion>4.0.0</modelVersion>\n+\n+ <parent>\n+ <groupId>org.wildfly.swarm</groupId>\n+ <artifactId>camel</artifactId>\n+ <version>${version.wildfly.swarm}</version>\n+ </parent>\n+\n+ <name>Camel Components</name>\n+\n+ <groupId>org.wildfly.swarm</groupId>\n+ <artifactId>camel-components</artifactId>\n+ <packaging>pom</packaging>\n+\n+ <dependencies>\n+ <dependency>\n+ <groupId>org.wildfly.camel</groupId>\n+ <artifactId>wildfly-camel-feature-pack</artifactId>\n+ <scope>provided</scope>\n+ <type>zip</type>\n+ <exclusions>\n+ <exclusion>\n+ <groupId>*</groupId>\n+ <artifactId>*</artifactId>\n+ </exclusion>\n+ </exclusions>\n+ </dependency>\n+ </dependencies>\n+\n+ <modules>\n+#foreach( $comp in $components )\n+ <module>$comp.compId</module>\n+#end\n+ </modules>\n+</project>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/resources/templates/pom.vm",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<!--\n+ #%L\n+ WildFly Swarm Camel\n+ %%\n+ Copyright (C) 2016 RedHat\n+ %%\n+ Licensed under the Apache License, Version 2.0 (the \"License\");\n+ you may not use this file except in compliance with the License.\n+ You may obtain a copy of the License at\n+\n+ http://www.apache.org/licenses/LICENSE-2.0\n+\n+ Unless required by applicable law or agreed to in writing, software\n+ distributed under the License is distributed on an \"AS IS\" BASIS,\n+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ See the License for the specific language governing permissions and\n+ limitations under the License.\n+ #L%\n+ -->\n+<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd\">\n+ <modelVersion>4.0.0</modelVersion>\n+\n+ <parent>\n+ <groupId>org.wildfly.swarm</groupId>\n+ <artifactId>camel-components</artifactId>\n+ <version>${version.wildfly.swarm}</version>\n+ </parent>\n+\n+ <name>Camel Component :: ${compName}</name>\n+ <artifactId>camel-${compId}</artifactId>\n+\n+ <description>${comp.description}</description>\n+\n+ <properties>\n+ <swarm.fraction.stability>stable</swarm.fraction.stability>\n+ <swarm.fraction.tags>Camel,Integration</swarm.fraction.tags>\n+ </properties>\n+\n+ <dependencies>\n+#if( $compId != 'activemq' )\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-${compId}</artifactId>\n+#set( $VAC = '{version.apache.camel}' )\n+ <version>$$VAC</version>\n+ <exclusions>\n+ <exclusion>\n+ <groupId>*</groupId>\n+ <artifactId>*</artifactId>\n+ </exclusion>\n+ </exclusions>\n+ </dependency>\n+#end\n+ <dependency>\n+ <groupId>org.wildfly.swarm</groupId>\n+ <artifactId>camel-core</artifactId>\n+ </dependency>\n+#foreach( $dep in $dependencies )\n+ <dependency>\n+ <groupId>$dep.groupId</groupId>\n+ <artifactId>$dep.artifactId</artifactId>\n+#if( $dep.exclusions )\n+ <exclusions>\n+ <exclusion>\n+ <groupId>*</groupId>\n+ <artifactId>*</artifactId>\n+ </exclusion>\n+ </exclusions>\n+#end\n+ </dependency>\n+#end\n+#foreach( $dep in $features )\n+ <dependency>\n+ <groupId>$dep.groupId</groupId>\n+ <artifactId>$dep.artifactId</artifactId>\n+ <scope>provided</scope>\n+ <type>zip</type>\n+ <exclusions>\n+ <exclusion>\n+ <groupId>*</groupId>\n+ <artifactId>*</artifactId>\n+ </exclusion>\n+ </exclusions>\n+ </dependency>\n+#end\n+ </dependencies>\n+\n+ <build>\n+ <plugins>\n+ <plugin>\n+ <groupId>org.wildfly.swarm</groupId>\n+ <artifactId>wildfly-swarm-fraction-plugin</artifactId>\n+ </plugin>\n+ </plugins>\n+ </build>\n+</project>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/main/resources/whitelist.txt",
"diff": "+activemq\n+cdi\n+hystrix\n+jasypt\n+olingo2\n+spring-security\n+swagger\n+zipkin\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "swarm/src/test/resources/log4j.properties",
"diff": "+#\n+# Copyright (c) 2008 SL_OpenSource Consortium\n+# All Rights Reserved.\n+#\n+# Licensed under the Apache License, Version 2.0 (the \"License\");\n+# you may not use this file except in compliance with the License.\n+# You may obtain a copy of the License at\n+#\n+# http://www.apache.org/licenses/LICENSE-2.0\n+#\n+# Unless required by applicable law or agreed to in writing, software\n+# distributed under the License is distributed on an \"AS IS\" BASIS,\n+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+# See the License for the specific language governing permissions and\n+# limitations under the License.\n+#\n+#\n+\n+# Set root category priority to INFO and its only appender to CONSOLE.\n+log4j.rootCategory=INFO, CONSOLE\n+#log4j.rootCategory=INFO, CONSOLE, LOGFILE\n+\n+# CONSOLE is set to be a ConsoleAppender using a PatternLayout.\n+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender\n+log4j.appender.CONSOLE.Threshold=INFO\n+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout\n+log4j.appender.CONSOLE.layout.ConversionPattern=- %m%n\n+\n+# LOGFILE is set to be a File appender using a PatternLayout.\n+log4j.appender.LOGFILE=org.apache.log4j.FileAppender\n+log4j.appender.LOGFILE.File=wsdl2rest.log\n+log4j.appender.LOGFILE.Append=true\n+log4j.appender.LOGFILE.Threshold=INFO\n+log4j.appender.LOGFILE.layout=org.apache.log4j.PatternLayout\n+log4j.appender.LOGFILE.layout.ConversionPattern=%-4r [%t] %-5p %c %x - %m%n\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1726] Provide wildfly-swarm fraction generator
|
734,358 |
07.04.2017 13:32:21
| -7,200 |
9d489725d4ba73ebbd65fb726ef09581a0d9abba
|
[resolves Upgrade to wildfly-swarm-2017.5.0
|
[
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<version.maven.archetype.packaging>2.3</version.maven.archetype.packaging>\n<version.osgi>5.0.0</version.osgi>\n<version.redis.embedded>0.6</version.redis.embedded>\n+ <version.wildfly.swarm>2017.5.0-SNAPSHOT</version.wildfly.swarm>\n<!-- Plugin versions -->\n<version-apache-scr-plugin>1.21.0</version-apache-scr-plugin>\n"
},
{
"change_type": "MODIFY",
"old_path": "swarm/README.md",
"new_path": "swarm/README.md",
"diff": "-# WildFly-Camel Swarm\n+## WildFly-Swarm Fraction Generator\n-Provides Swarm fractions for the WildFly-Camel subsystem.\n+Provides WildFly-Swarm fractions for the WildFly-Camel subsystem.\nTo re-generate the camel fractions, do\nrm -r ../wildfly-swarm/fractions/camel/components\nmvn clean install -pl swarm -Doutdir=../wildfly-swarm/fractions/camel\n-Then in wildfly-swarm, do\n+Then in wildfly-swarm, update the wildfly-camel versions and run\nmvn clean install -f fractions/camel\nmvn clean install -pl testsuite/testsuite-camel-core,testsuite/testsuite-camel-cdi,testsuite/testsuite-camel-cxf,testsuite/testsuite-camel-ejb,testsuite/testsuite-camel-jms,testsuite/testsuite-camel-jmx,testsuite/testsuite-camel-jpa,testsuite/testsuite-camel-ognl\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1731] Upgrade to wildfly-swarm-2017.5.0
|
734,358 |
10.04.2017 15:41:37
| -7,200 |
eca497759ff869151579a96a53d452ee7e2b07c2
|
[resolves Mark deprecated components in catalog
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyCatalogCreator.java",
"new_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyCatalogCreator.java",
"diff": "@@ -61,11 +61,13 @@ public final class WildFlyCatalogCreator {\nfinal Kind kind;\nfinal String name;\nfinal String javaType;\n+ final boolean deprecated;\nState state = State.undecided;\n- Item(Path path, Kind kind, String javaType) {\n+ Item(Path path, Kind kind, String javaType, boolean deprecated) {\nthis.path = path;\nthis.kind = kind;\nthis.javaType = javaType;\n+ this.deprecated = deprecated;\nString nspec = path.getFileName().toString();\nnspec = nspec.substring(0, nspec.indexOf(\".\"));\nthis.name = nspec;\n@@ -124,12 +126,14 @@ public final class WildFlyCatalogCreator {\nFiles.walkFileTree(srcdir, new SimpleFileVisitor<Path>() {\npublic FileVisitResult visitFile(Path path, BasicFileAttributes attrs) throws IOException {\nif (path.toString().endsWith(\".json\")) {\n+ Path relpath = srcdir.relativize(path);\nObjectMapper mapper = new ObjectMapper();\nJsonNode tree = mapper.readTree(path.toFile());\nString kind = tree.findValue(\"kind\").textValue();\nString javaType = tree.findValue(\"javaType\").textValue();\n+ boolean deprecated = Boolean.parseBoolean(tree.findValue(\"deprecated\").textValue());\nif (validKind(kind) && javaType != null) {\n- Item item = new Item(srcdir.relativize(path), Kind.valueOf(kind), javaType);\n+ Item item = new Item(relpath, Kind.valueOf(kind), javaType, deprecated);\nroadmaps.get(item.kind).add(item);\n}\n}\n@@ -160,7 +164,8 @@ public final class WildFlyCatalogCreator {\n} else if (line.startsWith(\"[\")) {\nstate = null;\n} else if (state != null) {\n- Item item = roadmap.item(line.trim());\n+ String name = line.trim().split(\" \")[0];\n+ Item item = roadmap.item(name);\nif (item != null) {\nitem.state = state;\n}\n@@ -209,7 +214,8 @@ public final class WildFlyCatalogCreator {\nfor (State state : State.values()) {\npw.println(\"[\" + state + \"]\");\nfor (String entry : roadmap.sortedNames(state)) {\n- pw.println(entry);\n+ Item item = roadmap.item(entry);\n+ pw.println(item.name + (item.deprecated ? \" (deprecated)\" : \"\"));\n}\npw.println();\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -8,7 +8,7 @@ binding\nbraintree\nbrowse\nclass\n-context\n+context (deprecated)\ncontrolbus\ncql\ncrypto\n@@ -157,7 +157,7 @@ apns\nasterisk\natmos\natmosphere-websocket\n-cache\n+cache (deprecated)\nchronicle-engine\nchunk\ncm-sms\n@@ -176,37 +176,37 @@ gora\ngrape\ngridfs\nguava-eventbus\n-hdfs\n+hdfs (deprecated)\nhipchat\nhttp\nhttps\n-ibatis\n+ibatis (deprecated)\nironmq\n-javaspace\n+javaspace (deprecated)\njcr\njetty\njing\njira\njolt\njt400\n-kestrel\n+kestrel (deprecated)\nkrati\nlpr\nlumberjack\n-mina\n+mina (deprecated)\nmsv\nmustache\n-netty\n-netty-http\n+netty (deprecated)\n+netty-http (deprecated)\nnetty4-http\n-openshift\n+openshift (deprecated)\npaxlogging\npgevent\n-quartz\n+quartz (deprecated)\nquickfix\nrestlet\nrmi\n-routebox\n+routebox (deprecated)\nsip\nsips\nslack\n"
},
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/language.roadmap",
"new_path": "catalog/src/main/resources/language.roadmap",
"diff": "[supported]\n-bean\n+bean (deprecated)\nconstant\nexchangeProperty\nfile\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1733] Mark deprecated components in catalog
|
734,358 |
11.04.2017 08:51:15
| -7,200 |
9dd8c22cb6ac7e20f403841330a3ef24ba2b7280
|
[resolves spring-aop cannot access org.w3c.dom.Element
|
[
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/spring-modules.xml",
"new_path": "feature/etc/smartics/spring-modules.xml",
"diff": "</properties>\n<include artifact=\":spring-aop\" />\n<dependencies>\n+ <module name=\"javax.api\" />\n<module name=\"org.apache.commons.logging\" />\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/springframework/aop/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/springframework/aop/main/module.xml",
"diff": "<artifact name=\"${org.springframework:spring-aop}\" />\n</resources>\n<dependencies>\n+ <module name=\"javax.api\" />\n<module name=\"org.apache.commons.logging\" />\n<module name=\"org.springframework.beans\" />\n<module name=\"org.springframework.core\" />\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1738] spring-aop cannot access org.w3c.dom.Element
|
734,358 |
11.04.2017 16:25:05
| -7,200 |
84ac757ba00795392c724ff47e58f29eb1f59a42
|
[resolves Reject support for component nagios
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -146,7 +146,6 @@ hbase\nhdfs2\njclouds\nkubernetes\n-nagios\nwebsocket\n[undecided]\n@@ -196,6 +195,7 @@ lumberjack\nmina (deprecated)\nmsv\nmustache\n+nagios\nnetty (deprecated)\nnetty-http (deprecated)\nnetty4-http\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1456] Reject support for component nagios
|
734,358 |
11.04.2017 16:25:50
| -7,200 |
7d20728739ab45a7fe38bba0b5535d1914851979
|
[resolves Reject support for component hazelcast
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -141,7 +141,6 @@ github\ngoogle-calendar\ngoogle-drive\ngoogle-mail\n-hazelcast\nhbase\nhdfs2\njclouds\n@@ -175,6 +174,7 @@ gora\ngrape\ngridfs\nguava-eventbus\n+hazelcast\nhdfs (deprecated)\nhipchat\nhttp\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1440] Reject support for component hazelcast
|
734,358 |
11.04.2017 16:26:28
| -7,200 |
b81fa5084be53c307aa4a47a8ff23c6e5f4fd335
|
[resolves Reject support for component beanstalk
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -128,7 +128,6 @@ aws-ses\naws-sns\naws-sqs\naws-swf\n-beanstalk\nbox\ncoap\ncouchdb\n@@ -155,6 +154,7 @@ apns\nasterisk\natmos\natmosphere-websocket\n+beanstalk\ncache (deprecated)\nchronicle-engine\nchunk\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1419] Reject support for component beanstalk
|
734,358 |
13.04.2017 17:49:39
| -7,200 |
3dad26b4aa5c42b009c23e909798ea058679800e
|
[resolves Add support for component aws-s3
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "amqp\natom\navro\n+aws-cw\n+aws-ddb\n+aws-ddbstream\n+aws-ec2\n+aws-kinesis\n+aws-s3\n+aws-sdb\n+aws-ses\n+aws-sns\n+aws-sqs\n+aws-swf\nbean\nbean-validator\nbinding\n@@ -117,17 +128,6 @@ zookeeper\nahc\nahc-ws\nahc-wss\n-aws-cw\n-aws-ddb\n-aws-ddbstream\n-aws-ec2\n-aws-kinesis\n-aws-s3\n-aws-sdb\n-aws-ses\n-aws-sns\n-aws-sqs\n-aws-swf\nbox\ncoap\ncouchdb\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-s3.adoc",
"diff": "+### camel-aws-s3\n+\n+The http://camel.apache.org/aws-s3.html[AWS S3,window=_blank] component supports storing and retrieving objetcs from/to http://camel.apache.org/aws-s3.html[Amazon's S3,window=_blank] service.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -10,6 +10,8 @@ include::camel-atom.adoc[]\ninclude::camel-avro.adoc[]\n+include::camel-aws-s3.adoc[]\n+\ninclude::camel-bean-validator.adoc[]\ninclude::camel-bindy.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<module name=\"org.apache.camel.component.amqp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.atom\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.avro\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.aws\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.barcode\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.base64\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.beanio\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.apache.camel.component.aws\">\n+ <include artifact=\"org.apache.camel:camel-aws\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"com.sun.mail\" />\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"com.amazon.aws\" export=\"true\" >\n+ <exports>\n+ <exclude path=\"com/amazonaws/auth/internal\" />\n+ <exclude path=\"com/amazonaws/auth/policy/internal\" />\n+ <exclude path=\"com/amazonaws/auth/profile/internal**\" />\n+ <exclude path=\"com/amazonaws/http**\" />\n+ <exclude path=\"com/amazonaws/internal**\" />\n+ <exclude path=\"com/amazonaws/metrics/internal**\" />\n+ <exclude path=\"com/amazonaws/retry/internal\" />\n+ <exclude path=\"com/amazonaws/services/apigateway/internal\" />\n+ <exclude path=\"com/amazonaws/services/dynamodbv2/document/internal\" />\n+ <exclude path=\"com/amazonaws/services/glacier/internal\" />\n+ <exclude path=\"com/amazonaws/services/logs/internal\" />\n+ <exclude path=\"com/amazonaws/services/machinelearning/internal\" />\n+ <exclude path=\"com/amazonaws/services/route53/internal\" />\n+ <exclude path=\"com/amazonaws/services/s3/internal**\" />\n+ <exclude path=\"com/amazonaws/services/s3/transfer/internal\" />\n+ <exclude path=\"com/amazonaws/services/securitytoken/internal\" />\n+ <exclude path=\"com/amazonaws/services/simpledb/internal\" />\n+ <exclude path=\"com/amazonaws/services/sqs/internal\" />\n+ </exports>\n+ </module>\n+ <module name=\"org.slf4j\" />\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.barcode\">\n<include artifact=\"com.google.zxing:core\" />\n<include artifact=\"com.google.zxing:javase\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/other-modules.xml",
"new_path": "feature/etc/smartics/other-modules.xml",
"diff": "-->\n<modules xmlns=\"http://smartics.de/ns/jboss-modules-descriptor/2\">\n+ <module name=\"com.amazon.aws\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\"/>\n+ </properties>\n+ <include artifact=\"com.amazonaws:\" />\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-annotations\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-core\" />\n+ </dependencies>\n+ </module>\n+\n<module name=\"com.codahale.metrics\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<groupId>org.apache.camel</groupId>\n<artifactId>camel-avro</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-aws</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-barcode</artifactId>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/com/amazon/aws/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"com.amazon.aws\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\" />\n+ </properties>\n+ <resources>\n+ <artifact name=\"${com.amazonaws:aws-java-sdk}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-acm}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-api-gateway}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-applicationautoscaling}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-autoscaling}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudformation}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudfront}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudhsm}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudsearch}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudtrail}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudwatch}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cloudwatchmetrics}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-codecommit}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-codedeploy}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-codepipeline}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cognitoidentity}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cognitoidp}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-cognitosync}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-config}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-core}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-datapipeline}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-devicefarm}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-directconnect}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-directory}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-discovery}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-dms}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-dynamodb}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-ec2}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-ecr}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-ecs}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-efs}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-elasticache}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-elasticbeanstalk}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-elasticloadbalancing}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-elasticsearch}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-elastictranscoder}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-emr}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-events}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-gamelift}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-glacier}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-iam}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-importexport}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-inspector}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-iot}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-kinesis}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-kms}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-lambda}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-logs}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-machinelearning}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-marketplacecommerceanalytics}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-marketplacemeteringservice}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-opsworks}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-rds}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-redshift}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-route53}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-s3}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-servicecatalog}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-ses}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-simpledb}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-simpleworkflow}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-sns}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-sqs}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-ssm}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-storagegateway}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-sts}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-support}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-swf-libraries}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-waf}\" />\n+ <artifact name=\"${com.amazonaws:aws-java-sdk-workspaces}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-annotations\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-core\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n+ <module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n+ <module name=\"org.apache.commons.logging\" />\n+ <module name=\"org.apache.httpcomponents\" slot=\"4.5.2\" />\n+ <module name=\"org.joda.time\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.apache.camel.component.aws\">\n+ <resources>\n+ <artifact name=\"${org.apache.camel:camel-aws}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"com.amazon.aws\" export=\"true\">\n+ <exports>\n+ <exclude path=\"com/amazonaws/auth/internal\" />\n+ <exclude path=\"com/amazonaws/auth/policy/internal\" />\n+ <exclude path=\"com/amazonaws/auth/profile/internal**\" />\n+ <exclude path=\"com/amazonaws/http**\" />\n+ <exclude path=\"com/amazonaws/internal**\" />\n+ <exclude path=\"com/amazonaws/metrics/internal**\" />\n+ <exclude path=\"com/amazonaws/retry/internal\" />\n+ <exclude path=\"com/amazonaws/services/apigateway/internal\" />\n+ <exclude path=\"com/amazonaws/services/dynamodbv2/document/internal\" />\n+ <exclude path=\"com/amazonaws/services/glacier/internal\" />\n+ <exclude path=\"com/amazonaws/services/logs/internal\" />\n+ <exclude path=\"com/amazonaws/services/machinelearning/internal\" />\n+ <exclude path=\"com/amazonaws/services/route53/internal\" />\n+ <exclude path=\"com/amazonaws/services/s3/internal**\" />\n+ <exclude path=\"com/amazonaws/services/s3/transfer/internal\" />\n+ <exclude path=\"com/amazonaws/services/securitytoken/internal\" />\n+ <exclude path=\"com/amazonaws/services/simpledb/internal\" />\n+ <exclude path=\"com/amazonaws/services/sqs/internal\" />\n+ </exports>\n+ </module>\n+ <module name=\"org.slf4j\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n+ <module name=\"com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"org.apache.camel.core\" />\n+ <module name=\"org.apache.commons.codec\" />\n+ <module name=\"org.apache.commons.logging\" />\n+ <module name=\"org.apache.httpcomponents\" slot=\"4.5.2\" />\n+ <module name=\"org.joda.time\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<module name=\"org.apache.camel.component.amqp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.atom\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.avro\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.aws\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.barcode\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.base64\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.beanio\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/pom.xml",
"new_path": "itests/camel/pom.xml",
"diff": "<dependency>\n<groupId>org.wildfly.camel</groupId>\n<artifactId>wildfly-camel-subsystem-core</artifactId>\n- <version>${project.version}</version>\n</dependency>\n<dependency>\n<groupId>org.wildfly.camel</groupId>\n<artifactId>wildfly-camel-itests-common</artifactId>\n- <version>${project.version}</version>\n+ </dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-aws</artifactId>\n</dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/ec2/S3IntegrationTest.java",
"diff": "+package org.wildfly.camel.test.aws.ec2;\n+\n+import java.util.HashMap;\n+import java.util.Map;\n+\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.s3.S3Constants;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.auth.AWSCredentials;\n+import com.amazonaws.auth.AWSCredentialsProvider;\n+import com.amazonaws.auth.BasicAWSCredentials;\n+import com.amazonaws.services.s3.AmazonS3;\n+import com.amazonaws.services.s3.AmazonS3ClientBuilder;\n+\n+/*\n+ Create the test bucket\n+ $ aws s3 mb s3://wfc-test\n+\n+ Assign this bucket policy\n+ {\n+ \"Version\": \"2012-10-17\",\n+ \"Statement\": [\n+ {\n+ \"Effect\": \"Allow\",\n+ \"Principal\": \"*\",\n+ \"Action\": [\n+ \"s3:DeleteObject\",\n+ \"s3:GetObject\",\n+ \"s3:PutObject\"\n+ ],\n+ \"Resource\": \"arn:aws:s3:::wfc-test/*\"\n+ }\n+ ]\n+ }\n+*/\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class S3IntegrationTest {\n+\n+ static final String OBJECT_KEY = \"content.txt\";\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ return ShrinkWrap.create(JavaArchive.class, \"aws-s3-tests\");\n+ }\n+\n+ @Test\n+ public void testBucketOperations() throws Exception {\n+\n+ String accessId = System.getenv(\"AWSAccessId\");\n+ String secretKey = System.getenv(\"AWSSecretKey\");\n+ Assume.assumeNotNull(\"AWSAccessId not null\", accessId);\n+ Assume.assumeNotNull(\"AWSSecretKey not null\", secretKey);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ String clientref = \"amazonS3Client=#s3Client\";\n+ from(\"direct:upload\").to(\"aws-s3://wfc-test?\" + clientref);\n+ }\n+ });\n+\n+ AmazonS3 client = AmazonS3ClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .build();\n+\n+ camelctx.getNamingContext().bind(\"s3Client\", client);\n+\n+ camelctx.start();\n+ try {\n+\n+ // Put object\n+ Map<String, Object> headers = new HashMap<>();\n+ headers.put(S3Constants.KEY, OBJECT_KEY);\n+\n+ ProducerTemplate template = camelctx.createProducerTemplate();\n+ String content = \"My bucket content\";\n+ String result = template.requestBodyAndHeaders(\"direct:upload\", content, headers, String.class);\n+ Assert.assertEquals(content, result);\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+\n+ // Delete Object\n+ client.deleteObject(\"wfc-test\", OBJECT_KEY);\n+ }\n+\n+ static class BasicCredentialsProvider implements AWSCredentialsProvider {\n+\n+ final String accessId;\n+ final String secretKey;\n+\n+ BasicCredentialsProvider(String accessId, String secretKey) {\n+ this.accessId = accessId;\n+ this.secretKey = secretKey;\n+ }\n+\n+ @Override\n+ public AWSCredentials getCredentials() {\n+ return new BasicAWSCredentials(accessId, secretKey);\n+ }\n+\n+ @Override\n+ public void refresh() {\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-path-patterns.txt",
"diff": "[includes]\n^ca/uhn/hl7v2(.*)\n+ ^com/amazonaws(.*)\n^com/braintreegateway(.*)\n^com/datastax(.*)\n^com/codahale(.*)\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/main/resources/classloading/exported-paths.txt",
"diff": "@@ -339,6 +339,287 @@ ca/uhn/hl7v2/validation/builder\nca/uhn/hl7v2/validation/builder/support\nca/uhn/hl7v2/validation/impl\nca/uhn/hl7v2/view\n+com/amazonaws\n+com/amazonaws/adapters\n+com/amazonaws/adapters/types\n+com/amazonaws/annotation\n+com/amazonaws/auth\n+com/amazonaws/auth/policy\n+com/amazonaws/auth/policy/actions\n+com/amazonaws/auth/policy/conditions\n+com/amazonaws/auth/policy/resources\n+com/amazonaws/auth/profile\n+com/amazonaws/client\n+com/amazonaws/client/builder\n+com/amazonaws/event\n+com/amazonaws/event/request\n+com/amazonaws/handlers\n+com/amazonaws/jmx\n+com/amazonaws/jmx/spi\n+com/amazonaws/log\n+com/amazonaws/metrics\n+com/amazonaws/partitions\n+com/amazonaws/partitions/model\n+com/amazonaws/profile\n+com/amazonaws/profile/path\n+com/amazonaws/profile/path/config\n+com/amazonaws/profile/path/cred\n+com/amazonaws/protocol\n+com/amazonaws/protocol/json\n+com/amazonaws/regions\n+com/amazonaws/retry\n+com/amazonaws/sdk\n+com/amazonaws/services\n+com/amazonaws/services/apigateway\n+com/amazonaws/services/apigateway/model\n+com/amazonaws/services/apigateway/model/transform\n+com/amazonaws/services/applicationautoscaling\n+com/amazonaws/services/applicationautoscaling/model\n+com/amazonaws/services/applicationautoscaling/model/transform\n+com/amazonaws/services/applicationdiscovery\n+com/amazonaws/services/applicationdiscovery/model\n+com/amazonaws/services/applicationdiscovery/model/transform\n+com/amazonaws/services/autoscaling\n+com/amazonaws/services/autoscaling/model\n+com/amazonaws/services/autoscaling/model/transform\n+com/amazonaws/services/certificatemanager\n+com/amazonaws/services/certificatemanager/model\n+com/amazonaws/services/certificatemanager/model/transform\n+com/amazonaws/services/cloudformation\n+com/amazonaws/services/cloudformation/model\n+com/amazonaws/services/cloudformation/model/transform\n+com/amazonaws/services/cloudfront\n+com/amazonaws/services/cloudfront/model\n+com/amazonaws/services/cloudfront/model/transform\n+com/amazonaws/services/cloudfront/util\n+com/amazonaws/services/cloudhsm\n+com/amazonaws/services/cloudhsm/model\n+com/amazonaws/services/cloudhsm/model/transform\n+com/amazonaws/services/cloudsearchdomain\n+com/amazonaws/services/cloudsearchdomain/model\n+com/amazonaws/services/cloudsearchdomain/model/transform\n+com/amazonaws/services/cloudsearchv2\n+com/amazonaws/services/cloudsearchv2/model\n+com/amazonaws/services/cloudsearchv2/model/transform\n+com/amazonaws/services/cloudtrail\n+com/amazonaws/services/cloudtrail/model\n+com/amazonaws/services/cloudtrail/model/transform\n+com/amazonaws/services/cloudwatch\n+com/amazonaws/services/cloudwatch/model\n+com/amazonaws/services/cloudwatch/model/transform\n+com/amazonaws/services/cloudwatchevents\n+com/amazonaws/services/cloudwatchevents/model\n+com/amazonaws/services/cloudwatchevents/model/transform\n+com/amazonaws/services/codecommit\n+com/amazonaws/services/codecommit/model\n+com/amazonaws/services/codecommit/model/transform\n+com/amazonaws/services/codedeploy\n+com/amazonaws/services/codedeploy/model\n+com/amazonaws/services/codedeploy/model/transform\n+com/amazonaws/services/codepipeline\n+com/amazonaws/services/codepipeline/model\n+com/amazonaws/services/codepipeline/model/transform\n+com/amazonaws/services/cognitoidentity\n+com/amazonaws/services/cognitoidentity/model\n+com/amazonaws/services/cognitoidentity/model/transform\n+com/amazonaws/services/cognitoidp\n+com/amazonaws/services/cognitoidp/model\n+com/amazonaws/services/cognitoidp/model/transform\n+com/amazonaws/services/cognitosync\n+com/amazonaws/services/cognitosync/model\n+com/amazonaws/services/cognitosync/model/transform\n+com/amazonaws/services/config\n+com/amazonaws/services/config/model\n+com/amazonaws/services/config/model/transform\n+com/amazonaws/services/databasemigrationservice\n+com/amazonaws/services/databasemigrationservice/model\n+com/amazonaws/services/databasemigrationservice/model/transform\n+com/amazonaws/services/datapipeline\n+com/amazonaws/services/datapipeline/model\n+com/amazonaws/services/datapipeline/model/transform\n+com/amazonaws/services/devicefarm\n+com/amazonaws/services/devicefarm/model\n+com/amazonaws/services/devicefarm/model/transform\n+com/amazonaws/services/directconnect\n+com/amazonaws/services/directconnect/model\n+com/amazonaws/services/directconnect/model/transform\n+com/amazonaws/services/directory\n+com/amazonaws/services/directory/model\n+com/amazonaws/services/directory/model/transform\n+com/amazonaws/services/dynamodbv2\n+com/amazonaws/services/dynamodbv2/datamodeling\n+com/amazonaws/services/dynamodbv2/datamodeling/marshallers\n+com/amazonaws/services/dynamodbv2/datamodeling/unmarshallers\n+com/amazonaws/services/dynamodbv2/document\n+com/amazonaws/services/dynamodbv2/document/api\n+com/amazonaws/services/dynamodbv2/document/spec\n+com/amazonaws/services/dynamodbv2/document/utils\n+com/amazonaws/services/dynamodbv2/metrics\n+com/amazonaws/services/dynamodbv2/model\n+com/amazonaws/services/dynamodbv2/model/transform\n+com/amazonaws/services/dynamodbv2/util\n+com/amazonaws/services/dynamodbv2/xspec\n+com/amazonaws/services/ec2\n+com/amazonaws/services/ec2/model\n+com/amazonaws/services/ec2/model/transform\n+com/amazonaws/services/ec2/util\n+com/amazonaws/services/ecr\n+com/amazonaws/services/ecr/model\n+com/amazonaws/services/ecr/model/transform\n+com/amazonaws/services/ecs\n+com/amazonaws/services/ecs/model\n+com/amazonaws/services/ecs/model/transform\n+com/amazonaws/services/elasticache\n+com/amazonaws/services/elasticache/model\n+com/amazonaws/services/elasticache/model/transform\n+com/amazonaws/services/elasticbeanstalk\n+com/amazonaws/services/elasticbeanstalk/model\n+com/amazonaws/services/elasticbeanstalk/model/transform\n+com/amazonaws/services/elasticfilesystem\n+com/amazonaws/services/elasticfilesystem/model\n+com/amazonaws/services/elasticfilesystem/model/transform\n+com/amazonaws/services/elasticloadbalancing\n+com/amazonaws/services/elasticloadbalancing/model\n+com/amazonaws/services/elasticloadbalancing/model/transform\n+com/amazonaws/services/elasticmapreduce\n+com/amazonaws/services/elasticmapreduce/model\n+com/amazonaws/services/elasticmapreduce/model/transform\n+com/amazonaws/services/elasticmapreduce/spi\n+com/amazonaws/services/elasticmapreduce/spi/security\n+com/amazonaws/services/elasticmapreduce/util\n+com/amazonaws/services/elasticsearch\n+com/amazonaws/services/elasticsearch/model\n+com/amazonaws/services/elasticsearch/model/transform\n+com/amazonaws/services/elastictranscoder\n+com/amazonaws/services/elastictranscoder/model\n+com/amazonaws/services/elastictranscoder/model/transform\n+com/amazonaws/services/gamelift\n+com/amazonaws/services/gamelift/model\n+com/amazonaws/services/gamelift/model/transform\n+com/amazonaws/services/glacier\n+com/amazonaws/services/glacier/model\n+com/amazonaws/services/glacier/model/transform\n+com/amazonaws/services/glacier/transfer\n+com/amazonaws/services/identitymanagement\n+com/amazonaws/services/identitymanagement/model\n+com/amazonaws/services/identitymanagement/model/transform\n+com/amazonaws/services/importexport\n+com/amazonaws/services/importexport/model\n+com/amazonaws/services/importexport/model/transform\n+com/amazonaws/services/inspector\n+com/amazonaws/services/inspector/model\n+com/amazonaws/services/inspector/model/transform\n+com/amazonaws/services/iot\n+com/amazonaws/services/iot/model\n+com/amazonaws/services/iot/model/transform\n+com/amazonaws/services/iotdata\n+com/amazonaws/services/iotdata/model\n+com/amazonaws/services/iotdata/model/transform\n+com/amazonaws/services/kinesis\n+com/amazonaws/services/kinesis/model\n+com/amazonaws/services/kinesis/model/transform\n+com/amazonaws/services/kinesisfirehose\n+com/amazonaws/services/kinesisfirehose/model\n+com/amazonaws/services/kinesisfirehose/model/transform\n+com/amazonaws/services/kms\n+com/amazonaws/services/kms/model\n+com/amazonaws/services/kms/model/transform\n+com/amazonaws/services/lambda\n+com/amazonaws/services/lambda/invoke\n+com/amazonaws/services/lambda/model\n+com/amazonaws/services/lambda/model/transform\n+com/amazonaws/services/logs\n+com/amazonaws/services/logs/model\n+com/amazonaws/services/logs/model/transform\n+com/amazonaws/services/machinelearning\n+com/amazonaws/services/machinelearning/model\n+com/amazonaws/services/machinelearning/model/transform\n+com/amazonaws/services/marketplacecommerceanalytics\n+com/amazonaws/services/marketplacecommerceanalytics/model\n+com/amazonaws/services/marketplacecommerceanalytics/model/transform\n+com/amazonaws/services/marketplacemetering\n+com/amazonaws/services/marketplacemetering/model\n+com/amazonaws/services/marketplacemetering/model/transform\n+com/amazonaws/services/opsworks\n+com/amazonaws/services/opsworks/model\n+com/amazonaws/services/opsworks/model/transform\n+com/amazonaws/services/rds\n+com/amazonaws/services/rds/model\n+com/amazonaws/services/rds/model/transform\n+com/amazonaws/services/redshift\n+com/amazonaws/services/redshift/model\n+com/amazonaws/services/redshift/model/transform\n+com/amazonaws/services/route53\n+com/amazonaws/services/route53/model\n+com/amazonaws/services/route53/model/transform\n+com/amazonaws/services/route53domains\n+com/amazonaws/services/route53domains/model\n+com/amazonaws/services/route53domains/model/transform\n+com/amazonaws/services/s3\n+com/amazonaws/services/s3/event\n+com/amazonaws/services/s3/iterable\n+com/amazonaws/services/s3/metrics\n+com/amazonaws/services/s3/model\n+com/amazonaws/services/s3/model/transform\n+com/amazonaws/services/s3/request\n+com/amazonaws/services/s3/transfer\n+com/amazonaws/services/s3/transfer/exception\n+com/amazonaws/services/s3/transfer/model\n+com/amazonaws/services/securitytoken\n+com/amazonaws/services/securitytoken/model\n+com/amazonaws/services/securitytoken/model/transform\n+com/amazonaws/services/servicecatalog\n+com/amazonaws/services/servicecatalog/model\n+com/amazonaws/services/servicecatalog/model/transform\n+com/amazonaws/services/simpledb\n+com/amazonaws/services/simpledb/model\n+com/amazonaws/services/simpledb/model/transform\n+com/amazonaws/services/simpledb/util\n+com/amazonaws/services/simpleemail\n+com/amazonaws/services/simpleemail/model\n+com/amazonaws/services/simpleemail/model/transform\n+com/amazonaws/services/simplesystemsmanagement\n+com/amazonaws/services/simplesystemsmanagement/model\n+com/amazonaws/services/simplesystemsmanagement/model/transform\n+com/amazonaws/services/simpleworkflow\n+com/amazonaws/services/simpleworkflow/flow\n+com/amazonaws/services/simpleworkflow/flow/annotations\n+com/amazonaws/services/simpleworkflow/flow/aspectj\n+com/amazonaws/services/simpleworkflow/flow/common\n+com/amazonaws/services/simpleworkflow/flow/core\n+com/amazonaws/services/simpleworkflow/flow/generic\n+com/amazonaws/services/simpleworkflow/flow/interceptors\n+com/amazonaws/services/simpleworkflow/flow/junit\n+com/amazonaws/services/simpleworkflow/flow/junit/spring\n+com/amazonaws/services/simpleworkflow/flow/pojo\n+com/amazonaws/services/simpleworkflow/flow/spring\n+com/amazonaws/services/simpleworkflow/flow/test\n+com/amazonaws/services/simpleworkflow/flow/worker\n+com/amazonaws/services/simpleworkflow/model\n+com/amazonaws/services/simpleworkflow/model/transform\n+com/amazonaws/services/sns\n+com/amazonaws/services/sns/model\n+com/amazonaws/services/sns/model/transform\n+com/amazonaws/services/sns/util\n+com/amazonaws/services/sqs\n+com/amazonaws/services/sqs/buffered\n+com/amazonaws/services/sqs/model\n+com/amazonaws/services/sqs/model/transform\n+com/amazonaws/services/storagegateway\n+com/amazonaws/services/storagegateway/model\n+com/amazonaws/services/storagegateway/model/transform\n+com/amazonaws/services/support\n+com/amazonaws/services/support/model\n+com/amazonaws/services/support/model/transform\n+com/amazonaws/services/waf\n+com/amazonaws/services/waf/model\n+com/amazonaws/services/waf/model/transform\n+com/amazonaws/services/workspaces\n+com/amazonaws/services/workspaces/model\n+com/amazonaws/services/workspaces/model/transform\n+com/amazonaws/transform\n+com/amazonaws/util\n+com/amazonaws/util/json\ncom/braintreegateway\ncom/braintreegateway/exceptions\ncom/braintreegateway/org\n@@ -594,6 +875,19 @@ org/apache/camel/component\norg/apache/camel/component/amqp\norg/apache/camel/component/atom\norg/apache/camel/component/avro\n+org/apache/camel/component/aws\n+org/apache/camel/component/aws/common\n+org/apache/camel/component/aws/cw\n+org/apache/camel/component/aws/ddb\n+org/apache/camel/component/aws/ddbstream\n+org/apache/camel/component/aws/ec2\n+org/apache/camel/component/aws/kinesis\n+org/apache/camel/component/aws/s3\n+org/apache/camel/component/aws/sdb\n+org/apache/camel/component/aws/ses\n+org/apache/camel/component/aws/sns\n+org/apache/camel/component/aws/sqs\n+org/apache/camel/component/aws/swf\norg/apache/camel/component/bean\norg/apache/camel/component/bean/validator\norg/apache/camel/component/braintree\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/args4j/main/args4j-2.0.31.jar\n+/com/amazon/aws/main/aws-java-sdk-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-acm-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-api-gateway-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-applicationautoscaling-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-autoscaling-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudformation-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudfront-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudhsm-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudsearch-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudtrail-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudwatch-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cloudwatchmetrics-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-codecommit-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-codedeploy-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-codepipeline-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cognitoidentity-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cognitoidp-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-cognitosync-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-config-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-core-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-datapipeline-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-devicefarm-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-directconnect-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-directory-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-discovery-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-dms-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-dynamodb-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-ec2-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-ecr-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-ecs-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-efs-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-elasticache-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-elasticbeanstalk-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-elasticloadbalancing-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-elasticsearch-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-elastictranscoder-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-emr-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-events-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-gamelift-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-glacier-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-iam-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-importexport-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-inspector-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-iot-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-kinesis-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-kms-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-lambda-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-logs-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-machinelearning-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-marketplacecommerceanalytics-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-marketplacemeteringservice-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-opsworks-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-rds-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-redshift-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-route53-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-s3-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-servicecatalog-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-ses-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-simpledb-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-simpleworkflow-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-sns-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-sqs-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-ssm-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-storagegateway-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-sts-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-support-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-swf-libraries-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-waf-1.11.18.jar\n+/com/amazon/aws/main/aws-java-sdk-workspaces-1.11.18.jar\n/com/fasterxml/jackson/dataformat/cbor/main/jackson-dataformat-cbor-2.7.4.jar\n/com/fasterxml/jackson/dataformat/smile/main/jackson-dataformat-smile-2.7.4.jar\n/com/fasterxml/jackson/dataformat/xml/main/jackson-dataformat-xml-2.7.4.jar\n/org/apache/camel/component/amqp/main/camel-amqp-2.18.3.jar\n/org/apache/camel/component/atom/main/camel-atom-2.18.3.jar\n/org/apache/camel/component/avro/main/camel-avro-2.18.3.jar\n+/org/apache/camel/component/aws/main/camel-aws-2.18.3.jar\n/org/apache/camel/component/barcode/main/camel-barcode-2.18.3.jar\n/org/apache/camel/component/barcode/main/core-3.2.1.jar\n/org/apache/camel/component/barcode/main/javase-3.2.1.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1413] Add support for component aws-s3
|
734,358 |
13.04.2017 20:28:39
| -7,200 |
f4c4dafeb33a2e8d8b4bd95265e2aeed0feaa4c5
|
[resolves Create and remove S3 bucket on demand
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/ec2/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/ec2/S3IntegrationTest.java",
"diff": "@@ -23,31 +23,11 @@ import com.amazonaws.auth.BasicAWSCredentials;\nimport com.amazonaws.services.s3.AmazonS3;\nimport com.amazonaws.services.s3.AmazonS3ClientBuilder;\n-/*\n- Create the test bucket\n- $ aws s3 mb s3://wfc-test\n-\n- Assign this bucket policy\n- {\n- \"Version\": \"2012-10-17\",\n- \"Statement\": [\n- {\n- \"Effect\": \"Allow\",\n- \"Principal\": \"*\",\n- \"Action\": [\n- \"s3:DeleteObject\",\n- \"s3:GetObject\",\n- \"s3:PutObject\"\n- ],\n- \"Resource\": \"arn:aws:s3:::wfc-test/*\"\n- }\n- ]\n- }\n-*/\n@CamelAware\n@RunWith(Arquillian.class)\npublic class S3IntegrationTest {\n+ static final String BUCKET_NAME = \"wfc-aws-s3-bucket\";\nstatic final String OBJECT_KEY = \"content.txt\";\n@Deployment\n@@ -68,7 +48,7 @@ public class S3IntegrationTest {\n@Override\npublic void configure() throws Exception {\nString clientref = \"amazonS3Client=#s3Client\";\n- from(\"direct:upload\").to(\"aws-s3://wfc-test?\" + clientref);\n+ from(\"direct:upload\").to(\"aws-s3://\" + BUCKET_NAME + \"?\" + clientref);\n}\n});\n@@ -78,6 +58,8 @@ public class S3IntegrationTest {\ncamelctx.getNamingContext().bind(\"s3Client\", client);\n+ client.createBucket(BUCKET_NAME);\n+ try {\ncamelctx.start();\ntry {\n@@ -93,9 +75,10 @@ public class S3IntegrationTest {\n} finally {\ncamelctx.stop();\n}\n-\n- // Delete Object\n- client.deleteObject(\"wfc-test\", OBJECT_KEY);\n+ } finally {\n+ client.deleteObject(BUCKET_NAME, OBJECT_KEY);\n+ client.deleteBucket(BUCKET_NAME);\n+ }\n}\nstatic class BasicCredentialsProvider implements AWSCredentialsProvider {\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1745] Create and remove S3 bucket on demand
|
734,358 |
14.04.2017 12:27:22
| -7,200 |
b8791981f6fbb37ede13caea0746693460d77fff
|
[resolves Unable to load region information for S3 client
|
[
{
"change_type": "RENAME",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/ec2/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"diff": "-package org.wildfly.camel.test.aws.ec2;\n+package org.wildfly.camel.test.aws;\nimport java.util.HashMap;\nimport java.util.Map;\n+import org.apache.camel.ConsumerTemplate;\nimport org.apache.camel.ProducerTemplate;\nimport org.apache.camel.builder.RouteBuilder;\nimport org.apache.camel.component.aws.s3.S3Constants;\n@@ -49,11 +50,13 @@ public class S3IntegrationTest {\npublic void configure() throws Exception {\nString clientref = \"amazonS3Client=#s3Client\";\nfrom(\"direct:upload\").to(\"aws-s3://\" + BUCKET_NAME + \"?\" + clientref);\n+ from(\"aws-s3://\" + BUCKET_NAME + \"?\" + clientref).to(\"seda:read\");\n}\n});\nAmazonS3 client = AmazonS3ClientBuilder.standard()\n.withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n.build();\ncamelctx.getNamingContext().bind(\"s3Client\", client);\n@@ -67,11 +70,14 @@ public class S3IntegrationTest {\nMap<String, Object> headers = new HashMap<>();\nheaders.put(S3Constants.KEY, OBJECT_KEY);\n- ProducerTemplate template = camelctx.createProducerTemplate();\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\nString content = \"My bucket content\";\n- String result = template.requestBodyAndHeaders(\"direct:upload\", content, headers, String.class);\n- Assert.assertEquals(content, result);\n+ String result1 = producer.requestBodyAndHeaders(\"direct:upload\", content, headers, String.class);\n+ Assert.assertEquals(content, result1);\n+ ConsumerTemplate consumer = camelctx.createConsumerTemplate();\n+ String result2 = consumer.receiveBody(\"seda:read\", String.class);\n+ Assert.assertEquals(content, result2);\n} finally {\ncamelctx.stop();\n}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1747] Unable to load region information for S3 client
|
734,358 |
27.04.2017 15:07:00
| -7,200 |
523d2b74ed1cf56bac1794f01ebc174472523a79
|
[resolves Add support for component aws-ddb
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-ddb.adoc",
"diff": "+### camel-aws-ddb\n+\n+The http://camel.apache.org/aws-ddb.html[AWS DynamoDB,window=_blank] component supports supports storing and retrieving data from/to http://aws.amazon.com/dynamodb[Amazon's DynamoDB,window=_blank] service.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -10,6 +10,8 @@ include::camel-atom.adoc[]\ninclude::camel-avro.adoc[]\n+include::camel-aws-ddb.adoc[]\n+\ninclude::camel-aws-s3.adoc[]\ninclude::camel-bean-validator.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/pom.xml",
"new_path": "itests/standalone/extra/pom.xml",
"diff": "</goals>\n<configuration>\n<target>\n- <replace file=\"${jboss.home}/standalone/configuration/standalone.xml\">\n- <replacetoken><![CDATA[</security-domains>]]></replacetoken>\n+ <replace file=\"${jboss.home}/standalone/configuration/${server.config}\">\n+ <replacetoken><![CDATA[<security-domain name=\"hawtio-domain\"]]></replacetoken>\n<replacevalue><![CDATA[\n<security-domain name=\"user-domain\" cache-type=\"default\">\n<authentication>\n</login-module>\n</authentication>\n</security-domain>\n- </security-domains>]]></replacevalue>\n+ <security-domain name=\"hawtio-domain\"]]></replacevalue>\n</replace>\n</target>\n</configuration>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"diff": "+package org.wildfly.camel.test.aws;\n+\n+import java.util.Arrays;\n+import java.util.HashMap;\n+import java.util.HashSet;\n+import java.util.List;\n+import java.util.Map;\n+\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.ExchangeBuilder;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.ddb.DdbConstants;\n+import org.apache.camel.component.aws.ddb.DdbOperations;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.After;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Before;\n+import org.junit.Ignore;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\n+import org.wildfly.camel.test.aws.subA.CatalogItem;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;\n+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;\n+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;\n+import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;\n+import com.amazonaws.services.dynamodbv2.model.AttributeValue;\n+import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;\n+import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;\n+import com.amazonaws.services.dynamodbv2.model.KeyType;\n+import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;\n+import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;\n+import com.amazonaws.services.dynamodbv2.model.TableDescription;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class DynamoDBIntegrationTest {\n+\n+ static final String TABLE_NAME = \"ProductCatalog\";\n+\n+ private AmazonDynamoDB client;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ddb-tests\");\n+ archive.addClasses(BasicCredentialsProvider.class, CatalogItem.class);\n+ return archive;\n+ }\n+\n+ @Before\n+ public void before() throws Exception {\n+\n+ String accessId = System.getenv(\"AWSAccessId\");\n+ String secretKey = System.getenv(\"AWSSecretKey\");\n+ Assume.assumeNotNull(\"AWSAccessId not null\", accessId);\n+ Assume.assumeNotNull(\"AWSSecretKey not null\", secretKey);\n+\n+ client = AmazonDynamoDBClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+\n+ TableDescription createTable = createTable(client);\n+ Assert.assertEquals(\"ACTIVE\", createTable.getTableStatus());\n+ }\n+\n+ @After\n+ public void after() throws Exception {\n+ deleteTable(client);\n+ }\n+\n+ @Test\n+ @Ignore(\"[#1778] Add support for DynamoDB mapper\")\n+ public void testMapperOperations() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", client);\n+ DynamoDBMapper mapper = new DynamoDBMapper(client);\n+\n+ CatalogItem item = new CatalogItem();\n+ item.setId(102);\n+ item.setTitle(\"Book 102 Title\");\n+ item.setISBN(\"222-2222222222\");\n+ item.setBookAuthors(new HashSet<String>(Arrays.asList(\"Author 1\", \"Author 2\")));\n+ item.setSomeProp(\"Test\");\n+\n+ mapper.save(item);\n+\n+ item = new CatalogItem();\n+ item.setId(102);\n+\n+ DynamoDBQueryExpression<CatalogItem> exp = new DynamoDBQueryExpression<CatalogItem>().withHashKeyValues(item);\n+\n+ List<CatalogItem> result = mapper.query(CatalogItem.class, exp);\n+ Assert.assertEquals(1, result.size());\n+ Assert.assertEquals(new Integer(102), result.get(0).getId());\n+ Assert.assertEquals(\"Book 102 Title\", result.get(0).getTitle());\n+ }\n+\n+ @Test\n+ public void testKeyValueOperations() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", client);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"ddbClient\", client);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:start\").to(\"aws-ddb://\" + TABLE_NAME + \"?amazonDDBClient=#ddbClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ HashMap<String, AttributeValue> item = new HashMap<>();\n+ item.put(\"Id\", new AttributeValue().withN(\"103\"));\n+ item.put(\"Title\", new AttributeValue().withS(\"Book 103 Title\"));\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+\n+ Exchange exchange = new ExchangeBuilder(camelctx)\n+ .withHeader(DdbConstants.OPERATION, DdbOperations.PutItem)\n+ .withHeader(DdbConstants.ITEM, item).build();\n+\n+ producer.send(\"direct:start\", exchange);\n+\n+ HashMap<String, AttributeValue> key = new HashMap<>();\n+ key.put(\"Id\", new AttributeValue().withN(\"103\"));\n+\n+ exchange = new ExchangeBuilder(camelctx)\n+ .withHeader(DdbConstants.OPERATION, DdbOperations.GetItem)\n+ .withHeader(DdbConstants.KEY, key).build();\n+\n+ producer.send(\"direct:start\", exchange);\n+ Map<?, ?> result = exchange.getIn().getHeader(DdbConstants.ATTRIBUTES, Map.class);\n+ Assert.assertEquals(\"Book 103 Title\", ((AttributeValue) result.get(\"Title\")).getS());\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ private static TableDescription createTable(AmazonDynamoDB client) throws InterruptedException {\n+\n+ CreateTableRequest tableReq = new CreateTableRequest().withTableName(TABLE_NAME)\n+ .withKeySchema(new KeySchemaElement(\"Id\", KeyType.HASH))\n+ .withAttributeDefinitions(new AttributeDefinition(\"Id\", ScalarAttributeType.N))\n+ .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L));\n+\n+ return awaitStatus(client, client.createTable(tableReq).getTableDescription(), \"ACTIVE\");\n+ }\n+\n+ private static void deleteTable(AmazonDynamoDB client) throws InterruptedException {\n+ TableDescription description = client.describeTable(TABLE_NAME).getTable();\n+ awaitStatus(client, description, \"ACTIVE\");\n+ client.deleteTable(TABLE_NAME);\n+ }\n+\n+ private static TableDescription awaitStatus(AmazonDynamoDB client, TableDescription description, String status) throws InterruptedException {\n+ int retries = 20;\n+ while (--retries > 0 && !description.getTableStatus().equals(status)) {\n+ Thread.sleep(500);\n+ description = client.describeTable(TABLE_NAME).getTable();\n+ }\n+ return description;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"diff": "@@ -11,16 +11,16 @@ import org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.After;\nimport org.junit.Assert;\nimport org.junit.Assume;\n+import org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\n-import com.amazonaws.auth.AWSCredentials;\n-import com.amazonaws.auth.AWSCredentialsProvider;\n-import com.amazonaws.auth.BasicAWSCredentials;\nimport com.amazonaws.services.s3.AmazonS3;\nimport com.amazonaws.services.s3.AmazonS3ClientBuilder;\n@@ -31,19 +31,41 @@ public class S3IntegrationTest {\nstatic final String BUCKET_NAME = \"wfc-aws-s3-bucket\";\nstatic final String OBJECT_KEY = \"content.txt\";\n+ private AmazonS3 client;\n+\n@Deployment\npublic static JavaArchive deployment() {\n- return ShrinkWrap.create(JavaArchive.class, \"aws-s3-tests\");\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-s3-tests\");\n+ archive.addClasses(BasicCredentialsProvider.class);\n+ return archive;\n}\n- @Test\n- public void testBucketOperations() throws Exception {\n+ @Before\n+ public void before() throws Exception {\nString accessId = System.getenv(\"AWSAccessId\");\nString secretKey = System.getenv(\"AWSSecretKey\");\nAssume.assumeNotNull(\"AWSAccessId not null\", accessId);\nAssume.assumeNotNull(\"AWSSecretKey not null\", secretKey);\n+ client = AmazonS3ClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+\n+ client.createBucket(BUCKET_NAME);\n+ }\n+\n+ @After\n+ public void after() throws Exception {\n+ client.deleteBucket(BUCKET_NAME);\n+ }\n+\n+ @Test\n+ public void testBucketOperations() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", client);\n+\nWildFlyCamelContext camelctx = new WildFlyCamelContext();\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\n@@ -53,15 +75,8 @@ public class S3IntegrationTest {\nfrom(\"aws-s3://\" + BUCKET_NAME + \"?\" + clientref).to(\"seda:read\");\n}\n});\n-\n- AmazonS3 client = AmazonS3ClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n- .withRegion(\"eu-west-1\")\n- .build();\n-\ncamelctx.getNamingContext().bind(\"s3Client\", client);\n- client.createBucket(BUCKET_NAME);\ntry {\ncamelctx.start();\ntry {\n@@ -83,27 +98,6 @@ public class S3IntegrationTest {\n}\n} finally {\nclient.deleteObject(BUCKET_NAME, OBJECT_KEY);\n- client.deleteBucket(BUCKET_NAME);\n- }\n- }\n-\n- static class BasicCredentialsProvider implements AWSCredentialsProvider {\n-\n- final String accessId;\n- final String secretKey;\n-\n- BasicCredentialsProvider(String accessId, String secretKey) {\n- this.accessId = accessId;\n- this.secretKey = secretKey;\n- }\n-\n- @Override\n- public AWSCredentials getCredentials() {\n- return new BasicAWSCredentials(accessId, secretKey);\n- }\n-\n- @Override\n- public void refresh() {\n}\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/BasicCredentialsProvider.java",
"diff": "+package org.wildfly.camel.test.aws.subA;\n+\n+import com.amazonaws.auth.AWSCredentials;\n+import com.amazonaws.auth.AWSCredentialsProvider;\n+import com.amazonaws.auth.BasicAWSCredentials;\n+\n+public class BasicCredentialsProvider implements AWSCredentialsProvider {\n+\n+ final String accessId;\n+ final String secretKey;\n+\n+ public BasicCredentialsProvider(String accessId, String secretKey) {\n+ this.accessId = accessId;\n+ this.secretKey = secretKey;\n+ }\n+\n+ @Override\n+ public AWSCredentials getCredentials() {\n+ return new BasicAWSCredentials(accessId, secretKey);\n+ }\n+\n+ @Override\n+ public void refresh() {\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/CatalogItem.java",
"diff": "+package org.wildfly.camel.test.aws.subA;\n+\n+import java.util.Set;\n+\n+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBAttribute;\n+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBHashKey;\n+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBIgnore;\n+import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBTable;\n+\n+@DynamoDBTable(tableName=\"ProductCatalog\")\n+public class CatalogItem {\n+\n+ private Integer id;\n+ private String title;\n+ private String ISBN;\n+ private Set<String> bookAuthors;\n+ private String someProp;\n+\n+ @DynamoDBHashKey(attributeName=\"Id\")\n+ public Integer getId() { return id;}\n+ public void setId(Integer id) {this.id = id;}\n+\n+ @DynamoDBAttribute(attributeName=\"Title\")\n+ public String getTitle() {return title; }\n+ public void setTitle(String title) { this.title = title; }\n+\n+ @DynamoDBAttribute(attributeName=\"ISBN\")\n+ public String getISBN() { return ISBN; }\n+ public void setISBN(String ISBN) { this.ISBN = ISBN; }\n+\n+ @DynamoDBAttribute(attributeName = \"Authors\")\n+ public Set<String> getBookAuthors() { return bookAuthors; }\n+ public void setBookAuthors(Set<String> bookAuthors) { this.bookAuthors = bookAuthors; }\n+\n+ @DynamoDBIgnore\n+ public String getSomeProp() { return someProp;}\n+ public void setSomeProp(String someProp) {this.someProp = someProp;}\n+}\n\\ No newline at end of file\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1409] Add support for component aws-ddb
|
734,358 |
28.04.2017 10:53:05
| -7,200 |
7cdb61d28378422a467fbad16c4dfea32f8b4457
|
[resolves AWS test fail when respective clients cannot be initialized
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"diff": "@@ -6,6 +6,8 @@ import java.util.HashSet;\nimport java.util.List;\nimport java.util.Map;\n+import javax.inject.Inject;\n+\nimport org.apache.camel.Exchange;\nimport org.apache.camel.ProducerTemplate;\nimport org.apache.camel.builder.ExchangeBuilder;\n@@ -15,74 +17,49 @@ import org.apache.camel.component.aws.ddb.DdbOperations;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\n-import org.junit.After;\nimport org.junit.Assert;\nimport org.junit.Assume;\n-import org.junit.Before;\nimport org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\nimport org.wildfly.camel.test.aws.subA.CatalogItem;\n+import org.wildfly.camel.test.aws.subA.DynamoDBClientProducer;\n+import org.wildfly.camel.test.aws.subA.DynamoDBClientProducer.AWSClientProvider;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\n-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;\n-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;\nimport com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;\nimport com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;\n-import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;\nimport com.amazonaws.services.dynamodbv2.model.AttributeValue;\n-import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;\n-import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;\n-import com.amazonaws.services.dynamodbv2.model.KeyType;\n-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;\n-import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;\n-import com.amazonaws.services.dynamodbv2.model.TableDescription;\n@CamelAware\n@RunWith(Arquillian.class)\npublic class DynamoDBIntegrationTest {\n- static final String TABLE_NAME = \"ProductCatalog\";\n+ public static final String TABLE_NAME = \"ProductCatalog\";\n- private AmazonDynamoDB client;\n+ @Inject\n+ private AWSClientProvider provider;\n@Deployment\npublic static JavaArchive deployment() {\n- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ddb-tests\");\n- archive.addClasses(BasicCredentialsProvider.class, CatalogItem.class);\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ddb-tests.jar\");\n+ archive.addClasses(DynamoDBClientProducer.class, BasicCredentialsProvider.class, CatalogItem.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\nreturn archive;\n}\n- @Before\n- public void before() throws Exception {\n-\n- String accessId = System.getenv(\"AWSAccessId\");\n- String secretKey = System.getenv(\"AWSSecretKey\");\n- Assume.assumeNotNull(\"AWSAccessId not null\", accessId);\n- Assume.assumeNotNull(\"AWSSecretKey not null\", secretKey);\n-\n- client = AmazonDynamoDBClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n- .withRegion(\"eu-west-1\")\n- .build();\n-\n- TableDescription createTable = createTable(client);\n- Assert.assertEquals(\"ACTIVE\", createTable.getTableStatus());\n- }\n-\n- @After\n- public void after() throws Exception {\n- deleteTable(client);\n- }\n-\n@Test\n@Ignore(\"[#1778] Add support for DynamoDB mapper\")\npublic void testMapperOperations() throws Exception {\n+ AmazonDynamoDBClient client = provider.getClient();\nAssume.assumeNotNull(\"AWS client not null\", client);\n+\nDynamoDBMapper mapper = new DynamoDBMapper(client);\nCatalogItem item = new CatalogItem();\n@@ -108,6 +85,7 @@ public class DynamoDBIntegrationTest {\n@Test\npublic void testKeyValueOperations() throws Exception {\n+ AmazonDynamoDBClient client = provider.getClient();\nAssume.assumeNotNull(\"AWS client not null\", client);\nWildFlyCamelContext camelctx = new WildFlyCamelContext();\n@@ -149,29 +127,4 @@ public class DynamoDBIntegrationTest {\ncamelctx.stop();\n}\n}\n-\n- private static TableDescription createTable(AmazonDynamoDB client) throws InterruptedException {\n-\n- CreateTableRequest tableReq = new CreateTableRequest().withTableName(TABLE_NAME)\n- .withKeySchema(new KeySchemaElement(\"Id\", KeyType.HASH))\n- .withAttributeDefinitions(new AttributeDefinition(\"Id\", ScalarAttributeType.N))\n- .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L));\n-\n- return awaitStatus(client, client.createTable(tableReq).getTableDescription(), \"ACTIVE\");\n- }\n-\n- private static void deleteTable(AmazonDynamoDB client) throws InterruptedException {\n- TableDescription description = client.describeTable(TABLE_NAME).getTable();\n- awaitStatus(client, description, \"ACTIVE\");\n- client.deleteTable(TABLE_NAME);\n- }\n-\n- private static TableDescription awaitStatus(AmazonDynamoDB client, TableDescription description, String status) throws InterruptedException {\n- int retries = 20;\n- while (--retries > 0 && !description.getTableStatus().equals(status)) {\n- Thread.sleep(500);\n- description = client.describeTable(TABLE_NAME).getTable();\n- }\n- return description;\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"diff": "@@ -3,6 +3,8 @@ package org.wildfly.camel.test.aws;\nimport java.util.HashMap;\nimport java.util.Map;\n+import javax.inject.Inject;\n+\nimport org.apache.camel.ConsumerTemplate;\nimport org.apache.camel.ProducerTemplate;\nimport org.apache.camel.builder.RouteBuilder;\n@@ -10,60 +12,42 @@ import org.apache.camel.component.aws.s3.S3Constants;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\n-import org.junit.After;\nimport org.junit.Assert;\nimport org.junit.Assume;\n-import org.junit.Before;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\n+import org.wildfly.camel.test.aws.subA.S3ClientProducer;\n+import org.wildfly.camel.test.aws.subA.S3ClientProducer.AWSClientProvider;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\n-import com.amazonaws.services.s3.AmazonS3;\n-import com.amazonaws.services.s3.AmazonS3ClientBuilder;\n+import com.amazonaws.services.s3.AmazonS3Client;\n@CamelAware\n@RunWith(Arquillian.class)\npublic class S3IntegrationTest {\n- static final String BUCKET_NAME = \"wfc-aws-s3-bucket\";\n- static final String OBJECT_KEY = \"content.txt\";\n+ public static final String BUCKET_NAME = \"wfc-aws-s3-bucket\";\n+ public static final String OBJECT_KEY = \"content.txt\";\n- private AmazonS3 client;\n+ @Inject\n+ private AWSClientProvider provider;\n@Deployment\npublic static JavaArchive deployment() {\n- JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-s3-tests\");\n- archive.addClasses(BasicCredentialsProvider.class);\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-s3-tests.jar\");\n+ archive.addClasses(S3ClientProducer.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\nreturn archive;\n}\n- @Before\n- public void before() throws Exception {\n-\n- String accessId = System.getenv(\"AWSAccessId\");\n- String secretKey = System.getenv(\"AWSSecretKey\");\n- Assume.assumeNotNull(\"AWSAccessId not null\", accessId);\n- Assume.assumeNotNull(\"AWSSecretKey not null\", secretKey);\n-\n- client = AmazonS3ClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n- .withRegion(\"eu-west-1\")\n- .build();\n-\n- client.createBucket(BUCKET_NAME);\n- }\n-\n- @After\n- public void after() throws Exception {\n- client.deleteBucket(BUCKET_NAME);\n- }\n-\n@Test\npublic void testBucketOperations() throws Exception {\n+ AmazonS3Client client = provider.getClient();\nAssume.assumeNotNull(\"AWS client not null\", client);\nWildFlyCamelContext camelctx = new WildFlyCamelContext();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/DynamoDBClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Disposes;\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.junit.Assert;\n+import org.wildfly.camel.test.aws.DynamoDBIntegrationTest;\n+\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;\n+import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;\n+import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;\n+import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;\n+import com.amazonaws.services.dynamodbv2.model.KeyType;\n+import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;\n+import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;\n+import com.amazonaws.services.dynamodbv2.model.TableDescription;\n+\n+public class DynamoDBClientProducer {\n+\n+ public class AWSClientProvider {\n+ private final AmazonDynamoDBClient client;\n+ AWSClientProvider(AmazonDynamoDBClient client) {\n+ this.client = client;\n+ }\n+ public AmazonDynamoDBClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public AWSClientProvider getClientProvider() throws Exception {\n+ AmazonDynamoDBClient client = null;\n+ String accessId = System.getenv(\"AWSAccessId\");\n+ String secretKey = System.getenv(\"AWSSecretKey\");\n+ if (accessId != null && secretKey != null) {\n+ client = (AmazonDynamoDBClient) AmazonDynamoDBClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+\n+ TableDescription createTable = createTable(client);\n+ Assert.assertEquals(\"ACTIVE\", createTable.getTableStatus());\n+ }\n+ return new AWSClientProvider(client);\n+ }\n+\n+ public void close(@Disposes AWSClientProvider provider) throws Exception {\n+ if (provider.getClient() != null) {\n+ deleteTable(provider.getClient());\n+ }\n+ }\n+\n+ private TableDescription createTable(AmazonDynamoDB client) throws InterruptedException {\n+\n+ CreateTableRequest tableReq = new CreateTableRequest().withTableName(DynamoDBIntegrationTest.TABLE_NAME)\n+ .withKeySchema(new KeySchemaElement(\"Id\", KeyType.HASH))\n+ .withAttributeDefinitions(new AttributeDefinition(\"Id\", ScalarAttributeType.N))\n+ .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L));\n+\n+ return awaitStatus(client, client.createTable(tableReq).getTableDescription(), \"ACTIVE\");\n+ }\n+\n+ private void deleteTable(AmazonDynamoDB client) throws InterruptedException {\n+ TableDescription description = client.describeTable(DynamoDBIntegrationTest.TABLE_NAME).getTable();\n+ awaitStatus(client, description, \"ACTIVE\");\n+ client.deleteTable(DynamoDBIntegrationTest.TABLE_NAME);\n+ }\n+\n+ private TableDescription awaitStatus(AmazonDynamoDB client, TableDescription description, String status) throws InterruptedException {\n+ int retries = 20;\n+ while (--retries > 0 && !description.getTableStatus().equals(status)) {\n+ Thread.sleep(500);\n+ description = client.describeTable(DynamoDBIntegrationTest.TABLE_NAME).getTable();\n+ }\n+ return description;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/S3ClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Disposes;\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.aws.S3IntegrationTest;\n+\n+import com.amazonaws.services.s3.AmazonS3Client;\n+import com.amazonaws.services.s3.AmazonS3ClientBuilder;\n+\n+public class S3ClientProducer {\n+\n+ public class AWSClientProvider {\n+ private final AmazonS3Client client;\n+ AWSClientProvider(AmazonS3Client client) {\n+ this.client = client;\n+ }\n+ public AmazonS3Client getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public AWSClientProvider getClientProvider() throws Exception {\n+ AmazonS3Client client = null;\n+ String accessId = System.getenv(\"AWSAccessId\");\n+ String secretKey = System.getenv(\"AWSSecretKey\");\n+ if (accessId != null && secretKey != null) {\n+ client = (AmazonS3Client) AmazonS3ClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+\n+ client.createBucket(S3IntegrationTest.BUCKET_NAME);\n+ }\n+ return new AWSClientProvider(client);\n+ }\n+\n+ public void close(@Disposes AWSClientProvider provider) throws Exception {\n+ if (provider.getClient() != null) {\n+ provider.getClient().deleteBucket(S3IntegrationTest.BUCKET_NAME);\n+ }\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1787] AWS test fail when respective clients cannot be initialized
|
734,358 |
03.05.2017 13:05:13
| -7,200 |
63939c8c0cc618e7461ae2a8707f7ca1e95800b6
|
[resolves Add support for component aws-ddbstream
|
[
{
"change_type": "MODIFY",
"old_path": "config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java",
"new_path": "config/src/main/java/org/wildfly/extension/camel/config/WildFlyCamelConfigPlugin.java",
"diff": "@@ -30,7 +30,10 @@ import org.wildfly.extras.config.LayerConfig;\npublic final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n- public static final Namespace NS_DOMAIN = Namespace.getNamespace(\"urn:jboss:domain:4.2\");\n+ public static final Namespace NS_DOMAIN_42 = Namespace.getNamespace(\"urn:jboss:domain:4.2\");\n+\n+ public static final Namespace[] NS_DOMAINS = new Namespace[] { NS_DOMAIN_42 };\n+\npublic static final Namespace NS_CAMEL = Namespace.getNamespace(\"urn:jboss:domain:camel:1.0\");\npublic static final Namespace NS_SECURITY = Namespace.getNamespace(\"urn:jboss:domain:security:1.2\");\n@@ -57,11 +60,11 @@ public final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n}\nprivate static void updateExtension(ConfigContext context, boolean enable) {\n- Element extensions = ConfigSupport.findChildElement(context.getDocument().getRootElement(), \"extensions\", NS_DOMAIN);\n+ Element extensions = ConfigSupport.findChildElement(context.getDocument().getRootElement(), \"extensions\", NS_DOMAINS);\nConfigSupport.assertExists(extensions, \"Did not find the <extensions> element\");\nNamespace namespace = extensions.getNamespace();\n- Element element = ConfigSupport.findElementWithAttributeValue(extensions, \"extension\", \"module\", \"org.wildfly.extension.camel\", NS_DOMAIN);\n+ Element element = ConfigSupport.findElementWithAttributeValue(extensions, \"extension\", \"module\", \"org.wildfly.extension.camel\", NS_DOMAINS);\nif (enable && element == null) {\nextensions.addContent(new Text(\" \"));\nextensions.addContent(new Element(\"extension\", namespace).setAttribute(\"module\", \"org.wildfly.extension.camel\"));\n@@ -75,11 +78,11 @@ public final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n@SuppressWarnings(\"unchecked\")\nprivate static void updateSystemProperties(ConfigContext context, boolean enable) {\nElement rootElement = context.getDocument().getRootElement();\n- Element extensions = ConfigSupport.findChildElement(rootElement, \"extensions\", NS_DOMAIN);\n+ Element extensions = ConfigSupport.findChildElement(rootElement, \"extensions\", NS_DOMAINS);\nConfigSupport.assertExists(extensions, \"Did not find the <extensions> element\");\nNamespace namespace = extensions.getNamespace();\n- Element element = ConfigSupport.findChildElement(rootElement, \"system-properties\", NS_DOMAIN);\n+ Element element = ConfigSupport.findChildElement(rootElement, \"system-properties\", NS_DOMAINS);\nif (element == null) {\nelement = new Element(\"system-properties\", namespace);\nelement.addContent(new Text(\"\\n \"));\n@@ -103,7 +106,7 @@ public final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n}\nprivate static void updateSubsystem(ConfigContext context, boolean enable) {\n- List<Element> profiles = ConfigSupport.findProfileElements(context.getDocument(), new Namespace[] { NS_DOMAIN });\n+ List<Element> profiles = ConfigSupport.findProfileElements(context.getDocument(), NS_DOMAINS );\nfor (Element profile : profiles) {\nElement element = profile.getChild(\"subsystem\", NS_CAMEL);\nif (enable && element == null) {\n@@ -119,7 +122,7 @@ public final class WildFlyCamelConfigPlugin implements ConfigPlugin {\n}\nprivate static void updateSecurityDomain(ConfigContext context, boolean enable) {\n- List<Element> profiles = ConfigSupport.findProfileElements(context.getDocument(), new Namespace[] { NS_DOMAIN });\n+ List<Element> profiles = ConfigSupport.findProfileElements(context.getDocument(), NS_DOMAINS );\nfor (Element profile : profiles) {\nElement security = profile.getChild(\"subsystem\", NS_SECURITY);\nif (security != null) {\n"
},
{
"change_type": "MODIFY",
"old_path": "config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java",
"new_path": "config/src/test/java/org/wildfly/camel/test/config/StandaloneConfigTest.java",
"diff": "package org.wildfly.camel.test.config;\nimport static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_CAMEL;\n-import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN;\n+import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAIN_42;\n+import static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_DOMAINS;\nimport static org.wildfly.extension.camel.config.WildFlyCamelConfigPlugin.NS_SECURITY;\nimport java.io.File;\n@@ -56,15 +57,15 @@ public class StandaloneConfigTest extends ConfigTestSupport {\nplugin.applyStandaloneConfigChange(context, true);\n// Verify extension\n- assertElementWithAttributeValueNotNull(doc.getRootElement(), \"extension\", \"module\", \"org.wildfly.extension.camel\", NS_DOMAIN);\n+ assertElementWithAttributeValueNotNull(doc.getRootElement(), \"extension\", \"module\", \"org.wildfly.extension.camel\", NS_DOMAINS);\n// Verify system-properties\n- Element element = ConfigSupport.findChildElement(doc.getRootElement(), \"system-properties\", NS_DOMAIN);\n+ Element element = ConfigSupport.findChildElement(doc.getRootElement(), \"system-properties\", NS_DOMAINS);\nAssert.assertNotNull(\"system-properties not null\", element);\n- assertElementWithAttributeValueNotNull(element, \"property\", \"name\", \"hawtio.realm\", NS_DOMAIN);\n+ assertElementWithAttributeValueNotNull(element, \"property\", \"name\", \"hawtio.realm\", NS_DOMAINS);\n// Verify camel\n- List<Element> profiles = ConfigSupport.findProfileElements(doc, new Namespace[] { NS_DOMAIN });\n+ List<Element> profiles = ConfigSupport.findProfileElements(doc, NS_DOMAINS );\nAssert.assertEquals(\"One profile\", 1, profiles.size());\nassertElementNotNull(profiles.get(0), \"subsystem\", NS_CAMEL);\n@@ -80,7 +81,7 @@ public class StandaloneConfigTest extends ConfigTestSupport {\nSAXBuilder jdom = new SAXBuilder();\nDocument doc = jdom.build(resurl);\n- doc.getRootElement().getChild(\"extensions\", NS_DOMAIN).setNamespace(Namespace.getNamespace(\"urn:jboss:domain:99.99\"));\n+ doc.getRootElement().getChild(\"extensions\", NS_DOMAIN_42).setNamespace(Namespace.getNamespace(\"urn:jboss:domain:99.99\"));\nFile modifiedConfig = new File(\"target/standalone-modified.xml\");\noutputDocumentContent(doc, new FileOutputStream(modifiedConfig));\n@@ -134,16 +135,16 @@ public class StandaloneConfigTest extends ConfigTestSupport {\nplugin.applyStandaloneConfigChange(context, false);\n// Verify extension removed\n- assertElementWithAttributeValueNull(doc.getRootElement(), \"extension\", \"module\", \"org.wildfly.extension.camel\", NS_DOMAIN);\n+ assertElementWithAttributeValueNull(doc.getRootElement(), \"extension\", \"module\", \"org.wildfly.extension.camel\", NS_DOMAINS);\n// Verify system-properties removed\n- Element element = ConfigSupport.findChildElement(doc.getRootElement(), \"system-properties\", NS_DOMAIN);\n+ Element element = ConfigSupport.findChildElement(doc.getRootElement(), \"system-properties\", NS_DOMAINS);\nAssert.assertNotNull(\"system-properties not null\", element);\n- assertElementWithAttributeValueNull(element, \"property\", \"name\", \"hawtio.realm\", NS_DOMAIN);\n- assertElementWithAttributeValueNull(element, \"property\", \"name\", \"hawtio.offline\", NS_DOMAIN);\n- assertElementWithAttributeValueNull(element, \"property\", \"name\", \"hawtio.authenticationEnabled\", NS_DOMAIN);\n+ assertElementWithAttributeValueNull(element, \"property\", \"name\", \"hawtio.realm\", NS_DOMAINS);\n+ assertElementWithAttributeValueNull(element, \"property\", \"name\", \"hawtio.offline\", NS_DOMAINS);\n+ assertElementWithAttributeValueNull(element, \"property\", \"name\", \"hawtio.authenticationEnabled\", NS_DOMAINS);\n- List<Element> profiles = ConfigSupport.findProfileElements(doc, new Namespace[] { NS_DOMAIN });\n+ List<Element> profiles = ConfigSupport.findProfileElements(doc, NS_DOMAINS );\n// Verify camel removed\nassertElementNull(profiles.get(0), \"subsystem\", NS_CAMEL);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-ddbstream.adoc",
"diff": "+### camel-aws-ddbstream\n+\n+The http://camel.apache.org/aws-ddbstream.html[AWS DynamoDB Stream,window=_blank] component supports receiving messages from http://docs.aws.amazon.com/amazondynamodb/latest/developerguide/Streams.html[Amazon DynamoDB Stream,window=_blank] service.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -12,6 +12,8 @@ include::camel-avro.adoc[]\ninclude::camel-aws-ddb.adoc[]\n+include::camel-aws-ddbstream.adoc[]\n+\ninclude::camel-aws-s3.adoc[]\ninclude::camel-bean-validator.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"diff": "package org.wildfly.camel.test.aws;\nimport java.util.Arrays;\n-import java.util.HashMap;\nimport java.util.HashSet;\nimport java.util.List;\n-import java.util.Map;\nimport javax.inject.Inject;\n-import org.apache.camel.Exchange;\n-import org.apache.camel.ProducerTemplate;\n-import org.apache.camel.builder.ExchangeBuilder;\nimport org.apache.camel.builder.RouteBuilder;\n-import org.apache.camel.component.aws.ddb.DdbConstants;\n-import org.apache.camel.component.aws.ddb.DdbOperations;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\n@@ -24,10 +17,11 @@ import org.junit.Assume;\nimport org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.AmazonDynamoDBUtils;\n+import org.wildfly.camel.test.aws.subA.AmazonDynamoDBUtils.DynamoDBClientProvider;\nimport org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\nimport org.wildfly.camel.test.aws.subA.CatalogItem;\n-import org.wildfly.camel.test.aws.subA.DynamoDBClientProducer;\n-import org.wildfly.camel.test.aws.subA.DynamoDBClientProducer.AWSClientProvider;\n+import org.wildfly.camel.test.aws.subA.TableNameProviderA;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\n@@ -40,15 +34,16 @@ import com.amazonaws.services.dynamodbv2.model.AttributeValue;\n@RunWith(Arquillian.class)\npublic class DynamoDBIntegrationTest {\n- public static final String TABLE_NAME = \"ProductCatalog\";\n+ @Inject\n+ private String tableName;\n@Inject\n- private AWSClientProvider provider;\n+ private DynamoDBClientProvider provider;\n@Deployment\npublic static JavaArchive deployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ddb-tests.jar\");\n- archive.addClasses(DynamoDBClientProducer.class, BasicCredentialsProvider.class, CatalogItem.class);\n+ archive.addClasses(AmazonDynamoDBUtils.class, BasicCredentialsProvider.class, CatalogItem.class, TableNameProviderA.class);\narchive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\nreturn archive;\n}\n@@ -89,42 +84,30 @@ public class DynamoDBIntegrationTest {\nAssume.assumeNotNull(\"AWS client not null\", client);\nWildFlyCamelContext camelctx = new WildFlyCamelContext();\n- camelctx.getNamingContext().bind(\"ddbClient\", client);\n+ camelctx.getNamingContext().bind(\"ddbClientA\", client);\ncamelctx.addRoutes(new RouteBuilder() {\n@Override\npublic void configure() throws Exception {\n- from(\"direct:start\").to(\"aws-ddb://\" + TABLE_NAME + \"?amazonDDBClient=#ddbClient\");\n+ from(\"direct:start\").to(\"aws-ddb://\" + tableName + \"?amazonDDBClient=#ddbClientA\");\n}\n});\ncamelctx.start();\ntry {\n- HashMap<String, AttributeValue> item = new HashMap<>();\n- item.put(\"Id\", new AttributeValue().withN(\"103\"));\n- item.put(\"Title\", new AttributeValue().withS(\"Book 103 Title\"));\n-\n- ProducerTemplate producer = camelctx.createProducerTemplate();\n-\n- Exchange exchange = new ExchangeBuilder(camelctx)\n- .withHeader(DdbConstants.OPERATION, DdbOperations.PutItem)\n- .withHeader(DdbConstants.ITEM, item).build();\n+ AmazonDynamoDBUtils.putItem(camelctx, \"Book 103 Title\");\n- producer.send(\"direct:start\", exchange);\n+ String result = ((AttributeValue) AmazonDynamoDBUtils.getItem(camelctx).get(\"Title\")).getS();\n+ Assert.assertEquals(\"Book 103 Title\", result);\n- HashMap<String, AttributeValue> key = new HashMap<>();\n- key.put(\"Id\", new AttributeValue().withN(\"103\"));\n+ AmazonDynamoDBUtils.updItem(camelctx, \"Book 103 Update\");\n- exchange = new ExchangeBuilder(camelctx)\n- .withHeader(DdbConstants.OPERATION, DdbOperations.GetItem)\n- .withHeader(DdbConstants.KEY, key).build();\n-\n- producer.send(\"direct:start\", exchange);\n- Map<?, ?> result = exchange.getIn().getHeader(DdbConstants.ATTRIBUTES, Map.class);\n- Assert.assertEquals(\"Book 103 Title\", ((AttributeValue) result.get(\"Title\")).getS());\n+ result = ((AttributeValue) AmazonDynamoDBUtils.getItem(camelctx).get(\"Title\")).getS();\n+ Assert.assertEquals(\"Book 103 Update\", result);\n} finally {\ncamelctx.stop();\n}\n}\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBStreamsIntegrationTest.java",
"diff": "+package org.wildfly.camel.test.aws;\n+\n+import java.util.Map;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.Exchange;\n+import org.apache.camel.PollingConsumer;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.AmazonDynamoDBUtils;\n+import org.wildfly.camel.test.aws.subA.AmazonDynamoDBUtils.DynamoDBClientProvider;\n+import org.wildfly.camel.test.aws.subA.AmazonDynamoDBUtils.DynamoDBStreamsClientProvider;\n+import org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\n+import org.wildfly.camel.test.aws.subA.TableNameProviderB;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;\n+import com.amazonaws.services.dynamodbv2.model.AttributeValue;\n+import com.amazonaws.services.dynamodbv2.model.Record;\n+import com.amazonaws.services.dynamodbv2.model.StreamRecord;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class DynamoDBStreamsIntegrationTest {\n+\n+ @Inject\n+ private String tableName;\n+\n+ @Inject\n+ private DynamoDBClientProvider ddbProvider;\n+\n+ @Inject\n+ private DynamoDBStreamsClientProvider dbsProvider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ddb-streams-tests.jar\");\n+ archive.addClasses(AmazonDynamoDBUtils.class, BasicCredentialsProvider.class, TableNameProviderB.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void testKeyValueOperations() throws Exception {\n+\n+ AmazonDynamoDBClient ddbClient = ddbProvider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", ddbClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"ddbClientB\", ddbClient);\n+ camelctx.getNamingContext().bind(\"dbsClientB\", dbsProvider.getClient());\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:start\").to(\"aws-ddb://\" + tableName + \"?amazonDDBClient=#ddbClientB\");\n+ from(\"aws-ddbstream://\" + tableName + \"?amazonDynamoDbStreamsClient=#dbsClientB\").to(\"seda:end\");\n+ }\n+ });\n+\n+ PollingConsumer pollingConsumer = camelctx.getEndpoint(\"seda:end\").createPollingConsumer();\n+ pollingConsumer.start();\n+\n+ camelctx.start();\n+ try {\n+ AmazonDynamoDBUtils.putItem(camelctx, \"Book 103 Title\");\n+\n+ String result = ((AttributeValue) AmazonDynamoDBUtils.getItem(camelctx).get(\"Title\")).getS();\n+ Assert.assertEquals(\"Book 103 Title\", result);\n+\n+ Exchange exchange = pollingConsumer.receive(3000);\n+ Assert.assertNull(exchange);\n+\n+ AmazonDynamoDBUtils.updItem(camelctx, \"Book 103 Update\");\n+\n+ result = ((AttributeValue) AmazonDynamoDBUtils.getItem(camelctx).get(\"Title\")).getS();\n+ Assert.assertEquals(\"Book 103 Update\", result);\n+\n+ exchange = pollingConsumer.receive(3000);\n+ StreamRecord record = exchange.getIn().getBody(Record.class).getDynamodb();\n+ Map<String, AttributeValue> oldImage = record.getOldImage();\n+ Map<String, AttributeValue> newImage = record.getNewImage();\n+ Assert.assertEquals(\"Book 103 Title\", oldImage.get(\"Title\").getS());\n+ Assert.assertEquals(\"Book 103 Update\", newImage.get(\"Title\").getS());\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"diff": "@@ -19,8 +19,8 @@ import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.aws.subA.BasicCredentialsProvider;\n-import org.wildfly.camel.test.aws.subA.S3ClientProducer;\n-import org.wildfly.camel.test.aws.subA.S3ClientProducer.AWSClientProvider;\n+import org.wildfly.camel.test.aws.subA.AmazonS3Utils;\n+import org.wildfly.camel.test.aws.subA.AmazonS3Utils.AWSClientProvider;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\n@@ -39,7 +39,7 @@ public class S3IntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-s3-tests.jar\");\n- archive.addClasses(S3ClientProducer.class, BasicCredentialsProvider.class);\n+ archive.addClasses(AmazonS3Utils.class, BasicCredentialsProvider.class);\narchive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\nreturn archive;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/AmazonDynamoDBUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import java.util.HashMap;\n+import java.util.Map;\n+\n+import javax.enterprise.inject.Disposes;\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Inject;\n+import javax.inject.Singleton;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.ExchangeBuilder;\n+import org.apache.camel.component.aws.ddb.DdbConstants;\n+import org.apache.camel.component.aws.ddb.DdbOperations;\n+import org.junit.Assert;\n+\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreamsClient;\n+import com.amazonaws.services.dynamodbv2.AmazonDynamoDBStreamsClientBuilder;\n+import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;\n+import com.amazonaws.services.dynamodbv2.model.AttributeValue;\n+import com.amazonaws.services.dynamodbv2.model.AttributeValueUpdate;\n+import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;\n+import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;\n+import com.amazonaws.services.dynamodbv2.model.KeyType;\n+import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;\n+import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;\n+import com.amazonaws.services.dynamodbv2.model.StreamSpecification;\n+import com.amazonaws.services.dynamodbv2.model.StreamViewType;\n+import com.amazonaws.services.dynamodbv2.model.TableDescription;\n+\n+public class AmazonDynamoDBUtils {\n+\n+ @Inject\n+ private String tableName;\n+\n+ public class DynamoDBClientProvider {\n+ private final AmazonDynamoDBClient client;\n+ DynamoDBClientProvider(AmazonDynamoDBClient client) {\n+ this.client = client;\n+ }\n+ public AmazonDynamoDBClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ public class DynamoDBStreamsClientProvider {\n+ private final AmazonDynamoDBStreamsClient client;\n+ DynamoDBStreamsClientProvider(AmazonDynamoDBStreamsClient client) {\n+ this.client = client;\n+ }\n+ public AmazonDynamoDBStreamsClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public DynamoDBClientProvider getDynamoDBClientProvider() throws Exception {\n+ AmazonDynamoDBClient client = null;\n+ String accessId = System.getenv(\"AWSAccessId\");\n+ String secretKey = System.getenv(\"AWSSecretKey\");\n+ if (accessId != null && secretKey != null) {\n+ client = (AmazonDynamoDBClient) AmazonDynamoDBClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+\n+ TableDescription createTable = createTable(client);\n+ Assert.assertEquals(\"ACTIVE\", createTable.getTableStatus());\n+ }\n+ return new DynamoDBClientProvider(client);\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public DynamoDBStreamsClientProvider getDynamoDBStreamsClientProvider() throws Exception {\n+ AmazonDynamoDBStreamsClient client = null;\n+ String accessId = System.getenv(\"AWSAccessId\");\n+ String secretKey = System.getenv(\"AWSSecretKey\");\n+ if (accessId != null && secretKey != null) {\n+ client = (AmazonDynamoDBStreamsClient) AmazonDynamoDBStreamsClientBuilder.standard()\n+ .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+ }\n+ return new DynamoDBStreamsClientProvider(client);\n+ }\n+\n+ public void close(@Disposes DynamoDBClientProvider provider) throws Exception {\n+ if (provider.getClient() != null) {\n+ deleteTable(provider.getClient());\n+ }\n+ }\n+\n+ public static void putItem(CamelContext camelctx, String title) {\n+ HashMap<String, AttributeValue> putItem = new HashMap<>();\n+ putItem.put(\"Id\", new AttributeValue().withN(\"103\"));\n+ putItem.put(\"Title\", new AttributeValue().withS(title));\n+\n+ Exchange exchange = new ExchangeBuilder(camelctx)\n+ .withHeader(DdbConstants.OPERATION, DdbOperations.PutItem)\n+ .withHeader(DdbConstants.ITEM, putItem).build();\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.send(\"direct:start\", exchange);\n+ }\n+\n+ public static void updItem(CamelContext camelctx, String title) {\n+\n+ HashMap<String, AttributeValue> key = new HashMap<>();\n+ key.put(\"Id\", new AttributeValue().withN(\"103\"));\n+\n+ HashMap<String, AttributeValueUpdate> updItem = new HashMap<>();\n+ AttributeValueUpdate updValue = new AttributeValueUpdate();\n+ updValue.setValue(new AttributeValue().withS(title));\n+ updItem.put(\"Title\", updValue);\n+\n+ Exchange exchange = new ExchangeBuilder(camelctx)\n+ .withHeader(DdbConstants.OPERATION, DdbOperations.UpdateItem)\n+ .withHeader(DdbConstants.KEY, key)\n+ .withHeader(DdbConstants.UPDATE_VALUES, updItem).build();\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.send(\"direct:start\", exchange);\n+ Assert.assertNull(exchange.getException());\n+ }\n+\n+ public static Map<?, ?> getItem(CamelContext camelctx) {\n+ HashMap<String, AttributeValue> key = new HashMap<>();\n+ key.put(\"Id\", new AttributeValue().withN(\"103\"));\n+\n+ Exchange exchange = new ExchangeBuilder(camelctx)\n+ .withHeader(DdbConstants.OPERATION, DdbOperations.GetItem)\n+ .withHeader(DdbConstants.KEY, key).build();\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.send(\"direct:start\", exchange);\n+ Assert.assertNull(exchange.getException());\n+\n+ return exchange.getIn().getHeader(DdbConstants.ATTRIBUTES, Map.class);\n+ }\n+\n+ private TableDescription createTable(AmazonDynamoDB client) throws InterruptedException {\n+\n+ CreateTableRequest tableReq = new CreateTableRequest().withTableName(tableName)\n+ .withKeySchema(new KeySchemaElement(\"Id\", KeyType.HASH))\n+ .withAttributeDefinitions(new AttributeDefinition(\"Id\", ScalarAttributeType.N))\n+ .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L))\n+ .withStreamSpecification(new StreamSpecification().withStreamEnabled(true).withStreamViewType(StreamViewType.NEW_AND_OLD_IMAGES));\n+\n+ return awaitStatus(client, client.createTable(tableReq).getTableDescription(), \"ACTIVE\");\n+ }\n+\n+ private void deleteTable(AmazonDynamoDB client) throws InterruptedException {\n+ TableDescription description = client.describeTable(tableName).getTable();\n+ awaitStatus(client, description, \"ACTIVE\");\n+ client.deleteTable(tableName);\n+ }\n+\n+ private TableDescription awaitStatus(AmazonDynamoDB client, TableDescription description, String status) throws InterruptedException {\n+ int retries = 20;\n+ while (--retries > 0 && !description.getTableStatus().equals(status)) {\n+ Thread.sleep(500);\n+ description = client.describeTable(tableName).getTable();\n+ }\n+ return description;\n+ }\n+}\n"
},
{
"change_type": "RENAME",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/S3ClientProducer.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/AmazonS3Utils.java",
"diff": "@@ -28,7 +28,7 @@ import org.wildfly.camel.test.aws.S3IntegrationTest;\nimport com.amazonaws.services.s3.AmazonS3Client;\nimport com.amazonaws.services.s3.AmazonS3ClientBuilder;\n-public class S3ClientProducer {\n+public class AmazonS3Utils {\npublic class AWSClientProvider {\nprivate final AmazonS3Client client;\n"
},
{
"change_type": "DELETE",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/DynamoDBClientProducer.java",
"new_path": null,
"diff": "-/*\n- * #%L\n- * Wildfly Camel :: Testsuite\n- * %%\n- * Copyright (C) 2013 - 2017 RedHat\n- * %%\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- * #L%\n- */\n-package org.wildfly.camel.test.aws.subA;\n-\n-import javax.enterprise.inject.Disposes;\n-import javax.enterprise.inject.Produces;\n-import javax.inject.Singleton;\n-\n-import org.junit.Assert;\n-import org.wildfly.camel.test.aws.DynamoDBIntegrationTest;\n-\n-import com.amazonaws.services.dynamodbv2.AmazonDynamoDB;\n-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;\n-import com.amazonaws.services.dynamodbv2.AmazonDynamoDBClientBuilder;\n-import com.amazonaws.services.dynamodbv2.model.AttributeDefinition;\n-import com.amazonaws.services.dynamodbv2.model.CreateTableRequest;\n-import com.amazonaws.services.dynamodbv2.model.KeySchemaElement;\n-import com.amazonaws.services.dynamodbv2.model.KeyType;\n-import com.amazonaws.services.dynamodbv2.model.ProvisionedThroughput;\n-import com.amazonaws.services.dynamodbv2.model.ScalarAttributeType;\n-import com.amazonaws.services.dynamodbv2.model.TableDescription;\n-\n-public class DynamoDBClientProducer {\n-\n- public class AWSClientProvider {\n- private final AmazonDynamoDBClient client;\n- AWSClientProvider(AmazonDynamoDBClient client) {\n- this.client = client;\n- }\n- public AmazonDynamoDBClient getClient() {\n- return client;\n- }\n- }\n-\n- @Produces\n- @Singleton\n- public AWSClientProvider getClientProvider() throws Exception {\n- AmazonDynamoDBClient client = null;\n- String accessId = System.getenv(\"AWSAccessId\");\n- String secretKey = System.getenv(\"AWSSecretKey\");\n- if (accessId != null && secretKey != null) {\n- client = (AmazonDynamoDBClient) AmazonDynamoDBClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n- .withRegion(\"eu-west-1\")\n- .build();\n-\n- TableDescription createTable = createTable(client);\n- Assert.assertEquals(\"ACTIVE\", createTable.getTableStatus());\n- }\n- return new AWSClientProvider(client);\n- }\n-\n- public void close(@Disposes AWSClientProvider provider) throws Exception {\n- if (provider.getClient() != null) {\n- deleteTable(provider.getClient());\n- }\n- }\n-\n- private TableDescription createTable(AmazonDynamoDB client) throws InterruptedException {\n-\n- CreateTableRequest tableReq = new CreateTableRequest().withTableName(DynamoDBIntegrationTest.TABLE_NAME)\n- .withKeySchema(new KeySchemaElement(\"Id\", KeyType.HASH))\n- .withAttributeDefinitions(new AttributeDefinition(\"Id\", ScalarAttributeType.N))\n- .withProvisionedThroughput(new ProvisionedThroughput(10L, 10L));\n-\n- return awaitStatus(client, client.createTable(tableReq).getTableDescription(), \"ACTIVE\");\n- }\n-\n- private void deleteTable(AmazonDynamoDB client) throws InterruptedException {\n- TableDescription description = client.describeTable(DynamoDBIntegrationTest.TABLE_NAME).getTable();\n- awaitStatus(client, description, \"ACTIVE\");\n- client.deleteTable(DynamoDBIntegrationTest.TABLE_NAME);\n- }\n-\n- private TableDescription awaitStatus(AmazonDynamoDB client, TableDescription description, String status) throws InterruptedException {\n- int retries = 20;\n- while (--retries > 0 && !description.getTableStatus().equals(status)) {\n- Thread.sleep(500);\n- description = client.describeTable(DynamoDBIntegrationTest.TABLE_NAME).getTable();\n- }\n- return description;\n- }\n-}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/TableNameProviderA.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Named;\n+import javax.inject.Singleton;\n+\n+public class TableNameProviderA {\n+\n+ private static final String TABLE_NAME = \"ProductCatalogA\";\n+\n+ @Produces\n+ @Singleton\n+ @Named(\"tableName\")\n+ public String getTableName() {\n+ return TABLE_NAME;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/TableNameProviderB.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Named;\n+import javax.inject.Singleton;\n+\n+public class TableNameProviderB {\n+\n+ private static final String TABLE_NAME = \"ProductCatalogB\";\n+\n+ @Produces\n+ @Singleton\n+ @Named(\"tableName\")\n+ public String getTableName() {\n+ return TABLE_NAME;\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1410] Add support for component aws-ddbstream
|
734,358 |
04.05.2017 14:57:30
| -7,200 |
50d250832f12b9c5adcdf614a26287c2f15dc964
|
[resolves Add support for component aws-cw
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-cw.adoc",
"diff": "+### camel-aws-cw\n+\n+The http://camel.apache.org/aws-cw.html[AWS CloudWatch,window=_blank] component allows messages to be sent to an http://aws.amazon.com/cloudwatch[Amazon CloudWatch,window=_blank] metrics.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -10,6 +10,8 @@ include::camel-atom.adoc[]\ninclude::camel-avro.adoc[]\n+include::camel-aws-cw.adoc[]\n+\ninclude::camel-aws-ddb.adoc[]\ninclude::camel-aws-ddbstream.adoc[]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/CloudWatchIntegrationTest.java",
"diff": "+package org.wildfly.camel.test.plain.aws;\n+\n+import java.util.Collections;\n+import java.util.HashMap;\n+import java.util.List;\n+import java.util.Map;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.cw.CwConstants;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.CloudWatchUtils;\n+\n+import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;\n+import com.amazonaws.services.cloudwatch.model.DimensionFilter;\n+import com.amazonaws.services.cloudwatch.model.ListMetricsRequest;\n+import com.amazonaws.services.cloudwatch.model.Metric;\n+\n+\n+public class CloudWatchIntegrationTest {\n+\n+ public static final String namespace = \"MySpace\";\n+ public static final String name = \"MyMetric\";\n+ public static final String dimName = \"MyDimName\";\n+ public static final String dimValue = \"MyDimValue\";\n+\n+ private static AmazonCloudWatchClient cwClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ cwClient = CloudWatchUtils.createCloudWatchClient();\n+ }\n+\n+ @Test\n+ public void testKeyValueOperations() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", cwClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"cwClient\", cwClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:metrics\").to(\"aws-cw://\" + namespace + \"?amazonCwClient=#cwClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ Map<String, Object> headers = new HashMap<>();\n+ headers.put(CwConstants.METRIC_NAME, name);\n+ headers.put(CwConstants.METRIC_DIMENSION_NAME, dimName);\n+ headers.put(CwConstants.METRIC_DIMENSION_VALUE, dimValue);\n+\n+ ListMetricsRequest request = new ListMetricsRequest()\n+ .withNamespace(namespace)\n+ .withMetricName(name)\n+ .withDimensions(new DimensionFilter().withName(dimName).withValue(dimValue));\n+\n+ List<Metric> metrics = Collections.emptyList();\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ for (int i = 100; i < 105 && metrics.size() == 0; i++) {\n+ producer.sendBodyAndHeaders(\"direct:metrics\", new Double(i), headers);\n+ metrics = cwClient.listMetrics(request).getMetrics();\n+ System.out.println(\"metrics #\" + i + \": \" + metrics);\n+ Thread.sleep(1000);\n+ }\n+\n+ // It may take several minutes for the metric to show up\n+ // Assert.assertEquals(1, metrics.size());\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/S3IntegrationTest.java",
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/S3IntegrationTest.java",
"diff": "@@ -27,7 +27,7 @@ public class S3IntegrationTest {\n@BeforeClass\npublic static void beforeClass() throws Exception {\n- s3Client = S3Utils.getAmazonS3Client();\n+ s3Client = S3Utils.createS3Client();\nif (s3Client != null) {\nS3Utils.createBucket(s3Client);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/BasicCredentialsProvider.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/BasicCredentialsProvider.java",
"diff": "@@ -6,6 +6,9 @@ import com.amazonaws.auth.BasicAWSCredentials;\npublic class BasicCredentialsProvider implements AWSCredentialsProvider {\n+ public static final String AWS_SECRET_KEY = \"AWSSecretKey\";\n+ public static final String AWS_ACCESS_ID = \"AWSAccessId\";\n+\nfinal String accessId;\nfinal String secretKey;\n@@ -14,6 +17,16 @@ public class BasicCredentialsProvider implements AWSCredentialsProvider {\nthis.secretKey = secretKey;\n}\n+ public static BasicCredentialsProvider standard() {\n+ String accessId = System.getenv(AWS_ACCESS_ID);\n+ String secretKey = System.getenv(AWS_SECRET_KEY);\n+ return new BasicCredentialsProvider(accessId, secretKey);\n+ }\n+\n+ public boolean isValid() {\n+ return accessId != null && secretKey != null;\n+ }\n+\n@Override\npublic AWSCredentials getCredentials() {\nreturn new BasicAWSCredentials(accessId, secretKey);\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/CloudWatchUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;\n+import com.amazonaws.services.cloudwatch.AmazonCloudWatchClientBuilder;\n+\n+public class CloudWatchUtils {\n+\n+ public static AmazonCloudWatchClient createCloudWatchClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonCloudWatchClient client = !credentials.isValid() ? null : (AmazonCloudWatchClient)\n+ AmazonCloudWatchClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+ return client;\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/DynamoDBUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/DynamoDBUtils.java",
"diff": "@@ -50,28 +50,22 @@ import com.amazonaws.services.dynamodbv2.model.TableDescription;\npublic class DynamoDBUtils {\npublic static AmazonDynamoDBClient createDynamoDBClient() {\n- AmazonDynamoDBClient client = null;\n- String accessId = System.getenv(\"AWSAccessId\");\n- String secretKey = System.getenv(\"AWSSecretKey\");\n- if (accessId != null && secretKey != null) {\n- client = (AmazonDynamoDBClient) AmazonDynamoDBClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonDynamoDBClient client = !credentials.isValid() ? null : (AmazonDynamoDBClient)\n+ AmazonDynamoDBClientBuilder.standard()\n+ .withCredentials(credentials)\n.withRegion(\"eu-west-1\")\n.build();\n- }\nreturn client;\n}\npublic static AmazonDynamoDBStreamsClient createDynamoDBStreamsClient() {\n- AmazonDynamoDBStreamsClient client = null;\n- String accessId = System.getenv(\"AWSAccessId\");\n- String secretKey = System.getenv(\"AWSSecretKey\");\n- if (accessId != null && secretKey != null) {\n- client = (AmazonDynamoDBStreamsClient) AmazonDynamoDBStreamsClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonDynamoDBStreamsClient client = !credentials.isValid() ? null : (AmazonDynamoDBStreamsClient)\n+ AmazonDynamoDBStreamsClientBuilder.standard()\n+ .withCredentials(credentials)\n.withRegion(\"eu-west-1\")\n.build();\n- }\nreturn client;\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/S3Utils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/S3Utils.java",
"diff": "@@ -26,16 +26,13 @@ public class S3Utils {\npublic static final String BUCKET_NAME = \"wfc-aws-s3-bucket\";\n- public static AmazonS3Client getAmazonS3Client() {\n- AmazonS3Client client = null;\n- String accessId = System.getenv(\"AWSAccessId\");\n- String secretKey = System.getenv(\"AWSSecretKey\");\n- if (accessId != null && secretKey != null) {\n- client = (AmazonS3Client) AmazonS3ClientBuilder.standard()\n- .withCredentials(new BasicCredentialsProvider(accessId, secretKey))\n+ public static AmazonS3Client createS3Client() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonS3Client client = !credentials.isValid() ? null : (AmazonS3Client)\n+ AmazonS3ClientBuilder.standard()\n+ .withCredentials(credentials)\n.withRegion(\"eu-west-1\")\n.build();\n- }\nreturn client;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/CloudWatchIntegrationTest.java",
"diff": "+package org.wildfly.camel.test.aws;\n+\n+import java.util.Collections;\n+import java.util.HashMap;\n+import java.util.List;\n+import java.util.Map;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.cw.CwConstants;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.CloudWatchClientProducer;\n+import org.wildfly.camel.test.aws.subA.CloudWatchClientProducer.CloudWatchClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.CloudWatchUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;\n+import com.amazonaws.services.cloudwatch.model.DimensionFilter;\n+import com.amazonaws.services.cloudwatch.model.ListMetricsRequest;\n+import com.amazonaws.services.cloudwatch.model.Metric;\n+\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class CloudWatchIntegrationTest {\n+\n+ public static final String namespace = \"MySpace\";\n+ public static final String name = \"MyMetric\";\n+ public static final String dimName = \"MyDimName\";\n+ public static final String dimValue = \"MyDimValue\";\n+\n+ @Inject\n+ private CloudWatchClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-cw-tests.jar\");\n+ archive.addClasses(CloudWatchClientProducer.class, CloudWatchUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void testKeyValueOperations() throws Exception {\n+\n+ AmazonCloudWatchClient cwClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", cwClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"cwClient\", cwClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:metrics\").to(\"aws-cw://\" + namespace + \"?amazonCwClient=#cwClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ Map<String, Object> headers = new HashMap<>();\n+ headers.put(CwConstants.METRIC_NAME, name);\n+ headers.put(CwConstants.METRIC_DIMENSION_NAME, dimName);\n+ headers.put(CwConstants.METRIC_DIMENSION_VALUE, dimValue);\n+\n+ ListMetricsRequest request = new ListMetricsRequest()\n+ .withNamespace(namespace)\n+ .withMetricName(name)\n+ .withDimensions(new DimensionFilter().withName(dimName).withValue(dimValue));\n+\n+ List<Metric> metrics = Collections.emptyList();\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ for (int i = 100; i < 105 && metrics.size() == 0; i++) {\n+ producer.sendBodyAndHeaders(\"direct:metrics\", new Double(i), headers);\n+ metrics = cwClient.listMetrics(request).getMetrics();\n+ System.out.println(\"metrics #\" + i + \": \" + metrics);\n+ Thread.sleep(1000);\n+ }\n+\n+ // It may take several minutes for the metric to show up\n+ // Assert.assertEquals(1, metrics.size());\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"diff": "@@ -19,7 +19,7 @@ import org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.aws.subA.S3ClientProducer;\n-import org.wildfly.camel.test.aws.subA.S3ClientProducer.AWSClientProvider;\n+import org.wildfly.camel.test.aws.subA.S3ClientProducer.S3ClientProvider;\nimport org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\nimport org.wildfly.camel.test.common.aws.S3Utils;\nimport org.wildfly.extension.camel.CamelAware;\n@@ -34,7 +34,7 @@ public class S3IntegrationTest {\npublic static final String OBJECT_KEY = \"content.txt\";\n@Inject\n- private AWSClientProvider provider;\n+ private S3ClientProvider provider;\n@Deployment\npublic static JavaArchive deployment() {\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/CloudWatchClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.CloudWatchUtils;\n+\n+import com.amazonaws.services.cloudwatch.AmazonCloudWatchClient;\n+\n+public class CloudWatchClientProducer {\n+\n+ public class CloudWatchClientProvider {\n+ private final AmazonCloudWatchClient client;\n+ CloudWatchClientProvider(AmazonCloudWatchClient client) {\n+ this.client = client;\n+ }\n+ public AmazonCloudWatchClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public CloudWatchClientProvider getClientProvider() throws Exception {\n+ AmazonCloudWatchClient client = CloudWatchUtils.createCloudWatchClient();\n+ return new CloudWatchClientProvider(client);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/S3ClientProducer.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/S3ClientProducer.java",
"diff": "@@ -29,9 +29,9 @@ import com.amazonaws.services.s3.AmazonS3Client;\npublic class S3ClientProducer {\n- public class AWSClientProvider {\n+ public class S3ClientProvider {\nprivate final AmazonS3Client client;\n- AWSClientProvider(AmazonS3Client client) {\n+ S3ClientProvider(AmazonS3Client client) {\nthis.client = client;\n}\npublic AmazonS3Client getClient() {\n@@ -41,15 +41,15 @@ public class S3ClientProducer {\n@Produces\n@Singleton\n- public AWSClientProvider getClientProvider() throws Exception {\n- AmazonS3Client client = S3Utils.getAmazonS3Client();\n+ public S3ClientProvider getClientProvider() throws Exception {\n+ AmazonS3Client client = S3Utils.createS3Client();\nif (client != null) {\nS3Utils.createBucket(client);\n}\n- return new AWSClientProvider(client);\n+ return new S3ClientProvider(client);\n}\n- public void close(@Disposes AWSClientProvider provider) throws Exception {\n+ public void close(@Disposes S3ClientProvider provider) throws Exception {\nAmazonS3Client client = provider.getClient();\nif (client != null) {\nS3Utils.deleteBucket(client);\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1408] Add support for component aws-cw
|
734,358 |
13.03.2017 09:47:26
| -3,600 |
93f59c2a2241f08373c8eef0ded428fca5496452
|
Disable camel-groups to to wait for jgroups-4.0
|
[
{
"change_type": "MODIFY",
"old_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<module name=\"org.apache.camel.component.jbpm\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jcache\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jdbc\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <!-- [#1689] Enable camel-groups to work with jgroups-4.0\n<module name=\"org.apache.camel.component.jgroups\" export=\"true\" services=\"export\" optional=\"true\" />\n+ -->\n<module name=\"org.apache.camel.component.jms\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jmx\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jpa\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<module name=\"org.apache.camel.component.jbpm\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jcache\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jdbc\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <!-- [#1689] Enable camel-groups to work with jgroups-4.0\n<module name=\"org.apache.camel.component.jgroups\" export=\"true\" services=\"export\" optional=\"true\" />\n+ -->\n<module name=\"org.apache.camel.component.jms\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jmx\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.jpa\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/jgroups/JGroupsIntegrationTest.java",
"new_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/jgroups/JGroupsIntegrationTest.java",
"diff": "@@ -32,12 +32,14 @@ import org.jboss.shrinkwrap.api.ShrinkWrap;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\nimport org.junit.Before;\n+import org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.extension.camel.CamelAware;\n@CamelAware\n@RunWith(Arquillian.class)\n+@Ignore(\"[#1689] Enable camel-groups to work with jgroups-4.0\")\npublic class JGroupsIntegrationTest {\nString master;\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"diff": "@@ -981,7 +981,6 @@ org/apache/camel/component/jcache/processor\norg/apache/camel/component/jcache/processor/aggregate\norg/apache/camel/component/jcache/processor/idempotent\norg/apache/camel/component/jdbc\n-org/apache/camel/component/jgroups\norg/apache/camel/component/jms\norg/apache/camel/component/jms/reply\norg/apache/camel/component/jmx\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[#1689] Disable camel-groups to to wait for jgroups-4.0
|
734,358 |
12.04.2017 12:07:09
| -7,200 |
b30aef2c2f1c36d9899e3c03b942a39fed39de00
|
[resolves Add support for component aws-ec2
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-ec2.adoc",
"diff": "+### camel-aws-ec2\n+\n+The http://camel.apache.org/aws-ec2.html[AWS EC2,window=_blank] component supports create, run, start, stop and terminate https://aws.amazon.com/it/ec2[AWS EC2,window=_blank] instances.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -16,6 +16,8 @@ include::camel-aws-ddb.adoc[]\ninclude::camel-aws-ddbstream.adoc[]\n+include::camel-aws-ec2.adoc[]\n+\ninclude::camel-aws-s3.adoc[]\ninclude::camel-bean-validator.adoc[]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/EC2IntegrationTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.aws;\n+\n+import java.util.Collections;\n+import java.util.HashMap;\n+import java.util.Map;\n+\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.ec2.EC2Constants;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.auth.AWSCredentials;\n+import com.amazonaws.auth.AWSCredentialsProvider;\n+import com.amazonaws.auth.BasicAWSCredentials;\n+import com.amazonaws.services.ec2.AmazonEC2;\n+import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;\n+import com.amazonaws.services.ec2.model.InstanceType;\n+import com.amazonaws.services.ec2.model.RunInstancesResult;\n+import com.amazonaws.services.ec2.model.TerminateInstancesResult;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class EC2IntegrationTest {\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ return ShrinkWrap.create(JavaArchive.class, \"aws-ec2-tests\");\n+ }\n+\n+ @Test\n+ public void testCreateInstance() throws Exception {\n+\n+ String accessId = System.getenv(\"AWS_ACCESS_ID\");\n+ String secretKey = System.getenv(\"AWS_SECRET_KEY\");\n+ Assume.assumeNotNull(\"AWS_ACCESS_ID not null\", accessId);\n+ Assume.assumeNotNull(\"AWS_SECRET_KEY not null\", secretKey);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ String clientref = \"amazonEc2Client=#ec2Client\";\n+ from(\"direct:createAndRun\").to(\"aws-ec2://TestDomain?\" + clientref + \"&operation=createAndRunInstances\");\n+ from(\"direct:terminate\").to(\"aws-ec2://TestDomain?\" + clientref + \"&operation=terminateInstances\");\n+ }\n+ });\n+\n+ AmazonEC2 client = AmazonEC2ClientBuilder.standard()\n+ .withCredentials(new StaticCredentialsProvider(new BasicAWSCredentials(accessId, secretKey)))\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+\n+ camelctx.getNamingContext().bind(\"ec2Client\", client);\n+\n+ camelctx.start();\n+ try {\n+\n+ // Create and run an instance\n+ Map<String, Object> headers = new HashMap<>();\n+ headers.put(EC2Constants.IMAGE_ID, \"ami-02ace471\");\n+ headers.put(EC2Constants.INSTANCE_TYPE, InstanceType.T2Micro);\n+ headers.put(EC2Constants.SUBNET_ID, \"subnet-4a8b2f3d\");\n+ headers.put(EC2Constants.INSTANCE_MIN_COUNT, 1);\n+ headers.put(EC2Constants.INSTANCE_MAX_COUNT, 1);\n+\n+ ProducerTemplate template = camelctx.createProducerTemplate();\n+ RunInstancesResult result1 = template.requestBodyAndHeaders(\"direct:createAndRun\", null, headers, RunInstancesResult.class);\n+ String instanceId = result1.getReservation().getInstances().get(0).getInstanceId();\n+ System.out.println(instanceId);\n+\n+ // Terminate the instance\n+ headers = new HashMap<>();\n+ headers.put(EC2Constants.INSTANCES_IDS, Collections.singleton(instanceId));\n+\n+ TerminateInstancesResult result2 = template.requestBodyAndHeaders(\"direct:terminate\", null, headers, TerminateInstancesResult.class);\n+ Assert.assertEquals(instanceId, result2.getTerminatingInstances().get(0).getInstanceId());\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ static class StaticCredentialsProvider implements AWSCredentialsProvider {\n+\n+ private final AWSCredentials credentials;\n+\n+ public StaticCredentialsProvider(AWSCredentials credentials) {\n+ this.credentials = credentials;\n+ }\n+\n+ @Override\n+ public AWSCredentials getCredentials() {\n+ return credentials;\n+ }\n+\n+ @Override\n+ public void refresh() {\n+ }\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1411] Add support for component aws-ec2
|
734,358 |
05.05.2017 10:00:52
| -7,200 |
ccb3359eda810d07641b37efa61af37b5d8afd8e
|
[resolves Add support for component aws-swf
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-swf.adoc",
"diff": "+### camel-aws-swf\n+\n+The http://camel.apache.org/aws-swf.html[AWS Simple Workflow,window=_blank] component supports managing workflows from http://aws.amazon.com/swf[Amazon's Simple Workflow,window=_blank] service.\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -20,6 +20,8 @@ include::camel-aws-ec2.adoc[]\ninclude::camel-aws-s3.adoc[]\n+include::camel-aws-swf.adoc[]\n+\ninclude::camel-bean-validator.adoc[]\ninclude::camel-bindy.adoc[]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/EC2IntegrationTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.plain.aws;\n+\n+import java.util.Collections;\n+import java.util.HashMap;\n+import java.util.Map;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.component.aws.ec2.EC2Constants;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.EC2Utils;\n+\n+import com.amazonaws.services.ec2.AmazonEC2Client;\n+import com.amazonaws.services.ec2.model.InstanceType;\n+import com.amazonaws.services.ec2.model.RunInstancesResult;\n+import com.amazonaws.services.ec2.model.TerminateInstancesResult;\n+\n+public class EC2IntegrationTest {\n+\n+ private static AmazonEC2Client ec2Client;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ ec2Client = EC2Utils.createEC2Client();\n+ }\n+\n+ @Test\n+ public void testCreateInstance() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", ec2Client);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"ec2Client\", ec2Client);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ EC2Utils.addRoutes(camelctx);\n+\n+ camelctx.start();\n+ try {\n+\n+ // Create and run an instance\n+ Map<String, Object> headers = new HashMap<>();\n+ headers.put(EC2Constants.IMAGE_ID, \"ami-02ace471\");\n+ headers.put(EC2Constants.INSTANCE_TYPE, InstanceType.T2Micro);\n+ headers.put(EC2Constants.SUBNET_ID, \"subnet-4a8b2f3d\");\n+ headers.put(EC2Constants.INSTANCE_MIN_COUNT, 1);\n+ headers.put(EC2Constants.INSTANCE_MAX_COUNT, 1);\n+\n+ ProducerTemplate template = camelctx.createProducerTemplate();\n+ RunInstancesResult result1 = template.requestBodyAndHeaders(\"direct:createAndRun\", null, headers, RunInstancesResult.class);\n+ String instanceId = result1.getReservation().getInstances().get(0).getInstanceId();\n+ System.out.println(instanceId);\n+\n+ // Terminate the instance\n+ headers = new HashMap<>();\n+ headers.put(EC2Constants.INSTANCES_IDS, Collections.singleton(instanceId));\n+\n+ TerminateInstancesResult result2 = template.requestBodyAndHeaders(\"direct:terminate\", null, headers, TerminateInstancesResult.class);\n+ Assert.assertEquals(instanceId, result2.getTerminatingInstances().get(0).getInstanceId());\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/S3IntegrationTest.java",
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/S3IntegrationTest.java",
"diff": "@@ -6,7 +6,6 @@ import java.util.Map;\nimport org.apache.camel.CamelContext;\nimport org.apache.camel.ConsumerTemplate;\nimport org.apache.camel.ProducerTemplate;\n-import org.apache.camel.builder.RouteBuilder;\nimport org.apache.camel.component.aws.s3.S3Constants;\nimport org.apache.camel.impl.DefaultCamelContext;\nimport org.apache.camel.impl.SimpleRegistry;\n@@ -50,14 +49,7 @@ public class S3IntegrationTest {\nregistry.put(\"s3Client\", s3Client);\nCamelContext camelctx = new DefaultCamelContext(registry);\n- camelctx.addRoutes(new RouteBuilder() {\n- @Override\n- public void configure() throws Exception {\n- String clientref = \"amazonS3Client=#s3Client\";\n- from(\"direct:upload\").to(\"aws-s3://\" + S3Utils.BUCKET_NAME + \"?\" + clientref);\n- from(\"aws-s3://\" + S3Utils.BUCKET_NAME + \"?\" + clientref).to(\"seda:read\");\n- }\n- });\n+ S3Utils.addRoutes(camelctx);\ntry {\ncamelctx.start();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SWFIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.plain.aws;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.component.aws.swf.SWFConstants;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.SWFUtils;\n+\n+import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;\n+\n+public class SWFIntegrationTest {\n+\n+ private static AmazonSimpleWorkflowClient swfClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ swfClient = SWFUtils.createSimpleWorkflowClient();\n+ if (swfClient != null) {\n+ SWFUtils.registerDomain(swfClient);\n+ }\n+ }\n+\n+ @Test\n+ public void deciderAndWorker() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", swfClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"swfClient\", swfClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ SWFUtils.addRoutes(camelctx);\n+\n+ MockEndpoint decider = camelctx.getEndpoint(\"mock:decider\", MockEndpoint.class);\n+ MockEndpoint worker = camelctx.getEndpoint(\"mock:worker\", MockEndpoint.class);\n+ MockEndpoint starter = camelctx.getEndpoint(\"mock:starter\", MockEndpoint.class);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.sendBody(\"direct:start\", \"Hello world!\");\n+\n+ starter.expectedMessageCount(1);\n+ decider.expectedMinimumMessageCount(1);\n+ worker.expectedMessageCount(2);\n+\n+ String workflowId = starter.getReceivedExchanges().get(0).getIn().getHeader(SWFConstants.WORKFLOW_ID, String.class);\n+ Assert.assertNotNull(SWFConstants.WORKFLOW_ID + \" not null\", workflowId);\n+ SWFUtils.terminateWorkflowExecution(swfClient, workflowId);\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/DynamoDBUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/DynamoDBUtils.java",
"diff": "@@ -49,6 +49,7 @@ import com.amazonaws.services.dynamodbv2.model.TableDescription;\npublic class DynamoDBUtils {\n+ // Attach Policy: AmazonDynamoDBFullAccess\npublic static AmazonDynamoDBClient createDynamoDBClient() {\nBasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\nAmazonDynamoDBClient client = !credentials.isValid() ? null : (AmazonDynamoDBClient)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/EC2Utils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.builder.RouteBuilder;\n+\n+import com.amazonaws.services.ec2.AmazonEC2Client;\n+import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;\n+\n+public class EC2Utils {\n+\n+ // Attach Policy: AmazonEC2FullAccess\n+ public static AmazonEC2Client createEC2Client() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonEC2Client client = !credentials.isValid() ? null : (AmazonEC2Client)\n+ AmazonEC2ClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+ return client;\n+ }\n+\n+ public static void addRoutes(CamelContext camelctx) throws Exception {\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:createAndRun\").to(\"aws-ec2://TestDomain?amazonEc2Client=#ec2Client&operation=createAndRunInstances\");\n+ from(\"direct:terminate\").to(\"aws-ec2://TestDomain?amazonEc2Client=#ec2Client&operation=terminateInstances\");\n+ }\n+ });\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/S3Utils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/S3Utils.java",
"diff": "*/\npackage org.wildfly.camel.test.common.aws;\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.builder.RouteBuilder;\n+\nimport com.amazonaws.services.s3.AmazonS3Client;\nimport com.amazonaws.services.s3.AmazonS3ClientBuilder;\n@@ -26,6 +29,7 @@ public class S3Utils {\npublic static final String BUCKET_NAME = \"wfc-aws-s3-bucket\";\n+ // Attach Policy: AmazonS3FullAccess\npublic static AmazonS3Client createS3Client() {\nBasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\nAmazonS3Client client = !credentials.isValid() ? null : (AmazonS3Client)\n@@ -36,6 +40,17 @@ public class S3Utils {\nreturn client;\n}\n+ public static void addRoutes(CamelContext camelctx) throws Exception {\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ String clientref = \"amazonS3Client=#s3Client\";\n+ from(\"direct:upload\").to(\"aws-s3://\" + BUCKET_NAME + \"?\" + clientref);\n+ from(\"aws-s3://\" + BUCKET_NAME + \"?\" + clientref).to(\"seda:read\");\n+ }\n+ });\n+ }\n+\npublic static void createBucket(AmazonS3Client client) {\nclient.createBucket(BUCKET_NAME);\n}\n@@ -43,4 +58,5 @@ public class S3Utils {\npublic static void deleteBucket(AmazonS3Client client) {\nclient.deleteBucket(BUCKET_NAME);\n}\n+\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SWFUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.swf.SWFConstants;\n+\n+import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;\n+import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClientBuilder;\n+import com.amazonaws.services.simpleworkflow.model.DomainInfo;\n+import com.amazonaws.services.simpleworkflow.model.ListDomainsRequest;\n+import com.amazonaws.services.simpleworkflow.model.RegisterDomainRequest;\n+import com.amazonaws.services.simpleworkflow.model.TerminateWorkflowExecutionRequest;\n+\n+public class SWFUtils {\n+\n+ public static final String DOMAIN = \"wfcdomain\";\n+\n+ // Attach Policy: SimpleWorkflowFullAccess\n+ public static AmazonSimpleWorkflowClient createSimpleWorkflowClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonSimpleWorkflowClient client = !credentials.isValid() ? null : (AmazonSimpleWorkflowClient)\n+ AmazonSimpleWorkflowClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+ return client;\n+ }\n+\n+ public static void addRoutes(CamelContext camelctx) throws Exception {\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ String options = \"amazonSWClient=#swfClient&domainName=\" + SWFUtils.DOMAIN + \"&activityList=swf-alist&workflowList=swf-wlist&version=1.0\";\n+\n+ from(\"aws-swf://activity?\" + options + \"&eventName=processActivities\")\n+ .log(\"FOUND ACTIVITY TASK ${body}\")\n+ .setBody(constant(\"1\"))\n+ .to(\"mock:worker\");\n+\n+ from(\"aws-swf://workflow?\" + options + \"&eventName=processWorkflows\")\n+ .log(\"FOUND WORKFLOW TASK ${body}\").filter(header(SWFConstants.ACTION).isEqualTo(SWFConstants.EXECUTE_ACTION))\n+ .to(\"aws-swf://activity?\" + options + \"&eventName=processActivities\")\n+ .setBody(constant(\"Message two\"))\n+ .to(\"aws-swf://activity?\" + options + \"&eventName=processActivities\")\n+ .log(\"SENT ACTIVITY TASK ${body}\")\n+ .to(\"mock:decider\");\n+\n+ from(\"direct:start\")\n+ .to(\"aws-swf://workflow?\" + options + \"&eventName=processWorkflows\")\n+ .log(\"SENT WORKFLOW TASK ${body}\")\n+ .to(\"mock:starter\");\n+ }\n+ });\n+ }\n+\n+ public static void registerDomain(AmazonSimpleWorkflowClient swfClient) {\n+ boolean registerDomain = true;\n+ ListDomainsRequest listreq = new ListDomainsRequest().withRegistrationStatus(\"REGISTERED\");\n+ for (DomainInfo domain : swfClient.listDomains(listreq).getDomainInfos()) {\n+ registerDomain &= !DOMAIN.equals(domain.getName());\n+ }\n+ if (registerDomain) {\n+ RegisterDomainRequest domain = new RegisterDomainRequest()\n+ .withWorkflowExecutionRetentionPeriodInDays(\"NONE\")\n+ .withName(DOMAIN);\n+ swfClient.registerDomain(domain);\n+ }\n+ }\n+\n+ public static void terminateWorkflowExecution(AmazonSimpleWorkflowClient swfClient, String workflowId) {\n+ TerminateWorkflowExecutionRequest terminateReq = new TerminateWorkflowExecutionRequest()\n+ .withWorkflowId(workflowId)\n+ .withDomain(DOMAIN);\n+ swfClient.terminateWorkflowExecution(terminateReq);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/DynamoDBIntegrationTest.java",
"diff": "package org.wildfly.camel.test.aws;\n-import java.util.Arrays;\n-import java.util.HashSet;\n-import java.util.List;\n-\nimport javax.inject.Inject;\nimport org.apache.camel.builder.RouteBuilder;\n@@ -14,21 +10,17 @@ import org.jboss.shrinkwrap.api.asset.EmptyAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\nimport org.junit.Assume;\n-import org.junit.Ignore;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\nimport org.wildfly.camel.test.aws.subA.DynamoDBClientProducer;\nimport org.wildfly.camel.test.aws.subA.DynamoDBClientProducer.DynamoDBClientProvider;\nimport org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\nimport org.wildfly.camel.test.common.aws.DynamoDBUtils;\n-import org.wildfly.camel.test.common.types.CatalogItem;\nimport org.wildfly.camel.test.common.types.TableNameProviderA;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\nimport com.amazonaws.services.dynamodbv2.AmazonDynamoDBClient;\n-import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBMapper;\n-import com.amazonaws.services.dynamodbv2.datamodeling.DynamoDBQueryExpression;\nimport com.amazonaws.services.dynamodbv2.model.AttributeValue;\n@CamelAware\n@@ -44,40 +36,11 @@ public class DynamoDBIntegrationTest {\n@Deployment\npublic static JavaArchive deployment() {\nJavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ddb-tests.jar\");\n- archive.addClasses(DynamoDBClientProducer.class, DynamoDBUtils.class, BasicCredentialsProvider.class, CatalogItem.class, TableNameProviderA.class);\n+ archive.addClasses(DynamoDBClientProducer.class, DynamoDBUtils.class, BasicCredentialsProvider.class, TableNameProviderA.class);\narchive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\nreturn archive;\n}\n- @Test\n- @Ignore(\"[#1778] Add support for DynamoDB mapper\")\n- public void testMapperOperations() throws Exception {\n-\n- AmazonDynamoDBClient client = provider.getClient();\n- Assume.assumeNotNull(\"AWS client not null\", client);\n-\n- DynamoDBMapper mapper = new DynamoDBMapper(client);\n-\n- CatalogItem item = new CatalogItem();\n- item.setId(102);\n- item.setTitle(\"Book 102 Title\");\n- item.setISBN(\"222-2222222222\");\n- item.setBookAuthors(new HashSet<String>(Arrays.asList(\"Author 1\", \"Author 2\")));\n- item.setSomeProp(\"Test\");\n-\n- mapper.save(item);\n-\n- item = new CatalogItem();\n- item.setId(102);\n-\n- DynamoDBQueryExpression<CatalogItem> exp = new DynamoDBQueryExpression<CatalogItem>().withHashKeyValues(item);\n-\n- List<CatalogItem> result = mapper.query(CatalogItem.class, exp);\n- Assert.assertEquals(1, result.size());\n- Assert.assertEquals(new Integer(102), result.get(0).getId());\n- Assert.assertEquals(\"Book 102 Title\", result.get(0).getTitle());\n- }\n-\n@Test\npublic void testKeyValueOperations() throws Exception {\n"
},
{
"change_type": "RENAME",
"old_path": "itests/standalone/extra/src/main/java/org/wildfly/camel/test/aws/EC2IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/EC2IntegrationTest.java",
"diff": "@@ -24,25 +24,27 @@ import java.util.Collections;\nimport java.util.HashMap;\nimport java.util.Map;\n+import javax.inject.Inject;\n+\nimport org.apache.camel.ProducerTemplate;\n-import org.apache.camel.builder.RouteBuilder;\nimport org.apache.camel.component.aws.ec2.EC2Constants;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\nimport org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\nimport org.jboss.shrinkwrap.api.spec.JavaArchive;\nimport org.junit.Assert;\nimport org.junit.Assume;\nimport org.junit.Test;\nimport org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.EC2ClientProducer;\n+import org.wildfly.camel.test.aws.subA.EC2ClientProducer.EC2ClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.EC2Utils;\nimport org.wildfly.extension.camel.CamelAware;\nimport org.wildfly.extension.camel.WildFlyCamelContext;\n-import com.amazonaws.auth.AWSCredentials;\n-import com.amazonaws.auth.AWSCredentialsProvider;\n-import com.amazonaws.auth.BasicAWSCredentials;\n-import com.amazonaws.services.ec2.AmazonEC2;\n-import com.amazonaws.services.ec2.AmazonEC2ClientBuilder;\n+import com.amazonaws.services.ec2.AmazonEC2Client;\nimport com.amazonaws.services.ec2.model.InstanceType;\nimport com.amazonaws.services.ec2.model.RunInstancesResult;\nimport com.amazonaws.services.ec2.model.TerminateInstancesResult;\n@@ -51,35 +53,26 @@ import com.amazonaws.services.ec2.model.TerminateInstancesResult;\n@RunWith(Arquillian.class)\npublic class EC2IntegrationTest {\n+ @Inject\n+ private EC2ClientProvider provider;\n+\n@Deployment\npublic static JavaArchive deployment() {\n- return ShrinkWrap.create(JavaArchive.class, \"aws-ec2-tests\");\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ec2-tests.jar\");\n+ archive.addClasses(EC2ClientProducer.class, EC2Utils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n}\n@Test\npublic void testCreateInstance() throws Exception {\n- String accessId = System.getenv(\"AWS_ACCESS_ID\");\n- String secretKey = System.getenv(\"AWS_SECRET_KEY\");\n- Assume.assumeNotNull(\"AWS_ACCESS_ID not null\", accessId);\n- Assume.assumeNotNull(\"AWS_SECRET_KEY not null\", secretKey);\n+ AmazonEC2Client ec2Client = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", ec2Client);\nWildFlyCamelContext camelctx = new WildFlyCamelContext();\n- camelctx.addRoutes(new RouteBuilder() {\n- @Override\n- public void configure() throws Exception {\n- String clientref = \"amazonEc2Client=#ec2Client\";\n- from(\"direct:createAndRun\").to(\"aws-ec2://TestDomain?\" + clientref + \"&operation=createAndRunInstances\");\n- from(\"direct:terminate\").to(\"aws-ec2://TestDomain?\" + clientref + \"&operation=terminateInstances\");\n- }\n- });\n-\n- AmazonEC2 client = AmazonEC2ClientBuilder.standard()\n- .withCredentials(new StaticCredentialsProvider(new BasicAWSCredentials(accessId, secretKey)))\n- .withRegion(\"eu-west-1\")\n- .build();\n-\n- camelctx.getNamingContext().bind(\"ec2Client\", client);\n+ camelctx.getNamingContext().bind(\"ec2Client\", ec2Client);\n+ EC2Utils.addRoutes(camelctx);\ncamelctx.start();\ntry {\n@@ -107,22 +100,4 @@ public class EC2IntegrationTest {\ncamelctx.stop();\n}\n}\n-\n- static class StaticCredentialsProvider implements AWSCredentialsProvider {\n-\n- private final AWSCredentials credentials;\n-\n- public StaticCredentialsProvider(AWSCredentials credentials) {\n- this.credentials = credentials;\n- }\n-\n- @Override\n- public AWSCredentials getCredentials() {\n- return credentials;\n- }\n-\n- @Override\n- public void refresh() {\n- }\n- }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/S3IntegrationTest.java",
"diff": "@@ -7,7 +7,6 @@ import javax.inject.Inject;\nimport org.apache.camel.ConsumerTemplate;\nimport org.apache.camel.ProducerTemplate;\n-import org.apache.camel.builder.RouteBuilder;\nimport org.apache.camel.component.aws.s3.S3Constants;\nimport org.jboss.arquillian.container.test.api.Deployment;\nimport org.jboss.arquillian.junit.Arquillian;\n@@ -51,15 +50,8 @@ public class S3IntegrationTest {\nAssume.assumeNotNull(\"AWS client not null\", s3Client);\nWildFlyCamelContext camelctx = new WildFlyCamelContext();\n- camelctx.addRoutes(new RouteBuilder() {\n- @Override\n- public void configure() throws Exception {\n- String clientref = \"amazonS3Client=#s3Client\";\n- from(\"direct:upload\").to(\"aws-s3://\" + S3Utils.BUCKET_NAME + \"?\" + clientref);\n- from(\"aws-s3://\" + S3Utils.BUCKET_NAME + \"?\" + clientref).to(\"seda:read\");\n- }\n- });\ncamelctx.getNamingContext().bind(\"s3Client\", s3Client);\n+ S3Utils.addRoutes(camelctx);\ntry {\ncamelctx.start();\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SWFIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.aws;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.component.aws.swf.SWFConstants;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.SWFClientProducer;\n+import org.wildfly.camel.test.aws.subA.SWFClientProducer.SWFClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.SWFUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class SWFIntegrationTest {\n+\n+ @Inject\n+ private SWFClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-swf-tests.jar\");\n+ archive.addClasses(SWFClientProducer.class, SWFUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void deciderAndWorker() throws Exception {\n+\n+ AmazonSimpleWorkflowClient swfClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", swfClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"swfClient\", swfClient);\n+ SWFUtils.addRoutes(camelctx);\n+\n+ MockEndpoint decider = camelctx.getEndpoint(\"mock:decider\", MockEndpoint.class);\n+ MockEndpoint worker = camelctx.getEndpoint(\"mock:worker\", MockEndpoint.class);\n+ MockEndpoint starter = camelctx.getEndpoint(\"mock:starter\", MockEndpoint.class);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.sendBody(\"direct:start\", \"Hello world!\");\n+\n+ starter.expectedMessageCount(1);\n+ decider.expectedMinimumMessageCount(1);\n+ worker.expectedMessageCount(2);\n+\n+ String workflowId = starter.getReceivedExchanges().get(0).getIn().getHeader(SWFConstants.WORKFLOW_ID, String.class);\n+ Assert.assertNotNull(SWFConstants.WORKFLOW_ID + \" not null\", workflowId);\n+ SWFUtils.terminateWorkflowExecution(swfClient, workflowId);\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/EC2ClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.EC2Utils;\n+\n+import com.amazonaws.services.ec2.AmazonEC2Client;\n+\n+public class EC2ClientProducer {\n+\n+ public class EC2ClientProvider {\n+ private final AmazonEC2Client client;\n+ EC2ClientProvider(AmazonEC2Client client) {\n+ this.client = client;\n+ }\n+ public AmazonEC2Client getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public EC2ClientProvider getClientProvider() throws Exception {\n+ AmazonEC2Client client = EC2Utils.createEC2Client();\n+ return new EC2ClientProvider(client);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SWFClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.SWFUtils;\n+\n+import com.amazonaws.services.simpleworkflow.AmazonSimpleWorkflowClient;\n+\n+public class SWFClientProducer {\n+\n+ public class SWFClientProvider {\n+ private final AmazonSimpleWorkflowClient client;\n+ SWFClientProvider(AmazonSimpleWorkflowClient client) {\n+ this.client = client;\n+ }\n+ public AmazonSimpleWorkflowClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public SWFClientProvider getClientProvider() throws Exception {\n+ AmazonSimpleWorkflowClient client = SWFUtils.createSimpleWorkflowClient();\n+ if (client != null) {\n+ SWFUtils.registerDomain(client);\n+ }\n+ return new SWFClientProvider(client);\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1418] Add support for component aws-swf
|
734,358 |
08.05.2017 14:32:32
| -7,200 |
499acd966512d77998d43051b39d5c4e1a9b4fa5
|
[resolves Add support for component aws-ses
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-ses.adoc",
"diff": "+### camel-aws-ses\n+\n+The http://camel.apache.org/aws-ses.html[AWS Simple Email Service,window=_blank] component supports sending emails with from http://aws.amazon.com/ses[Amazon's SES,window=_blank] service.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -20,6 +20,8 @@ include::camel-aws-ec2.adoc[]\ninclude::camel-aws-s3.adoc[]\n+include::camel-aws-ses.adoc[]\n+\ninclude::camel-aws-swf.adoc[]\ninclude::camel-bean-validator.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "<exclude path=\"com/amazonaws/http**\" />\n</exports>\n</module>\n+ <module name=\"javax.mail.api\" />\n<module name=\"org.slf4j\" />\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"diff": "<exclude path=\"com/amazonaws/http**\" />\n</exports>\n</module>\n+ <module name=\"javax.mail.api\" />\n<module name=\"org.slf4j\" />\n<module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n<module name=\"com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SESIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.plain.aws;\n+\n+import java.util.Collections;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.ExchangeBuilder;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.ses.SesConstants;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.SESUtils;\n+\n+import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;\n+\n+public class SESIntegrationTest {\n+\n+ private static AmazonSimpleEmailServiceClient sesClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ sesClient = SESUtils.createSimpleEmailClient();\n+ }\n+\n+ @Test\n+ public void sendSimpleMessage() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", sesClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"sesClient\", sesClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-ses://\" + SESUtils.FROM + \"?amazonSESClient=#sesClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ Exchange exchange = ExchangeBuilder.anExchange(camelctx)\n+ .withHeader(SesConstants.SUBJECT, SESUtils.SUBJECT)\n+ .withHeader(SesConstants.TO, Collections.singletonList(SESUtils.TO))\n+ .withBody(\"Hello world!\")\n+ .build();\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange result = producer.send(\"direct:start\", exchange);\n+\n+ String messageId = result.getIn().getHeader(SesConstants.MESSAGE_ID, String.class);\n+ Assert.assertNotNull(\"MessageId not null\", messageId);\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SESUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;\n+import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClientBuilder;\n+\n+public class SESUtils {\n+\n+ public static final String SUBJECT = \"[wfc-aws-ses] Test Subject\";\n+ public static final String FROM = \"tdiesler@redhat.com\";\n+ public static final String TO = \"tdiesler@redhat.com\";\n+\n+ // Attach Policy: AmazonSESFullAccess\n+ public static AmazonSimpleEmailServiceClient createSimpleEmailClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonSimpleEmailServiceClient client = !credentials.isValid() ? null : (AmazonSimpleEmailServiceClient)\n+ AmazonSimpleEmailServiceClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+ return client;\n+ }\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SESIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.aws;\n+\n+import java.util.Collections;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.ExchangeBuilder;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.ses.SesConstants;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.SESClientProducer;\n+import org.wildfly.camel.test.aws.subA.SESClientProducer.SESClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.SESUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class SESIntegrationTest {\n+\n+ @Inject\n+ private SESClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-ses-tests.jar\");\n+ archive.addClasses(SESClientProducer.class, SESUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void sendSimpleMessage() throws Exception {\n+\n+ AmazonSimpleEmailServiceClient sesClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", sesClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"sesClient\", sesClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-ses://\" + SESUtils.FROM + \"?amazonSESClient=#sesClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ Exchange exchange = ExchangeBuilder.anExchange(camelctx)\n+ .withHeader(SesConstants.SUBJECT, SESUtils.SUBJECT)\n+ .withHeader(SesConstants.TO, Collections.singletonList(SESUtils.TO))\n+ .withBody(\"Hello world!\")\n+ .build();\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange result = producer.send(\"direct:start\", exchange);\n+\n+ String messageId = result.getIn().getHeader(SesConstants.MESSAGE_ID, String.class);\n+ Assert.assertNotNull(\"MessageId not null\", messageId);\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SESClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.SESUtils;\n+\n+import com.amazonaws.services.simpleemail.AmazonSimpleEmailServiceClient;\n+\n+public class SESClientProducer {\n+\n+ public class SESClientProvider {\n+ private final AmazonSimpleEmailServiceClient client;\n+ SESClientProvider(AmazonSimpleEmailServiceClient client) {\n+ this.client = client;\n+ }\n+ public AmazonSimpleEmailServiceClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public SESClientProvider getClientProvider() throws Exception {\n+ AmazonSimpleEmailServiceClient client = SESUtils.createSimpleEmailClient();\n+ return new SESClientProvider(client);\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1415] Add support for component aws-ses
|
734,358 |
08.05.2017 16:17:12
| -7,200 |
cf85325f8af5188c6133827087d7820d6fdcbf1d
|
[resolves Add support for component aws-sns
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-sns.adoc",
"diff": "+### camel-aws-sns\n+\n+The http://camel.apache.org/aws-sns.html[AWS SNS,window=_blank] component allows messages to be sent to an http://aws.amazon.com/sns[Amazon Simple Notification,window=_blank] Topic.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -22,6 +22,8 @@ include::camel-aws-s3.adoc[]\ninclude::camel-aws-ses.adoc[]\n+include::camel-aws-sns.adoc[]\n+\ninclude::camel-aws-swf.adoc[]\ninclude::camel-bean-validator.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SESIntegrationTest.java",
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SESIntegrationTest.java",
"diff": "@@ -40,7 +40,7 @@ public class SESIntegrationTest {\n@BeforeClass\npublic static void beforeClass() throws Exception {\n- sesClient = SESUtils.createSimpleEmailClient();\n+ sesClient = SESUtils.createEmailClient();\n}\n@Test\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SNSIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.plain.aws;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ExchangePattern;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.sns.SnsConstants;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.SNSUtils;\n+\n+import com.amazonaws.services.sns.AmazonSNSClient;\n+\n+public class SNSIntegrationTest {\n+\n+ private static AmazonSNSClient snsClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ snsClient = SNSUtils.createNotificationClient();\n+ }\n+\n+ @Test\n+ public void sendInOnly() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", snsClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"snsClient\", snsClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-sns://\" + SNSUtils.TOPIC_NAME + \"?amazonSNSClient=#snsClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange exchange = producer.send(\"direct:start\", ExchangePattern.InOnly, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SnsConstants.SUBJECT, \"This is my subject\");\n+ exchange.getIn().setBody(\"This is my message text.\");\n+ }\n+ });\n+\n+ Assert.assertNotNull(exchange.getIn().getHeader(SnsConstants.MESSAGE_ID));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ @Test\n+ public void sendInOut() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", snsClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"snsClient\", snsClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-sns://MyNewTopic?amazonSNSClient=#snsClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange exchange = producer.send(\"direct:start\", ExchangePattern.InOut, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SnsConstants.SUBJECT, \"This is my subject\");\n+ exchange.getIn().setBody(\"This is my message text.\");\n+ }\n+ });\n+\n+ Assert.assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SWFIntegrationTest.java",
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SWFIntegrationTest.java",
"diff": "@@ -36,7 +36,7 @@ public class SWFIntegrationTest {\n@BeforeClass\npublic static void beforeClass() throws Exception {\n- swfClient = SWFUtils.createSimpleWorkflowClient();\n+ swfClient = SWFUtils.createWorkflowClient();\nif (swfClient != null) {\nSWFUtils.registerDomain(swfClient);\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SESUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SESUtils.java",
"diff": "@@ -29,7 +29,7 @@ public class SESUtils {\npublic static final String TO = \"tdiesler@redhat.com\";\n// Attach Policy: AmazonSESFullAccess\n- public static AmazonSimpleEmailServiceClient createSimpleEmailClient() {\n+ public static AmazonSimpleEmailServiceClient createEmailClient() {\nBasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\nAmazonSimpleEmailServiceClient client = !credentials.isValid() ? null : (AmazonSimpleEmailServiceClient)\nAmazonSimpleEmailServiceClientBuilder.standard()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SNSUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import com.amazonaws.services.sns.AmazonSNSClient;\n+import com.amazonaws.services.sns.AmazonSNSClientBuilder;\n+\n+public class SNSUtils {\n+\n+ public static final String TOPIC_NAME = \"MyNewTopic\";\n+\n+ // Attach Policy: AmazonSNSFullAccess\n+ public static AmazonSNSClient createNotificationClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonSNSClient client = !credentials.isValid() ? null : (AmazonSNSClient)\n+ AmazonSNSClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\")\n+ .build();\n+ return client;\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SWFUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SWFUtils.java",
"diff": "@@ -35,7 +35,7 @@ public class SWFUtils {\npublic static final String DOMAIN = \"wfcdomain\";\n// Attach Policy: SimpleWorkflowFullAccess\n- public static AmazonSimpleWorkflowClient createSimpleWorkflowClient() {\n+ public static AmazonSimpleWorkflowClient createWorkflowClient() {\nBasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\nAmazonSimpleWorkflowClient client = !credentials.isValid() ? null : (AmazonSimpleWorkflowClient)\nAmazonSimpleWorkflowClientBuilder.standard()\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SNSIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.aws;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ExchangePattern;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.sns.SnsConstants;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.SNSClientProducer;\n+import org.wildfly.camel.test.aws.subA.SNSClientProducer.SNSClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.SNSUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.sns.AmazonSNSClient;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class SNSIntegrationTest {\n+\n+ @Inject\n+ private SNSClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-sns-tests.jar\");\n+ archive.addClasses(SNSClientProducer.class, SNSUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void sendInOnly() throws Exception {\n+\n+ AmazonSNSClient snsClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", snsClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"snsClientA\", snsClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-sns://\" + SNSUtils.TOPIC_NAME + \"?amazonSNSClient=#snsClientA\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange exchange = producer.send(\"direct:start\", ExchangePattern.InOnly, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SnsConstants.SUBJECT, \"This is my subject\");\n+ exchange.getIn().setBody(\"This is my message text.\");\n+ }\n+ });\n+\n+ Assert.assertNotNull(exchange.getIn().getHeader(SnsConstants.MESSAGE_ID));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ @Test\n+ public void sendInOut() throws Exception {\n+\n+ AmazonSNSClient snsClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", snsClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"snsClientB\", snsClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-sns://\" + SNSUtils.TOPIC_NAME + \"?amazonSNSClient=#snsClientB\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange exchange = producer.send(\"direct:start\", ExchangePattern.InOut, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SnsConstants.SUBJECT, \"This is my subject\");\n+ exchange.getIn().setBody(\"This is my message text.\");\n+ }\n+ });\n+\n+ Assert.assertNotNull(exchange.getOut().getHeader(SnsConstants.MESSAGE_ID));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SESClientProducer.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SESClientProducer.java",
"diff": "@@ -41,7 +41,7 @@ public class SESClientProducer {\n@Produces\n@Singleton\npublic SESClientProvider getClientProvider() throws Exception {\n- AmazonSimpleEmailServiceClient client = SESUtils.createSimpleEmailClient();\n+ AmazonSimpleEmailServiceClient client = SESUtils.createEmailClient();\nreturn new SESClientProvider(client);\n}\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SNSClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.SNSUtils;\n+\n+import com.amazonaws.services.sns.AmazonSNSClient;\n+\n+public class SNSClientProducer {\n+\n+ public class SNSClientProvider {\n+ private final AmazonSNSClient client;\n+ SNSClientProvider(AmazonSNSClient client) {\n+ this.client = client;\n+ }\n+ public AmazonSNSClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public SNSClientProvider getClientProvider() throws Exception {\n+ AmazonSNSClient client = SNSUtils.createNotificationClient();\n+ return new SNSClientProvider(client);\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SWFClientProducer.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SWFClientProducer.java",
"diff": "@@ -41,7 +41,7 @@ public class SWFClientProducer {\n@Produces\n@Singleton\npublic SWFClientProvider getClientProvider() throws Exception {\n- AmazonSimpleWorkflowClient client = SWFUtils.createSimpleWorkflowClient();\n+ AmazonSimpleWorkflowClient client = SWFUtils.createWorkflowClient();\nif (client != null) {\nSWFUtils.registerDomain(client);\n}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1416] Add support for component aws-sns
|
734,358 |
10.05.2017 12:46:56
| -7,200 |
5402dc074e6d927276378e4c70ed55303737c845
|
[resolves Add support for component aws-sdb
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-sdb.adoc",
"diff": "+### camel-aws-sdb\n+\n+The http://camel.apache.org/aws-sdb.html[AWS SDB,window=_blank] component storing and retrieving data from/to http://aws.amazon.com/sdb[Amazon's SDB,window=_blank] service.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -20,6 +20,8 @@ include::camel-aws-ec2.adoc[]\ninclude::camel-aws-s3.adoc[]\n+include::camel-aws-sdb.adoc[]\n+\ninclude::camel-aws-ses.adoc[]\ninclude::camel-aws-sns.adoc[]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SDBIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.plain.aws;\n+\n+import java.util.Collections;\n+import java.util.List;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.sdb.SdbConstants;\n+import org.apache.camel.component.aws.sdb.SdbOperations;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.AfterClass;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.SDBUtils;\n+\n+import com.amazonaws.services.simpledb.AmazonSimpleDBClient;\n+import com.amazonaws.services.simpledb.model.Attribute;\n+import com.amazonaws.services.simpledb.model.ReplaceableAttribute;\n+\n+public class SDBIntegrationTest {\n+\n+ public static AmazonSimpleDBClient sdbClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ sdbClient = SDBUtils.createDBClient();\n+ if (sdbClient != null) {\n+ SDBUtils.createDomain(sdbClient);\n+ }\n+ }\n+\n+ @AfterClass\n+ public static void afterClass() throws Exception {\n+ if (sdbClient != null) {\n+ SDBUtils.deleteDomain(sdbClient);\n+ }\n+ }\n+\n+ @Test\n+ @SuppressWarnings(\"unchecked\")\n+ public void putAndGetAttributes() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", sdbClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"sdbClient\", sdbClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\").to(\"aws-sdb://\" + SDBUtils.DOMAIN_NAME + \"?amazonSDBClient=#sdbClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ ReplaceableAttribute attr = new ReplaceableAttribute(\"SomeName\", \"SomeValue\", true);\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange exchange = producer.send(\"direct:start\", new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);\n+ exchange.getIn().setHeader(SdbConstants.ITEM_NAME, SDBUtils.ITEM_NAME);\n+ exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, Collections.singletonList(attr));\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+\n+ int retries = 10;\n+ List<Attribute> result = Collections.emptyList();\n+ while (result.isEmpty() && 0 < retries--) {\n+ exchange = producer.send(\"direct:start\", new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);\n+ exchange.getIn().setHeader(SdbConstants.ITEM_NAME, SDBUtils.ITEM_NAME);\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+ result = exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, List.class);\n+ System.out.println(retries + \": \" + result);\n+ Thread.sleep(500);\n+ }\n+ Assert.assertEquals(1, result.size());\n+ Assert.assertEquals(attr.getName(), result.get(0).getName());\n+ Assert.assertEquals(attr.getValue(), result.get(0).getValue());\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SDBUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import java.util.List;\n+\n+import org.junit.Assert;\n+\n+import com.amazonaws.services.simpledb.AmazonSimpleDBClient;\n+import com.amazonaws.services.simpledb.AmazonSimpleDBClientBuilder;\n+import com.amazonaws.services.simpledb.model.CreateDomainRequest;\n+import com.amazonaws.services.simpledb.model.DeleteDomainRequest;\n+\n+public class SDBUtils {\n+\n+ public static final String DOMAIN_NAME = \"TestDomain\";\n+ public static final String ITEM_NAME = \"TestItem\";\n+\n+ /* Attach a policy like this: MySDBFullAccess\n+ {\n+ \"Version\": \"2012-10-17\",\n+ \"Statement\": [\n+ {\n+ \"Sid\": \"Stmt1494415798000\",\n+ \"Effect\": \"Allow\",\n+ \"Action\": [\n+ \"sdb:*\"\n+ ],\n+ \"Resource\": [\n+ \"arn:aws:sdb:*\"\n+ ]\n+ }\n+ ]\n+ }\n+ */\n+ public static AmazonSimpleDBClient createDBClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonSimpleDBClient client = !credentials.isValid() ? null\n+ : (AmazonSimpleDBClient) AmazonSimpleDBClientBuilder.standard().withCredentials(credentials).withRegion(\"eu-west-1\").build();\n+ return client;\n+ }\n+\n+ public static void createDomain(AmazonSimpleDBClient sdbClient) throws InterruptedException {\n+ sdbClient.createDomain(new CreateDomainRequest(DOMAIN_NAME));\n+\n+ int retries = 10;\n+ List<String> domainNames = sdbClient.listDomains().getDomainNames();\n+ while (!domainNames.contains(DOMAIN_NAME) && 0 < retries--) {\n+ Thread.sleep(500);\n+ domainNames = sdbClient.listDomains().getDomainNames();\n+ }\n+ Assert.assertTrue(domainNames.contains(DOMAIN_NAME));\n+ }\n+\n+ public static void deleteDomain(AmazonSimpleDBClient sdbClient) throws InterruptedException {\n+ sdbClient.deleteDomain(new DeleteDomainRequest(DOMAIN_NAME));\n+\n+ int retries = 10;\n+ List<String> domainNames = sdbClient.listDomains().getDomainNames();\n+ while (domainNames.contains(DOMAIN_NAME) && 0 < retries--) {\n+ Thread.sleep(500);\n+ domainNames = sdbClient.listDomains().getDomainNames();\n+ }\n+ Assert.assertFalse(domainNames.contains(DOMAIN_NAME));\n+ }\n+\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SDBIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.aws;\n+\n+import java.util.Collections;\n+import java.util.List;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.Exchange;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.sdb.SdbConstants;\n+import org.apache.camel.component.aws.sdb.SdbOperations;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.SDBClientProducer;\n+import org.wildfly.camel.test.aws.subA.SDBClientProducer.SDBClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.SDBUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.simpledb.AmazonSimpleDBClient;\n+import com.amazonaws.services.simpledb.model.Attribute;\n+import com.amazonaws.services.simpledb.model.ReplaceableAttribute;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class SDBIntegrationTest {\n+\n+ @Inject\n+ private SDBClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-sdb-tests.jar\");\n+ archive.addClasses(SDBClientProducer.class, SDBUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ @SuppressWarnings(\"unchecked\")\n+ public void putAndGetAttributes() throws Exception {\n+\n+ AmazonSimpleDBClient sdbClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", sdbClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"sdbClient\", sdbClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\").to(\"aws-sdb://\" + SDBUtils.DOMAIN_NAME + \"?amazonSDBClient=#sdbClient\");\n+ }\n+ });\n+\n+ camelctx.start();\n+ try {\n+ ReplaceableAttribute attr = new ReplaceableAttribute(\"SomeName\", \"SomeValue\", true);\n+\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ Exchange exchange = producer.send(\"direct:start\", new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.PutAttributes);\n+ exchange.getIn().setHeader(SdbConstants.ITEM_NAME, SDBUtils.ITEM_NAME);\n+ exchange.getIn().setHeader(SdbConstants.REPLACEABLE_ATTRIBUTES, Collections.singletonList(attr));\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+\n+ int retries = 10;\n+ List<Attribute> result = Collections.emptyList();\n+ while (result.isEmpty() && 0 < retries--) {\n+ exchange = producer.send(\"direct:start\", new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(SdbConstants.OPERATION, SdbOperations.GetAttributes);\n+ exchange.getIn().setHeader(SdbConstants.ITEM_NAME, SDBUtils.ITEM_NAME);\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+ result = exchange.getIn().getHeader(SdbConstants.ATTRIBUTES, List.class);\n+ System.out.println(retries + \": \" + result);\n+ Thread.sleep(500);\n+ }\n+ Assert.assertEquals(1, result.size());\n+ Assert.assertEquals(attr.getName(), result.get(0).getName());\n+ Assert.assertEquals(attr.getValue(), result.get(0).getValue());\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SDBClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Disposes;\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.SDBUtils;\n+\n+import com.amazonaws.services.simpledb.AmazonSimpleDBClient;\n+\n+public class SDBClientProducer {\n+\n+ public class SDBClientProvider {\n+ private final AmazonSimpleDBClient client;\n+ SDBClientProvider(AmazonSimpleDBClient client) {\n+ this.client = client;\n+ }\n+ public AmazonSimpleDBClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public SDBClientProvider getClientProvider() throws Exception {\n+ AmazonSimpleDBClient client = SDBUtils.createDBClient();\n+ if (client != null) {\n+ SDBUtils.createDomain(client);\n+ }\n+ return new SDBClientProvider(client);\n+ }\n+\n+ public void close(@Disposes SDBClientProvider provider) throws Exception {\n+ AmazonSimpleDBClient client = provider.getClient();\n+ if (client != null) {\n+ SDBUtils.deleteDomain(client);\n+ }\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1414] Add support for component aws-sdb
|
734,358 |
11.05.2017 09:05:20
| -7,200 |
b62ab99c81603b5eccc025366c7c874b78d52d8b
|
[resolves Add support for component aws-sqs
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-sqs.adoc",
"diff": "+### camel-aws-sqs\n+\n+The http://camel.apache.org/aws-sqs.html[AWS SQS,window=_blank] component sending and receiving messages to http://aws.amazon.com/sdb[Amazon's SQS,window=_blank] service.\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -26,6 +26,8 @@ include::camel-aws-ses.adoc[]\ninclude::camel-aws-sns.adoc[]\n+include::camel-aws-sqs.adoc[]\n+\ninclude::camel-aws-swf.adoc[]\ninclude::camel-bean-validator.adoc[]\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SQSIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.plain.aws;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ExchangePattern;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.sqs.SqsConstants;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.AfterClass;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.SQSUtils;\n+\n+import com.amazonaws.services.sqs.AmazonSQSClient;\n+\n+public class SQSIntegrationTest {\n+\n+ public static AmazonSQSClient sqsClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ sqsClient = SQSUtils.createSQSClient();\n+ if (sqsClient != null) {\n+ SQSUtils.createQueue(sqsClient);\n+ }\n+ }\n+\n+ @AfterClass\n+ public static void afterClass() throws Exception {\n+ if (sqsClient != null) {\n+ SQSUtils.deleteQueue(sqsClient);\n+ }\n+ }\n+\n+ @Test\n+ public void sendInOnly() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", sqsClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"sqsClient\", sqsClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-sqs://\" + SQSUtils.QUEUE_NAME + \"?amazonSQSClient=#sqsClient\");\n+\n+ from(\"aws-sqs://\" + SQSUtils.QUEUE_NAME + \"?amazonSQSClient=#sqsClient\")\n+ .to(\"mock:result\");\n+ }\n+ });\n+\n+ MockEndpoint result = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ result.expectedMessageCount(1);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+\n+ producer.send(\"direct:start\", ExchangePattern.InOnly, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setBody(\"This is my message text.\");\n+ }\n+ });\n+\n+ result.assertIsSatisfied();\n+\n+ Exchange exchange = result.getExchanges().get(0);\n+ Assert.assertEquals(\"This is my message text.\", exchange.getIn().getBody());\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));\n+ Assert.assertEquals(\"6a1559560f67c5e7a7d5d838bf0272ee\", exchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.ATTRIBUTES));\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SDBUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SDBUtils.java",
"diff": "@@ -52,8 +52,10 @@ public class SDBUtils {\n*/\npublic static AmazonSimpleDBClient createDBClient() {\nBasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n- AmazonSimpleDBClient client = !credentials.isValid() ? null\n- : (AmazonSimpleDBClient) AmazonSimpleDBClientBuilder.standard().withCredentials(credentials).withRegion(\"eu-west-1\").build();\n+ AmazonSimpleDBClient client = !credentials.isValid() ? null : (AmazonSimpleDBClient)\n+ AmazonSimpleDBClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\").build();\nreturn client;\n}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SQSUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import com.amazonaws.services.sqs.AmazonSQSClient;\n+import com.amazonaws.services.sqs.AmazonSQSClientBuilder;\n+\n+public class SQSUtils {\n+\n+ public static final String QUEUE_NAME = \"MyNewCamelQueue\" + SQSUtils.class.hashCode();\n+\n+ public static AmazonSQSClient createSQSClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonSQSClient client = !credentials.isValid() ? null : (AmazonSQSClient)\n+ AmazonSQSClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\").build();\n+ return client;\n+ }\n+\n+ public static void createQueue(AmazonSQSClient sqsClient) {\n+ sqsClient.createQueue(QUEUE_NAME);\n+ }\n+\n+ public static void deleteQueue(AmazonSQSClient sqsClient) {\n+ sqsClient.deleteQueue(QUEUE_NAME);\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SQSIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.aws;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ExchangePattern;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.sqs.SqsConstants;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.SQSClientProducer;\n+import org.wildfly.camel.test.aws.subA.SQSClientProducer.SQSClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.SQSUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.sqs.AmazonSQSClient;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class SQSIntegrationTest {\n+\n+ @Inject\n+ private SQSClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-sqs-tests.jar\");\n+ archive.addClasses(SQSClientProducer.class, SQSUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void sendInOnly() throws Exception {\n+\n+ AmazonSQSClient sqsClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", sqsClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"sqsClient\", sqsClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-sqs://\" + SQSUtils.QUEUE_NAME + \"?amazonSQSClient=#sqsClient\");\n+\n+ from(\"aws-sqs://\" + SQSUtils.QUEUE_NAME + \"?amazonSQSClient=#sqsClient\")\n+ .to(\"mock:result\");\n+ }\n+ });\n+\n+ MockEndpoint result = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ result.expectedMessageCount(1);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+\n+ producer.send(\"direct:start\", ExchangePattern.InOnly, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setBody(\"This is my message text.\");\n+ }\n+ });\n+\n+ result.assertIsSatisfied();\n+\n+ Exchange exchange = result.getExchanges().get(0);\n+ Assert.assertEquals(\"This is my message text.\", exchange.getIn().getBody());\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));\n+ Assert.assertEquals(\"6a1559560f67c5e7a7d5d838bf0272ee\", exchange.getIn().getHeader(SqsConstants.MD5_OF_BODY));\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.ATTRIBUTES));\n+ Assert.assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ATTRIBUTES));\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/SQSClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Disposes;\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.SQSUtils;\n+\n+import com.amazonaws.services.sqs.AmazonSQSClient;\n+\n+public class SQSClientProducer {\n+\n+ public class SQSClientProvider {\n+ private final AmazonSQSClient client;\n+ SQSClientProvider(AmazonSQSClient client) {\n+ this.client = client;\n+ }\n+ public AmazonSQSClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public SQSClientProvider getClientProvider() throws Exception {\n+ AmazonSQSClient client = SQSUtils.createSQSClient();\n+ if (client != null) {\n+ SQSUtils.createQueue(client);\n+ }\n+ return new SQSClientProvider(client);\n+ }\n+\n+ public void close(@Disposes SQSClientProvider provider) throws Exception {\n+ AmazonSQSClient client = provider.getClient();\n+ if (client != null) {\n+ SQSUtils.deleteQueue(client);\n+ }\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1417] Add support for component aws-sqs
|
734,358 |
11.05.2017 10:34:45
| -7,200 |
2aec9b4fe36d5a5d6ecd54860cb8c553f67590bf
|
[resolves Add support for component aws-kinesis
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-aws-kinesis.adoc",
"diff": "+### camel-aws-kinesis\n+\n+The http://camel.apache.org/aws-kinesis.html[AWS CloudWatch,window=_blank] component supports receiving messages from and sending messages to https://aws.amazon.com/kinesis[Amazon Kinesis,window=_blank] service.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -18,6 +18,8 @@ include::camel-aws-ddbstream.adoc[]\ninclude::camel-aws-ec2.adoc[]\n+include::camel-aws-kinesis.adoc[]\n+\ninclude::camel-aws-s3.adoc[]\ninclude::camel-aws-sdb.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n<dependencies>\n+ <module name=\"javax.mail.api\" />\n<module name=\"com.amazon.aws\" export=\"true\" >\n<exports>\n<exclude path=\"com/amazonaws/http**\" />\n</exports>\n</module>\n- <module name=\"javax.mail.api\" />\n+ <module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n<module name=\"org.slf4j\" />\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"diff": "<artifact name=\"${org.apache.camel:camel-aws}\" />\n</resources>\n<dependencies>\n+ <module name=\"javax.mail.api\" />\n<module name=\"com.amazon.aws\" export=\"true\">\n<exports>\n<exclude path=\"com/amazonaws/http**\" />\n</exports>\n</module>\n- <module name=\"javax.mail.api\" />\n+ <module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n<module name=\"org.slf4j\" />\n<module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n<module name=\"com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/pom.xml",
"new_path": "itests/camel/pom.xml",
"diff": "<groupId>org.jboss.modules</groupId>\n<artifactId>jboss-modules</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>com.fasterxml.jackson.dataformat</groupId>\n+ <artifactId>jackson-dataformat-cbor</artifactId>\n+ <version>2.8.8</version>\n+ </dependency>\n<!-- Test -->\n<dependency>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/KinesisIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.plain.aws;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ExchangePattern;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.kinesis.KinesisConstants;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.impl.SimpleRegistry;\n+import org.junit.AfterClass;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.BeforeClass;\n+import org.junit.Test;\n+import org.wildfly.camel.test.common.aws.KinesisUtils;\n+\n+import com.amazonaws.services.kinesis.AmazonKinesisClient;\n+import com.amazonaws.services.kinesis.model.Record;\n+\n+public class KinesisIntegrationTest {\n+\n+ private static AmazonKinesisClient kinClient;\n+\n+ @BeforeClass\n+ public static void beforeClass() throws Exception {\n+ kinClient = KinesisUtils.createKinesisClient();\n+ if (kinClient != null) {\n+ KinesisUtils.createStream(kinClient);\n+ }\n+ }\n+\n+ @AfterClass\n+ public static void afterClass() throws Exception {\n+ if (kinClient != null) {\n+ KinesisUtils.deleteStream(kinClient);\n+ }\n+ }\n+\n+ @Test\n+ public void send() throws Exception {\n+\n+ Assume.assumeNotNull(\"AWS client not null\", kinClient);\n+\n+ SimpleRegistry registry = new SimpleRegistry();\n+ registry.put(\"kinClient\", kinClient);\n+\n+ CamelContext camelctx = new DefaultCamelContext(registry);\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-kinesis://\" + KinesisUtils.STREAM_NAME + \"?amazonKinesisClient=#kinClient\");\n+\n+ from(\"aws-kinesis://\" + KinesisUtils.STREAM_NAME + \"?amazonKinesisClient=#kinClient\")\n+ .to(\"mock:result\");\n+ }\n+ });\n+\n+ MockEndpoint mockep = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ mockep.expectedMessageCount(2);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+\n+ Exchange exchange = producer.send(\"direct:start\", ExchangePattern.InOnly, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, \"partition-1\");\n+ exchange.getIn().setBody(\"Kinesis Event 1.\");\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+\n+ exchange = producer.send(\"direct:start\", ExchangePattern.InOut, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, \"partition-1\");\n+ exchange.getIn().setBody(\"Kinesis Event 2.\");\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+\n+ mockep.assertIsSatisfied();\n+\n+ assertResultExchange(mockep.getExchanges().get(0), \"Kinesis Event 1.\", \"partition-1\");\n+ assertResultExchange(mockep.getExchanges().get(1), \"Kinesis Event 2.\", \"partition-1\");\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ private void assertResultExchange(Exchange resultExchange, String data, String partition) {\n+ Record record = resultExchange.getIn().getBody(Record.class);\n+ Assert.assertEquals(data, new String(record.getData().array()));\n+ Assert.assertEquals(partition, resultExchange.getIn().getHeader(KinesisConstants.PARTITION_KEY));\n+ Assert.assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME));\n+ Assert.assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER));\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SQSIntegrationTest.java",
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/SQSIntegrationTest.java",
"diff": "@@ -73,8 +73,8 @@ public class SQSIntegrationTest {\n}\n});\n- MockEndpoint result = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n- result.expectedMessageCount(1);\n+ MockEndpoint mockep = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ mockep.expectedMessageCount(1);\ncamelctx.start();\ntry {\n@@ -86,9 +86,9 @@ public class SQSIntegrationTest {\n}\n});\n- result.assertIsSatisfied();\n+ mockep.assertIsSatisfied();\n- Exchange exchange = result.getExchanges().get(0);\n+ Exchange exchange = mockep.getExchanges().get(0);\nAssert.assertEquals(\"This is my message text.\", exchange.getIn().getBody());\nAssert.assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));\nAssert.assertNotNull(exchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/KinesisUtils.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.common.aws;\n+\n+import org.junit.Assert;\n+\n+import com.amazonaws.services.kinesis.AmazonKinesisClient;\n+import com.amazonaws.services.kinesis.AmazonKinesisClientBuilder;\n+import com.amazonaws.services.kinesis.model.StreamDescription;\n+\n+public class KinesisUtils {\n+\n+ public static final String STREAM_NAME = \"wfcStream\";\n+\n+ // Attach Policy: AmazonKinesisFullAccess\n+ public static AmazonKinesisClient createKinesisClient() {\n+ BasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\n+ AmazonKinesisClient client = !credentials.isValid() ? null : (AmazonKinesisClient)\n+ AmazonKinesisClientBuilder.standard()\n+ .withCredentials(credentials)\n+ .withRegion(\"eu-west-1\").build();\n+ return client;\n+ }\n+\n+ public static void createStream(AmazonKinesisClient kinClient) throws Exception {\n+ kinClient.createStream(STREAM_NAME, 1);\n+\n+ int retries = 40;\n+ StreamDescription desc = kinClient.describeStream(STREAM_NAME).getStreamDescription();\n+ while(!\"ACTIVE\".equals(desc.getStreamStatus()) && 0 < retries--) {\n+ Thread.sleep(500);\n+ desc = kinClient.describeStream(STREAM_NAME).getStreamDescription();\n+ System.out.println(retries + \": \" + desc.getStreamARN() + \",\" + desc.getStreamStatus());\n+ }\n+ Assert.assertEquals(\"ACTIVE\", desc.getStreamStatus());\n+ }\n+\n+ public static void deleteStream(AmazonKinesisClient kinClient) {\n+ kinClient.deleteStream(STREAM_NAME);\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SQSUtils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/SQSUtils.java",
"diff": "@@ -26,6 +26,7 @@ public class SQSUtils {\npublic static final String QUEUE_NAME = \"MyNewCamelQueue\" + SQSUtils.class.hashCode();\n+ // Attach Policy: AmazonSQSFullAccess\npublic static AmazonSQSClient createSQSClient() {\nBasicCredentialsProvider credentials = BasicCredentialsProvider.standard();\nAmazonSQSClient client = !credentials.isValid() ? null : (AmazonSQSClient)\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/KinesisIntegrationTest.java",
"diff": "+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with\n+ * this work for additional information regarding copyright ownership.\n+ * The ASF licenses this file to You under the Apache License, Version 2.0\n+ * (the \"License\"); you may not use this file except in compliance with\n+ * the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.wildfly.camel.test.aws;\n+\n+import javax.inject.Inject;\n+\n+import org.apache.camel.Exchange;\n+import org.apache.camel.ExchangePattern;\n+import org.apache.camel.Processor;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.aws.kinesis.KinesisConstants;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.asset.EmptyAsset;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.aws.subA.KinesisClientProducer;\n+import org.wildfly.camel.test.aws.subA.KinesisClientProducer.KinesisClientProvider;\n+import org.wildfly.camel.test.common.aws.BasicCredentialsProvider;\n+import org.wildfly.camel.test.common.aws.KinesisUtils;\n+import org.wildfly.extension.camel.CamelAware;\n+import org.wildfly.extension.camel.WildFlyCamelContext;\n+\n+import com.amazonaws.services.kinesis.AmazonKinesisClient;\n+import com.amazonaws.services.kinesis.model.Record;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class KinesisIntegrationTest {\n+\n+ @Inject\n+ private KinesisClientProvider provider;\n+\n+ @Deployment\n+ public static JavaArchive deployment() {\n+ JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"aws-kinesis-tests.jar\");\n+ archive.addClasses(KinesisClientProducer.class, KinesisUtils.class, BasicCredentialsProvider.class);\n+ archive.addAsManifestResource(EmptyAsset.INSTANCE, \"beans.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void send() throws Exception {\n+\n+ AmazonKinesisClient kinClient = provider.getClient();\n+ Assume.assumeNotNull(\"AWS client not null\", kinClient);\n+\n+ WildFlyCamelContext camelctx = new WildFlyCamelContext();\n+ camelctx.getNamingContext().bind(\"kinClient\", kinClient);\n+\n+ camelctx.addRoutes(new RouteBuilder() {\n+ public void configure() {\n+ from(\"direct:start\")\n+ .to(\"aws-kinesis://\" + KinesisUtils.STREAM_NAME + \"?amazonKinesisClient=#kinClient\");\n+\n+ from(\"aws-kinesis://\" + KinesisUtils.STREAM_NAME + \"?amazonKinesisClient=#kinClient\")\n+ .to(\"mock:result\");\n+ }\n+ });\n+\n+ MockEndpoint mockep = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ mockep.expectedMessageCount(2);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+\n+ Exchange exchange = producer.send(\"direct:start\", ExchangePattern.InOnly, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, \"partition-1\");\n+ exchange.getIn().setBody(\"Kinesis Event 1.\");\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+\n+ exchange = producer.send(\"direct:start\", ExchangePattern.InOut, new Processor() {\n+ public void process(Exchange exchange) throws Exception {\n+ exchange.getIn().setHeader(KinesisConstants.PARTITION_KEY, \"partition-1\");\n+ exchange.getIn().setBody(\"Kinesis Event 2.\");\n+ }\n+ });\n+ Assert.assertNull(exchange.getException());\n+\n+ mockep.assertIsSatisfied();\n+\n+ assertResultExchange(mockep.getExchanges().get(0), \"Kinesis Event 1.\", \"partition-1\");\n+ assertResultExchange(mockep.getExchanges().get(1), \"Kinesis Event 2.\", \"partition-1\");\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ private void assertResultExchange(Exchange resultExchange, String data, String partition) {\n+ Record record = resultExchange.getIn().getBody(Record.class);\n+ Assert.assertEquals(data, new String(record.getData().array()));\n+ Assert.assertEquals(partition, resultExchange.getIn().getHeader(KinesisConstants.PARTITION_KEY));\n+ Assert.assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.APPROX_ARRIVAL_TIME));\n+ Assert.assertNotNull(resultExchange.getIn().getHeader(KinesisConstants.SEQUENCE_NUMBER));\n+ }\n+\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SQSIntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/SQSIntegrationTest.java",
"diff": "@@ -18,7 +18,6 @@ package org.wildfly.camel.test.aws;\nimport javax.inject.Inject;\n-import org.apache.camel.CamelContext;\nimport org.apache.camel.Exchange;\nimport org.apache.camel.ExchangePattern;\nimport org.apache.camel.Processor;\n@@ -78,8 +77,8 @@ public class SQSIntegrationTest {\n}\n});\n- MockEndpoint result = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n- result.expectedMessageCount(1);\n+ MockEndpoint mockep = camelctx.getEndpoint(\"mock:result\", MockEndpoint.class);\n+ mockep.expectedMessageCount(1);\ncamelctx.start();\ntry {\n@@ -91,9 +90,9 @@ public class SQSIntegrationTest {\n}\n});\n- result.assertIsSatisfied();\n+ mockep.assertIsSatisfied();\n- Exchange exchange = result.getExchanges().get(0);\n+ Exchange exchange = mockep.getExchanges().get(0);\nAssert.assertEquals(\"This is my message text.\", exchange.getIn().getBody());\nAssert.assertNotNull(exchange.getIn().getHeader(SqsConstants.MESSAGE_ID));\nAssert.assertNotNull(exchange.getIn().getHeader(SqsConstants.RECEIPT_HANDLE));\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/subA/KinesisClientProducer.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2017 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+package org.wildfly.camel.test.aws.subA;\n+\n+import javax.enterprise.inject.Disposes;\n+import javax.enterprise.inject.Produces;\n+import javax.inject.Singleton;\n+\n+import org.wildfly.camel.test.common.aws.KinesisUtils;\n+\n+import com.amazonaws.services.kinesis.AmazonKinesisClient;\n+\n+public class KinesisClientProducer {\n+\n+ public class KinesisClientProvider {\n+ private final AmazonKinesisClient client;\n+ KinesisClientProvider(AmazonKinesisClient client) {\n+ this.client = client;\n+ }\n+ public AmazonKinesisClient getClient() {\n+ return client;\n+ }\n+ }\n+\n+ @Produces\n+ @Singleton\n+ public KinesisClientProvider getClientProvider() throws Exception {\n+ AmazonKinesisClient client = KinesisUtils.createKinesisClient();\n+ if (client != null) {\n+ KinesisUtils.createStream(client);\n+ }\n+ return new KinesisClientProvider(client);\n+ }\n+\n+ public void close(@Disposes KinesisClientProvider provider) throws Exception {\n+ AmazonKinesisClient client = provider.getClient();\n+ if (client != null) {\n+ KinesisUtils.deleteStream(client);\n+ }\n+ }\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1412] Add support for component aws-kinesis
|
734,358 |
11.05.2017 12:01:26
| -7,200 |
f616ce528339432dc4924ae65514bb95f6eb29dc
|
[resolves Reduce the number of included AWS jars
|
[
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "<exclude path=\"com/amazonaws/http**\" />\n</exports>\n</module>\n- <module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n<module name=\"org.slf4j\" />\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/other-modules.xml",
"new_path": "feature/etc/smartics/other-modules.xml",
"diff": "<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n</properties>\n- <include artifact=\"com.amazonaws:\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudfront\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudwatch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-core\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-dynamodb\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ec2\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-kinesis\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-s3\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ses\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-simpledb\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-simpleworkflow\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-sns\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-sqs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-swf-libraries\" />\n<apply-to-dependencies skip=\"true\">\n+ <include module=\"com.amazon.aws.skipped\" />\n<include module=\"software.amazon.ion.ion-java\" />\n</apply-to-dependencies>\n<dependencies>\n<module name=\"javax.xml.bind.api\" />\n<module name=\"com.fasterxml.jackson.core.jackson-annotations\" />\n<module name=\"com.fasterxml.jackson.core.jackson-core\" />\n+ <module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n</dependencies>\n<exports>\n<exclude path=\"com/amazonaws/auth/internal\" />\n<exclude path=\"com/amazonaws/metrics/internal**\" />\n<exclude path=\"com/amazonaws/protocol/json/internal\" />\n<exclude path=\"com/amazonaws/retry/internal\" />\n- <exclude path=\"com/amazonaws/services/apigateway/internal\" />\n<exclude path=\"com/amazonaws/services/dynamodbv2/document/internal\" />\n- <exclude path=\"com/amazonaws/services/glacier/internal\" />\n- <exclude path=\"com/amazonaws/services/logs/internal\" />\n- <exclude path=\"com/amazonaws/services/machinelearning/internal\" />\n- <exclude path=\"com/amazonaws/services/route53/internal\" />\n<exclude path=\"com/amazonaws/services/s3/internal**\" />\n<exclude path=\"com/amazonaws/services/s3/transfer/internal\" />\n- <exclude path=\"com/amazonaws/services/securitytoken/internal\" />\n<exclude path=\"com/amazonaws/services/simpledb/internal\" />\n<exclude path=\"com/amazonaws/services/sqs/internal\" />\n- <exclude path=\"com/amazonaws/services/stepfunctions/builder/internal**\" />\n</exports>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/skipped-modules.xml",
"new_path": "feature/etc/smartics/skipped-modules.xml",
"diff": "<include artifact=\"ch.qos.logback:logback-core\" />\n</module>\n+ <module name=\"com.amazon.aws.skipped\" skip=\"true\">\n+ <include artifact=\"com.amazonaws:aws-java-sdk-acm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-api-gateway\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-applicationautoscaling\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-appstream\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-autoscaling\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-batch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-budgets\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-clouddirectory\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudformation\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudhsm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudsearch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudtrail\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudwatchmetrics\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codebuild\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codecommit\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codedeploy\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codepipeline\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cognitoidentity\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cognitoidp\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cognitosync\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-config\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-costandusagereport\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-datapipeline\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-devicefarm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-directconnect\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-directory\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-discovery\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-dms\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ecr\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ecs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-efs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticache\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticbeanstalk\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticloadbalancing\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticloadbalancingv2\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticsearch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elastictranscoder\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-emr\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-events\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-gamelift\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-glacier\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-health\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-iam\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-importexport\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-inspector\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-iot\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-kms\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-lambda\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-lex\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-lightsail\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-logs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-machinelearning\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-marketplacecommerceanalytics\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-marketplacemeteringservice\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-mechanicalturkrequester\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-models\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-opsworks\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-opsworkscm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-organizations\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-pinpoint\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-polly\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-rds\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-redshift\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-rekognition\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-route53\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-servermigration\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-servicecatalog\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-shield\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-snowball\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ssm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-stepfunctions\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-storagegateway\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-sts\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-support\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-waf\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-workdocs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-workspaces\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-xray\" />\n+ <include artifact=\"com.amazonaws:jmespath-java\" />\n+ </module>\n+\n<module name=\"com.beust.jcommander\" skip=\"true\">\n<include artifact=\"com.beust:jcommander\" />\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<dependency>\n<groupId>com.fasterxml.jackson.dataformat</groupId>\n<artifactId>jackson-dataformat-cbor</artifactId>\n+ <version>${version.wildfly.fasterxml.jackson}</version>\n</dependency>\n<dependency>\n<groupId>com.fasterxml.jackson.dataformat</groupId>\n<artifactId>jackson-dataformat-smile</artifactId>\n+ <version>${version.wildfly.fasterxml.jackson}</version>\n</dependency>\n<dependency>\n<groupId>com.fasterxml.jackson.dataformat</groupId>\n<artifactId>jackson-dataformat-xml</artifactId>\n+ <version>${version.wildfly.fasterxml.jackson}</version>\n</dependency>\n<dependency>\n<groupId>com.fasterxml.jackson.dataformat</groupId>\n<artifactId>jackson-dataformat-yaml</artifactId>\n+ <version>${version.wildfly.fasterxml.jackson}</version>\n</dependency>\n<dependency>\n<groupId>com.fasterxml.jackson.datatype</groupId>\n<artifactId>jackson-datatype-joda</artifactId>\n+ <version>${version.wildfly.fasterxml.jackson}</version>\n</dependency>\n<dependency>\n<groupId>com.google.code.scriptengines</groupId>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/com/amazon/aws/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/com/amazon/aws/main/module.xml",
"diff": "</properties>\n<resources>\n<artifact name=\"${com.amazonaws:aws-java-sdk}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-acm}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-api-gateway}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-applicationautoscaling}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-appstream}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-autoscaling}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-batch}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-budgets}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-clouddirectory}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cloudformation}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-cloudfront}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cloudhsm}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cloudsearch}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cloudtrail}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-cloudwatch}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cloudwatchmetrics}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-codebuild}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-codecommit}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-codedeploy}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-codepipeline}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cognitoidentity}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cognitoidp}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-cognitosync}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-config}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-core}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-costandusagereport}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-datapipeline}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-devicefarm}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-directconnect}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-directory}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-discovery}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-dms}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-dynamodb}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-ec2}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-ecr}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-ecs}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-efs}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-elasticache}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-elasticbeanstalk}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-elasticloadbalancing}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-elasticloadbalancingv2}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-elasticsearch}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-elastictranscoder}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-emr}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-events}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-gamelift}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-glacier}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-health}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-iam}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-importexport}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-inspector}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-iot}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-kinesis}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-kms}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-lambda}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-lex}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-lightsail}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-logs}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-machinelearning}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-marketplacecommerceanalytics}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-marketplacemeteringservice}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-mechanicalturkrequester}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-models}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-opsworks}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-opsworkscm}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-organizations}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-pinpoint}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-polly}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-rds}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-redshift}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-rekognition}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-route53}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-s3}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-servermigration}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-servicecatalog}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-ses}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-shield}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-simpledb}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-simpleworkflow}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-snowball}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-sns}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-sqs}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-ssm}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-stepfunctions}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-storagegateway}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-sts}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-support}\" />\n<artifact name=\"${com.amazonaws:aws-java-sdk-swf-libraries}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-waf}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-workdocs}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-workspaces}\" />\n- <artifact name=\"${com.amazonaws:aws-java-sdk-xray}\" />\n- <artifact name=\"${com.amazonaws:jmespath-java}\" />\n</resources>\n<dependencies>\n<module name=\"javax.api\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"com.fasterxml.jackson.core.jackson-annotations\" />\n<module name=\"com.fasterxml.jackson.core.jackson-core\" />\n- <module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n<module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n- <module name=\"org.apache.camel.component.jsonpath\" />\n+ <module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n<module name=\"org.apache.commons.logging\" />\n<module name=\"org.apache.httpcomponents\" slot=\"4.5.2\" />\n<module name=\"org.joda.time\" />\n<exclude path=\"com/amazonaws/metrics/internal**\" />\n<exclude path=\"com/amazonaws/protocol/json/internal\" />\n<exclude path=\"com/amazonaws/retry/internal\" />\n- <exclude path=\"com/amazonaws/services/apigateway/internal\" />\n<exclude path=\"com/amazonaws/services/dynamodbv2/document/internal\" />\n- <exclude path=\"com/amazonaws/services/glacier/internal\" />\n- <exclude path=\"com/amazonaws/services/logs/internal\" />\n- <exclude path=\"com/amazonaws/services/machinelearning/internal\" />\n- <exclude path=\"com/amazonaws/services/route53/internal\" />\n<exclude path=\"com/amazonaws/services/s3/internal**\" />\n<exclude path=\"com/amazonaws/services/s3/transfer/internal\" />\n- <exclude path=\"com/amazonaws/services/securitytoken/internal\" />\n<exclude path=\"com/amazonaws/services/simpledb/internal\" />\n<exclude path=\"com/amazonaws/services/sqs/internal\" />\n- <exclude path=\"com/amazonaws/services/stepfunctions/builder/internal**\" />\n</exports>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/aws/main/module.xml",
"diff": "<exclude path=\"com/amazonaws/http**\" />\n</exports>\n</module>\n- <module name=\"com.fasterxml.jackson.dataformat.cbor\" />\n<module name=\"org.slf4j\" />\n<module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n<module name=\"com.fasterxml.jackson.jaxrs.jackson-jaxrs-json-provider\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/camel/pom.xml",
"new_path": "itests/camel/pom.xml",
"diff": "<dependency>\n<groupId>com.fasterxml.jackson.dataformat</groupId>\n<artifactId>jackson-dataformat-cbor</artifactId>\n- <version>2.8.8</version>\n</dependency>\n<!-- Test -->\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"diff": "@@ -364,7 +364,6 @@ com/amazonaws/client/builder\ncom/amazonaws/event\ncom/amazonaws/event/request\ncom/amazonaws/handlers\n-com/amazonaws/jmespath\ncom/amazonaws/jmx\ncom/amazonaws/jmx/spi\ncom/amazonaws/log\n@@ -382,106 +381,15 @@ com/amazonaws/retry\ncom/amazonaws/retry/v2\ncom/amazonaws/sdk\ncom/amazonaws/services\n-com/amazonaws/services/apigateway\n-com/amazonaws/services/apigateway/model\n-com/amazonaws/services/apigateway/model/transform\n-com/amazonaws/services/applicationautoscaling\n-com/amazonaws/services/applicationautoscaling/model\n-com/amazonaws/services/applicationautoscaling/model/transform\n-com/amazonaws/services/applicationdiscovery\n-com/amazonaws/services/applicationdiscovery/model\n-com/amazonaws/services/applicationdiscovery/model/transform\n-com/amazonaws/services/appstream\n-com/amazonaws/services/appstream/model\n-com/amazonaws/services/appstream/model/transform\n-com/amazonaws/services/appstream/waiters\n-com/amazonaws/services/autoscaling\n-com/amazonaws/services/autoscaling/model\n-com/amazonaws/services/autoscaling/model/transform\n-com/amazonaws/services/autoscaling/waiters\n-com/amazonaws/services/batch\n-com/amazonaws/services/batch/model\n-com/amazonaws/services/batch/model/transform\n-com/amazonaws/services/budgets\n-com/amazonaws/services/budgets/model\n-com/amazonaws/services/budgets/model/transform\n-com/amazonaws/services/certificatemanager\n-com/amazonaws/services/certificatemanager/model\n-com/amazonaws/services/certificatemanager/model/transform\n-com/amazonaws/services/clouddirectory\n-com/amazonaws/services/clouddirectory/model\n-com/amazonaws/services/clouddirectory/model/transform\n-com/amazonaws/services/cloudformation\n-com/amazonaws/services/cloudformation/model\n-com/amazonaws/services/cloudformation/model/transform\n-com/amazonaws/services/cloudformation/waiters\ncom/amazonaws/services/cloudfront\ncom/amazonaws/services/cloudfront/model\ncom/amazonaws/services/cloudfront/model/transform\ncom/amazonaws/services/cloudfront/util\ncom/amazonaws/services/cloudfront/waiters\n-com/amazonaws/services/cloudhsm\n-com/amazonaws/services/cloudhsm/model\n-com/amazonaws/services/cloudhsm/model/transform\n-com/amazonaws/services/cloudsearchdomain\n-com/amazonaws/services/cloudsearchdomain/model\n-com/amazonaws/services/cloudsearchdomain/model/transform\n-com/amazonaws/services/cloudsearchv2\n-com/amazonaws/services/cloudsearchv2/model\n-com/amazonaws/services/cloudsearchv2/model/transform\n-com/amazonaws/services/cloudtrail\n-com/amazonaws/services/cloudtrail/model\n-com/amazonaws/services/cloudtrail/model/transform\ncom/amazonaws/services/cloudwatch\ncom/amazonaws/services/cloudwatch/model\ncom/amazonaws/services/cloudwatch/model/transform\ncom/amazonaws/services/cloudwatch/waiters\n-com/amazonaws/services/cloudwatchevents\n-com/amazonaws/services/cloudwatchevents/model\n-com/amazonaws/services/cloudwatchevents/model/transform\n-com/amazonaws/services/codebuild\n-com/amazonaws/services/codebuild/model\n-com/amazonaws/services/codebuild/model/transform\n-com/amazonaws/services/codecommit\n-com/amazonaws/services/codecommit/model\n-com/amazonaws/services/codecommit/model/transform\n-com/amazonaws/services/codedeploy\n-com/amazonaws/services/codedeploy/model\n-com/amazonaws/services/codedeploy/model/transform\n-com/amazonaws/services/codedeploy/waiters\n-com/amazonaws/services/codepipeline\n-com/amazonaws/services/codepipeline/model\n-com/amazonaws/services/codepipeline/model/transform\n-com/amazonaws/services/cognitoidentity\n-com/amazonaws/services/cognitoidentity/model\n-com/amazonaws/services/cognitoidentity/model/transform\n-com/amazonaws/services/cognitoidp\n-com/amazonaws/services/cognitoidp/model\n-com/amazonaws/services/cognitoidp/model/transform\n-com/amazonaws/services/cognitosync\n-com/amazonaws/services/cognitosync/model\n-com/amazonaws/services/cognitosync/model/transform\n-com/amazonaws/services/config\n-com/amazonaws/services/config/model\n-com/amazonaws/services/config/model/transform\n-com/amazonaws/services/costandusagereport\n-com/amazonaws/services/costandusagereport/model\n-com/amazonaws/services/costandusagereport/model/transform\n-com/amazonaws/services/databasemigrationservice\n-com/amazonaws/services/databasemigrationservice/model\n-com/amazonaws/services/databasemigrationservice/model/transform\n-com/amazonaws/services/datapipeline\n-com/amazonaws/services/datapipeline/model\n-com/amazonaws/services/datapipeline/model/transform\n-com/amazonaws/services/devicefarm\n-com/amazonaws/services/devicefarm/model\n-com/amazonaws/services/devicefarm/model/transform\n-com/amazonaws/services/directconnect\n-com/amazonaws/services/directconnect/model\n-com/amazonaws/services/directconnect/model/transform\n-com/amazonaws/services/directory\n-com/amazonaws/services/directory/model\n-com/amazonaws/services/directory/model/transform\ncom/amazonaws/services/dynamodbv2\ncom/amazonaws/services/dynamodbv2/datamodeling\ncom/amazonaws/services/dynamodbv2/datamodeling/marshallers\n@@ -501,72 +409,6 @@ com/amazonaws/services/ec2/model\ncom/amazonaws/services/ec2/model/transform\ncom/amazonaws/services/ec2/util\ncom/amazonaws/services/ec2/waiters\n-com/amazonaws/services/ecr\n-com/amazonaws/services/ecr/model\n-com/amazonaws/services/ecr/model/transform\n-com/amazonaws/services/ecs\n-com/amazonaws/services/ecs/model\n-com/amazonaws/services/ecs/model/transform\n-com/amazonaws/services/ecs/waiters\n-com/amazonaws/services/elasticache\n-com/amazonaws/services/elasticache/model\n-com/amazonaws/services/elasticache/model/transform\n-com/amazonaws/services/elasticache/waiters\n-com/amazonaws/services/elasticbeanstalk\n-com/amazonaws/services/elasticbeanstalk/model\n-com/amazonaws/services/elasticbeanstalk/model/transform\n-com/amazonaws/services/elasticfilesystem\n-com/amazonaws/services/elasticfilesystem/model\n-com/amazonaws/services/elasticfilesystem/model/transform\n-com/amazonaws/services/elasticloadbalancing\n-com/amazonaws/services/elasticloadbalancing/model\n-com/amazonaws/services/elasticloadbalancing/model/transform\n-com/amazonaws/services/elasticloadbalancing/waiters\n-com/amazonaws/services/elasticloadbalancingv2\n-com/amazonaws/services/elasticloadbalancingv2/model\n-com/amazonaws/services/elasticloadbalancingv2/model/transform\n-com/amazonaws/services/elasticloadbalancingv2/waiters\n-com/amazonaws/services/elasticmapreduce\n-com/amazonaws/services/elasticmapreduce/model\n-com/amazonaws/services/elasticmapreduce/model/transform\n-com/amazonaws/services/elasticmapreduce/spi\n-com/amazonaws/services/elasticmapreduce/spi/security\n-com/amazonaws/services/elasticmapreduce/util\n-com/amazonaws/services/elasticmapreduce/waiters\n-com/amazonaws/services/elasticsearch\n-com/amazonaws/services/elasticsearch/model\n-com/amazonaws/services/elasticsearch/model/transform\n-com/amazonaws/services/elastictranscoder\n-com/amazonaws/services/elastictranscoder/model\n-com/amazonaws/services/elastictranscoder/model/transform\n-com/amazonaws/services/elastictranscoder/waiters\n-com/amazonaws/services/gamelift\n-com/amazonaws/services/gamelift/model\n-com/amazonaws/services/gamelift/model/transform\n-com/amazonaws/services/glacier\n-com/amazonaws/services/glacier/model\n-com/amazonaws/services/glacier/model/transform\n-com/amazonaws/services/glacier/transfer\n-com/amazonaws/services/glacier/waiters\n-com/amazonaws/services/health\n-com/amazonaws/services/health/model\n-com/amazonaws/services/health/model/transform\n-com/amazonaws/services/identitymanagement\n-com/amazonaws/services/identitymanagement/model\n-com/amazonaws/services/identitymanagement/model/transform\n-com/amazonaws/services/identitymanagement/waiters\n-com/amazonaws/services/importexport\n-com/amazonaws/services/importexport/model\n-com/amazonaws/services/importexport/model/transform\n-com/amazonaws/services/inspector\n-com/amazonaws/services/inspector/model\n-com/amazonaws/services/inspector/model/transform\n-com/amazonaws/services/iot\n-com/amazonaws/services/iot/model\n-com/amazonaws/services/iot/model/transform\n-com/amazonaws/services/iotdata\n-com/amazonaws/services/iotdata/model\n-com/amazonaws/services/iotdata/model/transform\ncom/amazonaws/services/kinesis\ncom/amazonaws/services/kinesis/model\ncom/amazonaws/services/kinesis/model/transform\n@@ -577,70 +419,6 @@ com/amazonaws/services/kinesisanalytics/model/transform\ncom/amazonaws/services/kinesisfirehose\ncom/amazonaws/services/kinesisfirehose/model\ncom/amazonaws/services/kinesisfirehose/model/transform\n-com/amazonaws/services/kms\n-com/amazonaws/services/kms/model\n-com/amazonaws/services/kms/model/transform\n-com/amazonaws/services/lambda\n-com/amazonaws/services/lambda/invoke\n-com/amazonaws/services/lambda/model\n-com/amazonaws/services/lambda/model/transform\n-com/amazonaws/services/lexruntime\n-com/amazonaws/services/lexruntime/model\n-com/amazonaws/services/lexruntime/model/transform\n-com/amazonaws/services/lightsail\n-com/amazonaws/services/lightsail/model\n-com/amazonaws/services/lightsail/model/transform\n-com/amazonaws/services/logs\n-com/amazonaws/services/logs/model\n-com/amazonaws/services/logs/model/transform\n-com/amazonaws/services/machinelearning\n-com/amazonaws/services/machinelearning/model\n-com/amazonaws/services/machinelearning/model/transform\n-com/amazonaws/services/machinelearning/waiters\n-com/amazonaws/services/marketplacecommerceanalytics\n-com/amazonaws/services/marketplacecommerceanalytics/model\n-com/amazonaws/services/marketplacecommerceanalytics/model/transform\n-com/amazonaws/services/marketplacemetering\n-com/amazonaws/services/marketplacemetering/model\n-com/amazonaws/services/marketplacemetering/model/transform\n-com/amazonaws/services/mturk\n-com/amazonaws/services/mturk/model\n-com/amazonaws/services/mturk/model/transform\n-com/amazonaws/services/opsworks\n-com/amazonaws/services/opsworks/model\n-com/amazonaws/services/opsworks/model/transform\n-com/amazonaws/services/opsworks/waiters\n-com/amazonaws/services/opsworkscm\n-com/amazonaws/services/opsworkscm/model\n-com/amazonaws/services/opsworkscm/model/transform\n-com/amazonaws/services/organizations\n-com/amazonaws/services/organizations/model\n-com/amazonaws/services/organizations/model/transform\n-com/amazonaws/services/pinpoint\n-com/amazonaws/services/pinpoint/model\n-com/amazonaws/services/pinpoint/model/transform\n-com/amazonaws/services/polly\n-com/amazonaws/services/polly/model\n-com/amazonaws/services/polly/model/transform\n-com/amazonaws/services/polly/presign\n-com/amazonaws/services/rds\n-com/amazonaws/services/rds/model\n-com/amazonaws/services/rds/model/transform\n-com/amazonaws/services/rds/waiters\n-com/amazonaws/services/redshift\n-com/amazonaws/services/redshift/model\n-com/amazonaws/services/redshift/model/transform\n-com/amazonaws/services/redshift/waiters\n-com/amazonaws/services/rekognition\n-com/amazonaws/services/rekognition/model\n-com/amazonaws/services/rekognition/model/transform\n-com/amazonaws/services/route53\n-com/amazonaws/services/route53/model\n-com/amazonaws/services/route53/model/transform\n-com/amazonaws/services/route53/waiters\n-com/amazonaws/services/route53domains\n-com/amazonaws/services/route53domains/model\n-com/amazonaws/services/route53domains/model/transform\ncom/amazonaws/services/s3\ncom/amazonaws/services/s3/event\ncom/amazonaws/services/s3/iterable\n@@ -656,18 +434,6 @@ com/amazonaws/services/s3/transfer\ncom/amazonaws/services/s3/transfer/exception\ncom/amazonaws/services/s3/transfer/model\ncom/amazonaws/services/s3/waiters\n-com/amazonaws/services/securitytoken\n-com/amazonaws/services/securitytoken/model\n-com/amazonaws/services/securitytoken/model/transform\n-com/amazonaws/services/servermigration\n-com/amazonaws/services/servermigration/model\n-com/amazonaws/services/servermigration/model/transform\n-com/amazonaws/services/servicecatalog\n-com/amazonaws/services/servicecatalog/model\n-com/amazonaws/services/servicecatalog/model/transform\n-com/amazonaws/services/shield\n-com/amazonaws/services/shield/model\n-com/amazonaws/services/shield/model/transform\ncom/amazonaws/services/simpledb\ncom/amazonaws/services/simpledb/model\ncom/amazonaws/services/simpledb/model/transform\n@@ -676,9 +442,6 @@ com/amazonaws/services/simpleemail\ncom/amazonaws/services/simpleemail/model\ncom/amazonaws/services/simpleemail/model/transform\ncom/amazonaws/services/simpleemail/waiters\n-com/amazonaws/services/simplesystemsmanagement\n-com/amazonaws/services/simplesystemsmanagement/model\n-com/amazonaws/services/simplesystemsmanagement/model/transform\ncom/amazonaws/services/simpleworkflow\ncom/amazonaws/services/simpleworkflow/flow\ncom/amazonaws/services/simpleworkflow/flow/annotations\n@@ -695,9 +458,6 @@ com/amazonaws/services/simpleworkflow/flow/test\ncom/amazonaws/services/simpleworkflow/flow/worker\ncom/amazonaws/services/simpleworkflow/model\ncom/amazonaws/services/simpleworkflow/model/transform\n-com/amazonaws/services/snowball\n-com/amazonaws/services/snowball/model\n-com/amazonaws/services/snowball/model/transform\ncom/amazonaws/services/sns\ncom/amazonaws/services/sns/model\ncom/amazonaws/services/sns/model/transform\n@@ -707,33 +467,6 @@ com/amazonaws/services/sqs/buffered\ncom/amazonaws/services/sqs/internal/auth\ncom/amazonaws/services/sqs/model\ncom/amazonaws/services/sqs/model/transform\n-com/amazonaws/services/stepfunctions\n-com/amazonaws/services/stepfunctions/builder\n-com/amazonaws/services/stepfunctions/builder/conditions\n-com/amazonaws/services/stepfunctions/builder/states\n-com/amazonaws/services/stepfunctions/model\n-com/amazonaws/services/stepfunctions/model/transform\n-com/amazonaws/services/storagegateway\n-com/amazonaws/services/storagegateway/model\n-com/amazonaws/services/storagegateway/model/transform\n-com/amazonaws/services/support\n-com/amazonaws/services/support/model\n-com/amazonaws/services/support/model/transform\n-com/amazonaws/services/waf\n-com/amazonaws/services/waf/model\n-com/amazonaws/services/waf/model/waf\n-com/amazonaws/services/waf/model/waf/transform\n-com/amazonaws/services/waf/model/waf_regional\n-com/amazonaws/services/waf/model/waf_regional/transform\n-com/amazonaws/services/workdocs\n-com/amazonaws/services/workdocs/model\n-com/amazonaws/services/workdocs/model/transform\n-com/amazonaws/services/workspaces\n-com/amazonaws/services/workspaces/model\n-com/amazonaws/services/workspaces/model/transform\n-com/amazonaws/services/xray\n-com/amazonaws/services/xray/model\n-com/amazonaws/services/xray/model/transform\ncom/amazonaws/transform\ncom/amazonaws/util\ncom/amazonaws/util/json\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/args4j/main/args4j-2.0.31.jar\n/com/amazon/aws/main/aws-java-sdk-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-acm-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-api-gateway-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-applicationautoscaling-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-appstream-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-autoscaling-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-batch-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-budgets-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-clouddirectory-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cloudformation-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-cloudfront-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cloudhsm-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cloudsearch-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cloudtrail-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-cloudwatch-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cloudwatchmetrics-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-codebuild-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-codecommit-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-codedeploy-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-codepipeline-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cognitoidentity-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cognitoidp-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-cognitosync-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-config-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-core-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-costandusagereport-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-datapipeline-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-devicefarm-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-directconnect-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-directory-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-discovery-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-dms-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-dynamodb-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-ec2-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-ecr-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-ecs-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-efs-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-elasticache-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-elasticbeanstalk-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-elasticloadbalancing-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-elasticloadbalancingv2-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-elasticsearch-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-elastictranscoder-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-emr-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-events-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-gamelift-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-glacier-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-health-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-iam-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-importexport-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-inspector-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-iot-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-kinesis-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-kms-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-lambda-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-lex-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-lightsail-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-logs-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-machinelearning-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-marketplacecommerceanalytics-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-marketplacemeteringservice-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-mechanicalturkrequester-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-models-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-opsworks-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-opsworkscm-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-organizations-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-pinpoint-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-polly-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-rds-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-redshift-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-rekognition-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-route53-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-s3-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-servermigration-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-servicecatalog-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-ses-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-shield-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-simpledb-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-simpleworkflow-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-snowball-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-sns-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-sqs-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-ssm-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-stepfunctions-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-storagegateway-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-sts-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-support-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-swf-libraries-1.11.22.jar\n-/com/amazon/aws/main/aws-java-sdk-waf-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-workdocs-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-workspaces-1.11.108.jar\n-/com/amazon/aws/main/aws-java-sdk-xray-1.11.108.jar\n-/com/amazon/aws/main/jmespath-java-1.11.108.jar\n-/com/box/main/box-java-sdk-2.1.1.jar\n-/com/eclipsesource/minimal/json/main/minimal-json-0.9.1.jar\n/com/fasterxml/jackson/dataformat/cbor/main/jackson-dataformat-cbor-2.7.4.jar\n/com/fasterxml/jackson/dataformat/smile/main/jackson-dataformat-smile-2.7.4.jar\n/com/fasterxml/jackson/dataformat/xml/main/jackson-dataformat-xml-2.7.4.jar\n/org/apache/camel/component/beanio/main/beanio-2.1.0.jar\n/org/apache/camel/component/beanio/main/camel-beanio-2.19.0.jar\n/org/apache/camel/component/bindy/main/camel-bindy-2.19.0.jar\n-/org/apache/camel/component/box/main/camel-box-2.19.0.jar\n-/org/apache/camel/component/box/main/camel-box-api-2.19.0.jar\n/org/apache/camel/component/braintree/main/braintree-java-2.63.0.jar\n/org/apache/camel/component/braintree/main/camel-braintree-2.19.0.jar\n/org/apache/camel/component/cassandra/main/camel-cassandraql-2.19.0.jar\n/org/apache/zookeeper/main/curator-recipes-2.11.1.jar\n/org/apache/zookeeper/main/zookeeper-3.4.10.jar\n/org/beanshell/main/bsh-2.0b6.jar\n-/org/bitbucket/jose4j/main/jose4j-0.4.4.jar\n/org/bouncycastle/ext/main/bcpg-jdk15on-1.55.jar\n/org/drools/compiler/main/drools-compiler-6.5.0.Final.jar\n/org/drools/core/main/drools-core-6.5.0.Final.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<type>pom</type>\n</dependency>\n- <!-- FasterXML Jackson -->\n- <dependency>\n- <groupId>com.fasterxml.jackson.dataformat</groupId>\n- <artifactId>jackson-dataformat-cbor</artifactId>\n- <version>${version.wildfly.fasterxml.jackson}</version>\n- </dependency>\n- <dependency>\n- <groupId>com.fasterxml.jackson.dataformat</groupId>\n- <artifactId>jackson-dataformat-smile</artifactId>\n- <version>${version.wildfly.fasterxml.jackson}</version>\n- </dependency>\n- <dependency>\n- <groupId>com.fasterxml.jackson.dataformat</groupId>\n- <artifactId>jackson-dataformat-xml</artifactId>\n- <version>${version.wildfly.fasterxml.jackson}</version>\n- </dependency>\n- <dependency>\n- <groupId>com.fasterxml.jackson.dataformat</groupId>\n- <artifactId>jackson-dataformat-yaml</artifactId>\n- <version>${version.wildfly.fasterxml.jackson}</version>\n- </dependency>\n- <dependency>\n- <groupId>com.fasterxml.jackson.datatype</groupId>\n- <artifactId>jackson-datatype-joda</artifactId>\n- <version>${version.wildfly.fasterxml.jackson}</version>\n- </dependency>\n-\n<!-- Felix -->\n<dependency>\n<groupId>org.apache.felix</groupId>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1777] Reduce the number of included AWS jars
|
734,358 |
11.05.2017 14:34:25
| -7,200 |
ea826fc67e64924adfe07ca00b517b0f449a5ee3
|
[resolves Create issues for undecided roadmap items
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/pom.xml",
"new_path": "catalog/pom.xml",
"diff": "</goals>\n<phase>process-classes</phase>\n<configuration>\n- <mainClass>org.wildfly.camel.catalog.WildFlyCatalogCreator</mainClass>\n+ <mainClass>org.wildfly.camel.catalog.CatalogCreator</mainClass>\n<systemProperties>\n<property>\n<key>basedir</key>\n"
},
{
"change_type": "RENAME",
"old_path": "catalog/src/main/java/org/wildfly/camel/catalog/WildFlyCatalogCreator.java",
"new_path": "catalog/src/main/java/org/wildfly/camel/catalog/CatalogCreator.java",
"diff": "@@ -41,22 +41,26 @@ import java.util.Map;\nimport com.fasterxml.jackson.databind.JsonNode;\nimport com.fasterxml.jackson.databind.ObjectMapper;\n-public final class WildFlyCatalogCreator {\n+public final class CatalogCreator {\n- final Path basedir = Paths.get(System.getProperty(\"basedir\"));\n- final Path resdir = basedir.resolve(Paths.get(\"src/main/resources\"));\n- final Path srcdir = basedir.resolve(Paths.get(\"target/camel-catalog\"));\n- final Path outdir = basedir.resolve(Paths.get(\"target/classes\"));\n+ public static Path basedir() {\n+ String basedir = System.getProperty(\"basedir\");\n+ return Paths.get(basedir != null ? basedir : \".\");\n+ }\n+\n+ static final Path resdir = basedir().resolve(Paths.get(\"src/main/resources\"));\n+ static final Path srcdir = basedir().resolve(Paths.get(\"target/camel-catalog\"));\n+ static final Path outdir = basedir().resolve(Paths.get(\"target/classes\"));\n- enum Kind {\n+ public static enum Kind {\ncomponent, dataformat, language;\n}\n- enum State {\n+ public static enum State {\nsupported, planned, undecided, rejected\n}\n- class Item {\n+ public static class Item {\nfinal Path path;\nfinal Kind kind;\nfinal String name;\n@@ -74,7 +78,7 @@ public final class WildFlyCatalogCreator {\n}\n}\n- class RoadMap {\n+ public static class RoadMap {\nfinal Kind kind;\nfinal Path outpath;\nfinal Map<String, Item> items = new HashMap<>();\n@@ -85,10 +89,16 @@ public final class WildFlyCatalogCreator {\nvoid add(Item item) {\nitems.put(item.name, item);\n}\n- Item item(String name) {\n+ public Kind getKind() {\n+ return kind;\n+ }\n+ public Path getOutpath() {\n+ return outpath;\n+ }\n+ public Item item(String name) {\nreturn items.get(name);\n}\n- List<String> sortedNames(State state) {\n+ public List<String> sortedNames(State state) {\nList<String> result = new ArrayList<>();\nfor (Item item : items.values()) {\nif (item.state == state) {\n@@ -100,15 +110,15 @@ public final class WildFlyCatalogCreator {\n}\n}\n- Map<Kind, RoadMap> roadmaps = new HashMap<>();\n- {\n- roadmaps.put(Kind.component, new RoadMap(Kind.component));\n- roadmaps.put(Kind.dataformat, new RoadMap(Kind.dataformat));\n- roadmaps.put(Kind.language, new RoadMap(Kind.language));\n+ public static Map<Kind, RoadMap> ROAD_MAPS = new HashMap<>();\n+ static {\n+ ROAD_MAPS.put(Kind.component, new RoadMap(Kind.component));\n+ ROAD_MAPS.put(Kind.dataformat, new RoadMap(Kind.dataformat));\n+ ROAD_MAPS.put(Kind.language, new RoadMap(Kind.language));\n}\npublic static void main(String[] args) throws Exception {\n- new WildFlyCatalogCreator().createCatalog();\n+ new CatalogCreator().createCatalog();\n}\nprivate void createCatalog() throws Exception {\n@@ -136,7 +146,7 @@ public final class WildFlyCatalogCreator {\nboolean deprecated = Boolean.parseBoolean(tree.findValue(\"deprecated\").textValue());\nif (validKind(kind) && javaType != null) {\nItem item = new Item(relpath, Kind.valueOf(kind), javaType, deprecated);\n- roadmaps.get(item.kind).add(item);\n+ ROAD_MAPS.get(item.kind).add(item);\n}\n}\nreturn FileVisitResult.CONTINUE;\n@@ -152,7 +162,7 @@ public final class WildFlyCatalogCreator {\n});\n// Change state when planned or rejected\n- for (RoadMap roadmap : roadmaps.values()) {\n+ for (RoadMap roadmap : ROAD_MAPS.values()) {\nState state = null;\nFile file = roadmap.outpath.toFile();\ntry (BufferedReader br = new BufferedReader(new FileReader(file))) {\n@@ -182,8 +192,8 @@ public final class WildFlyCatalogCreator {\n}\nprivate void collectSupported() throws IOException {\n- Path rootPath = basedir.resolve(Paths.get(\"target\", \"dependency\"));\n- for (RoadMap roadmap : roadmaps.values()) {\n+ Path rootPath = basedir().resolve(Paths.get(\"target\", \"dependency\"));\n+ for (RoadMap roadmap : ROAD_MAPS.values()) {\nfor (Item item : roadmap.items.values()) {\nPath javaType = Paths.get(item.javaType.replace('.', '/') + \".class\");\nif (rootPath.resolve(javaType).toFile().isFile()) {\n@@ -200,7 +210,7 @@ public final class WildFlyCatalogCreator {\n}\nprivate void generateProperties() throws IOException {\n- for (RoadMap roadmap : roadmaps.values()) {\n+ for (RoadMap roadmap : ROAD_MAPS.values()) {\nFile outfile = outdir.resolve(\"org/wildfly/camel/catalog/\" + roadmap.kind + \"s.properties\").toFile();\ntry (PrintWriter pw = new PrintWriter(outfile)) {\nfor (String name : roadmap.sortedNames(State.supported)) {\n@@ -211,7 +221,7 @@ public final class WildFlyCatalogCreator {\n}\nprivate void generateRoadmaps() throws IOException {\n- for (RoadMap roadmap : roadmaps.values()) {\n+ for (RoadMap roadmap : ROAD_MAPS.values()) {\ntry (PrintWriter pw = new PrintWriter(roadmap.outpath.toFile())) {\nfor (State state : State.values()) {\npw.println(\"[\" + state + \"]\");\n"
},
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -137,27 +137,23 @@ zookeeper\nahc\nahc-ws\nahc-wss\n-docker\n-etcd\n-flink\n-google-calendar\n-google-drive\n-google-mail\n-hbase\n-hdfs2\n-jclouds\n-websocket\n-\n-[undecided]\nazure-blob\nazure-queue\nbonita\ncouchbase\ndigitalocean\n+docker\ndrill\nelasticsearch5\n+etcd\n+flink\n+google-calendar\n+google-drive\n+google-mail\ngoogle-pubsub\ngrpc\n+hbase\n+hdfs2\nhttp4s\nignite-cache\nignite-compute\n@@ -166,6 +162,7 @@ ignite-idgen\nignite-messaging\nignite-queue\nignite-set\n+jclouds\nmilo-client\nmilo-server\nmongodb-gridfs\n@@ -182,9 +179,12 @@ reactive-streams\nrest-swagger\nsjms2\ntika\n+websocket\nzendesk\nzookeeper-master\n+[undecided]\n+\n[rejected]\napns\nasterisk\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "catalog/src/test/java/org/wildfly/camel/test/catalog/UndecidedComponentsTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.catalog;\n+\n+import java.io.BufferedReader;\n+import java.io.File;\n+import java.io.FileReader;\n+import java.io.PrintWriter;\n+import java.nio.file.Path;\n+import java.util.ArrayList;\n+import java.util.Collections;\n+import java.util.List;\n+\n+import org.eclipse.egit.github.core.Issue;\n+import org.eclipse.egit.github.core.Label;\n+import org.eclipse.egit.github.core.Milestone;\n+import org.eclipse.egit.github.core.client.GitHubClient;\n+import org.eclipse.egit.github.core.service.IssueService;\n+import org.eclipse.egit.github.core.service.MilestoneService;\n+import org.junit.Assert;\n+import org.junit.Assume;\n+import org.junit.FixMethodOrder;\n+import org.junit.Test;\n+import org.junit.runners.MethodSorters;\n+import org.wildfly.camel.catalog.CatalogCreator;\n+import org.wildfly.camel.catalog.CatalogCreator.RoadMap;\n+\n+@FixMethodOrder(MethodSorters.NAME_ASCENDING)\n+public final class UndecidedComponentsTest {\n+\n+ private static final String MILESTONE = \"4.8.0\";\n+ private static final Label LABEL = new Label().setName(\"feature\");\n+\n+ private static final Path auxfile = CatalogCreator.basedir().resolve(\"target/issues.txt\");\n+\n+ @Test\n+ public void createIssuesStepA() throws Exception {\n+\n+ List<String> collection = new ArrayList<>();\n+ for (RoadMap rm : CatalogCreator.ROAD_MAPS.values()) {\n+ String prefix = null;\n+ File file = rm.getOutpath().toFile();\n+ try (BufferedReader br = new BufferedReader(new FileReader(file))) {\n+ String line = br.readLine();\n+ while (line != null) {\n+ if (line.length() > 0 && !line.startsWith(\"#\")) {\n+ if (line.equals(\"[undecided]\")) {\n+ prefix = rm.getKind() + \" \";\n+ } else if (line.startsWith(\"[\")) {\n+ prefix = null;\n+ } else if (prefix != null) {\n+ collection.add(prefix + line);\n+ }\n+ }\n+ line = br.readLine();\n+ }\n+ }\n+ }\n+\n+ try (PrintWriter pw = new PrintWriter(auxfile.toFile())) {\n+ for (String entry : collection) {\n+ pw.println(entry);\n+ }\n+ }\n+ }\n+\n+ @Test\n+ public void createIssuesStepB() throws Exception {\n+\n+ String accessToken = System.getenv(\"GitHubAccessToken\");\n+ Assume.assumeNotNull(\"GitHubAccessToken not null\", accessToken);\n+\n+ GitHubClient client = new GitHubClient();\n+ client.setOAuth2Token(accessToken);\n+\n+ String githubUser = \"wildfly-extras\";\n+ String githubRepo = \"wildfly-camel\";\n+\n+ Milestone milestone = null;\n+ MilestoneService milestoneService = new MilestoneService(client);\n+ for (Milestone aux : milestoneService.getMilestones(githubUser, githubRepo, IssueService.STATE_OPEN)) {\n+ if (aux.getTitle().equals(MILESTONE)) {\n+ milestone = aux;\n+ break;\n+ }\n+ }\n+ Assert.assertNotNull(\"Milestone not null\", milestone);\n+\n+ IssueService issueService = new IssueService(client);\n+ try (BufferedReader br = new BufferedReader(new FileReader(auxfile.toFile()))) {\n+ String line = br.readLine();\n+ while (line != null) {\n+ String title = \"Add support for \" + line;\n+ System.out.println(title);\n+ Issue issue = new Issue();\n+ issue.setTitle(title);\n+ issue.setLabels(Collections.singletonList(LABEL));\n+ issue.setMilestone(milestone);\n+ issueService.createIssue(githubUser, githubRepo, issue);\n+ line = br.readLine();\n+ Thread.sleep(3 * 1000);\n+ }\n+ }\n+ }\n+\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/com/amazon/aws/main/aws-java-sdk-sns-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-sqs-1.11.108.jar\n/com/amazon/aws/main/aws-java-sdk-swf-libraries-1.11.22.jar\n+/com/box/main/box-java-sdk-2.1.1.jar\n+/com/eclipsesource/minimal/json/main/minimal-json-0.9.1.jar\n/com/fasterxml/jackson/dataformat/cbor/main/jackson-dataformat-cbor-2.7.4.jar\n/com/fasterxml/jackson/dataformat/smile/main/jackson-dataformat-smile-2.7.4.jar\n/com/fasterxml/jackson/dataformat/xml/main/jackson-dataformat-xml-2.7.4.jar\n/org/apache/camel/component/beanio/main/beanio-2.1.0.jar\n/org/apache/camel/component/beanio/main/camel-beanio-2.19.0.jar\n/org/apache/camel/component/bindy/main/camel-bindy-2.19.0.jar\n+/org/apache/camel/component/box/main/camel-box-2.19.0.jar\n+/org/apache/camel/component/box/main/camel-box-api-2.19.0.jar\n/org/apache/camel/component/braintree/main/braintree-java-2.63.0.jar\n/org/apache/camel/component/braintree/main/camel-braintree-2.19.0.jar\n/org/apache/camel/component/cassandra/main/camel-cassandraql-2.19.0.jar\n/org/apache/zookeeper/main/curator-recipes-2.11.1.jar\n/org/apache/zookeeper/main/zookeeper-3.4.10.jar\n/org/beanshell/main/bsh-2.0b6.jar\n+/org/bitbucket/jose4j/main/jose4j-0.4.4.jar\n/org/bouncycastle/ext/main/bcpg-jdk15on-1.55.jar\n/org/drools/compiler/main/drools-compiler-6.5.0.Final.jar\n/org/drools/core/main/drools-core-6.5.0.Final.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1817] Create issues for undecided roadmap items
|
734,358 |
12.05.2017 13:11:37
| -7,200 |
4f1b5454193974ca8d47d36331a404ab2f114646
|
[resolves Replace usage of netty-all with individual jars
|
[
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "<module name=\"org.apache.camel.component.amqp\">\n<include artifact=\"org.apache.camel:camel-amqp\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n<module name=\"org.apache.camel.component.avro\">\n<include artifact=\"org.apache.camel:camel-avro\" />\n<apply-to-dependencies skip=\"true\">\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.apache.avro.ipc\" />\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n- <include module=\"io.netty.parts\" />\n</apply-to-dependencies>\n<dependencies>\n<module name=\"org.apache.avro\" export=\"true\"/>\n<include artifact=\"com.datastax.cassandra:cassandra-(.*)\" />\n<apply-to-dependencies skip=\"true\">\n<include module=\"com.github.jnr\" />\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n<module name=\"org.apache.camel.component.netty4\">\n<include artifact=\"org.apache.camel:camel-netty4\" />\n<apply-to-dependencies skip=\"true\">\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n<dependencies>\n<module name=\"javax.api\"/>\n+ <module name=\"io.netty\" slot=\"4.1\"/>\n<module name=\"org.slf4j\" />\n</dependencies>\n</module>\n<include artifact=\"org.apache.camel:camel-vertx\" />\n<include artifact=\"io.vertx:vertx-core\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n<module name=\"org.apache.camel.component.zookeeper\">\n<include artifact=\"org.apache.camel:camel-zookeeper\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.apache.camel.apt\" />\n<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/other-modules.xml",
"new_path": "feature/etc/smartics/other-modules.xml",
"diff": "</exports>\n</module>\n+ <module name=\"com.amazon.aws.skipped\" skip=\"true\">\n+ <include artifact=\"com.amazonaws:aws-java-sdk-acm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-api-gateway\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-applicationautoscaling\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-appstream\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-autoscaling\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-batch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-budgets\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-clouddirectory\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudformation\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudhsm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudsearch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudtrail\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cloudwatchmetrics\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codebuild\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codecommit\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codedeploy\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-codepipeline\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cognitoidentity\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cognitoidp\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-cognitosync\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-config\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-costandusagereport\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-datapipeline\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-devicefarm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-directconnect\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-directory\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-discovery\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-dms\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ecr\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ecs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-efs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticache\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticbeanstalk\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticloadbalancing\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticloadbalancingv2\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elasticsearch\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-elastictranscoder\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-emr\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-events\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-gamelift\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-glacier\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-health\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-iam\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-importexport\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-inspector\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-iot\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-kms\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-lambda\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-lex\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-lightsail\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-logs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-machinelearning\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-marketplacecommerceanalytics\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-marketplacemeteringservice\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-mechanicalturkrequester\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-models\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-opsworks\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-opsworkscm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-organizations\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-pinpoint\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-polly\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-rds\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-redshift\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-rekognition\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-route53\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-servermigration\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-servicecatalog\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-shield\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-snowball\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-ssm\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-stepfunctions\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-storagegateway\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-sts\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-support\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-waf\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-workdocs\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-workspaces\" />\n+ <include artifact=\"com.amazonaws:aws-java-sdk-xray\" />\n+ <include artifact=\"com.amazonaws:jmespath-java\" />\n+ </module>\n+\n<module name=\"com.box\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n<include artifact=\":jackson-datatype-joda\" />\n</module>\n+ <module name=\"com.fasterxml.jackson.skipped\" skip=\"true\">\n+ <include artifact=\":jackson-module-afterburner\" />\n+ </module>\n+\n<module name=\"com.github.generex\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n<include artifact=\"io.reactivex:rxjava\" />\n<include artifact=\"org.hdrhistogram:HdrHistogram\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"com.fasterxml.jackson.afterburner\" />\n+ <include module=\"com.fasterxml.jackson.skipped\" />\n</apply-to-dependencies>\n</module>\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n</properties>\n- <include artifact=\"io.netty:netty-all\" />\n+ <include artifact=\"io.netty:netty\" />\n+ <include artifact=\"io.netty:netty-buffer\" />\n+ <include artifact=\"io.netty:netty-codec\" />\n+ <include artifact=\"io.netty:netty-codec-dns\" />\n+ <include artifact=\"io.netty:netty-codec-http\" />\n+ <include artifact=\"io.netty:netty-codec-http2\" />\n+ <include artifact=\"io.netty:netty-codec-socks\" />\n+ <include artifact=\"io.netty:netty-common\" />\n+ <include artifact=\"io.netty:netty-handler\" />\n+ <include artifact=\"io.netty:netty-handler-proxy\" />\n+ <include artifact=\"io.netty:netty-resolver\" />\n+ <include artifact=\"io.netty:netty-resolver-dns\" />\n+ <include artifact=\"io.netty:netty-transport\" />\n<apply-to-dependencies skip=\"true\">\n<include module=\"org.jctools\" />\n</apply-to-dependencies>\n</dependencies>\n</module>\n+ <module name=\"io.netty.skipped\" skip=\"true\">\n+ <include artifact=\"io.netty:netty-all\" />\n+ </module>\n+\n<module name=\"io.sundr\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n</properties>\n<include artifact=\"org.apache.qpid:qpid-jms-client\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n</apply-to-dependencies>\n<dependencies>\n<module name=\"io.netty\" />\n<include artifact=\"org.apache.curator:curator-framework\" />\n<include artifact=\"org.apache.curator:curator-recipes\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n<include module=\"jline\" />\n</apply-to-dependencies>\n<dependencies>\n<include artifact=\"org.elasticsearch:elasticsearch\" />\n<include artifact=\"org.elasticsearch:securesm\" />\n<apply-to-dependencies skip=\"true\">\n- <include module=\"io.netty.parts\" />\n+ <include module=\"io.netty.skipped\" />\n<include module=\"org.antlr\"/>\n<include module=\"org.apache.commons.cli\" />\n<include module=\"org.hdrhistogram\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/skipped-modules.xml",
"new_path": "feature/etc/smartics/skipped-modules.xml",
"diff": "<include artifact=\"ch.qos.logback:logback-core\" />\n</module>\n- <module name=\"com.amazon.aws.skipped\" skip=\"true\">\n- <include artifact=\"com.amazonaws:aws-java-sdk-acm\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-api-gateway\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-applicationautoscaling\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-appstream\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-autoscaling\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-batch\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-budgets\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-clouddirectory\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cloudformation\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cloudhsm\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cloudsearch\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cloudtrail\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cloudwatchmetrics\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-codebuild\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-codecommit\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-codedeploy\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-codepipeline\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cognitoidentity\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cognitoidp\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-cognitosync\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-config\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-costandusagereport\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-datapipeline\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-devicefarm\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-directconnect\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-directory\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-discovery\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-dms\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-ecr\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-ecs\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-efs\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-elasticache\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-elasticbeanstalk\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-elasticloadbalancing\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-elasticloadbalancingv2\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-elasticsearch\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-elastictranscoder\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-emr\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-events\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-gamelift\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-glacier\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-health\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-iam\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-importexport\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-inspector\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-iot\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-kms\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-lambda\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-lex\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-lightsail\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-logs\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-machinelearning\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-marketplacecommerceanalytics\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-marketplacemeteringservice\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-mechanicalturkrequester\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-models\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-opsworks\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-opsworkscm\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-organizations\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-pinpoint\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-polly\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-rds\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-redshift\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-rekognition\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-route53\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-servermigration\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-servicecatalog\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-shield\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-snowball\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-ssm\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-stepfunctions\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-storagegateway\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-sts\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-support\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-waf\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-workdocs\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-workspaces\" />\n- <include artifact=\"com.amazonaws:aws-java-sdk-xray\" />\n- <include artifact=\"com.amazonaws:jmespath-java\" />\n- </module>\n-\n<module name=\"com.beust.jcommander\" skip=\"true\">\n<include artifact=\"com.beust:jcommander\" />\n</module>\n- <module name=\"com.fasterxml.jackson.afterburner\" skip=\"true\">\n- <include artifact=\":jackson-module-afterburner\" />\n- </module>\n-\n- <module name=\"com.fasterxml.jackson.scala\" skip=\"true\">\n- <include artifact=\":jackson-module-scala(.*)\" />\n- </module>\n-\n<module name=\"com.github.jai-imageio\" skip=\"true\">\n<include artifact=\"com.github.jai-imageio:(.*)\" />\n</module>\n<include artifact=\"com.sun.xml.bind:jaxb-xjc\" />\n</module>\n- <module name=\"io.netty.parts\" skip=\"true\">\n- <include artifact=\"io.netty:netty\" />\n- <include artifact=\"io.netty:netty-buffer\" />\n- <include artifact=\"io.netty:netty-codec\" />\n- <include artifact=\"io.netty:netty-codec-dns\" />\n- <include artifact=\"io.netty:netty-codec-http\" />\n- <include artifact=\"io.netty:netty-codec-http2\" />\n- <include artifact=\"io.netty:netty-codec-socks\" />\n- <include artifact=\"io.netty:netty-common\" />\n- <include artifact=\"io.netty:netty-handler\" />\n- <include artifact=\"io.netty:netty-handler-proxy\" />\n- <include artifact=\"io.netty:netty-resolver\" />\n- <include artifact=\"io.netty:netty-resolver-dns\" />\n- <include artifact=\"io.netty:netty-transport\" />\n- </module>\n-\n<module name=\"io.sundr.builder.annotations\" skip=\"true\">\n<include artifact=\"io.sundr:builder-annotations\" />\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-avro</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>io.netty</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n</dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-cassandraql</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>io.netty</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n</dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-elasticsearch</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>io.netty</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n</dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-vertx</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>io.netty</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n</dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-zookeeper</artifactId>\n- <exclusions>\n- <exclusion>\n- <groupId>io.netty</groupId>\n- <artifactId>*</artifactId>\n- </exclusion>\n- </exclusions>\n</dependency>\n<dependency>\n<groupId>org.apache.felix</groupId>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/io/netty/4.1/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/io/netty/4.1/module.xml",
"diff": "<property name=\"jboss.api\" value=\"private\" />\n</properties>\n<resources>\n- <artifact name=\"${io.netty:netty-all}\" />\n+ <artifact name=\"${io.netty:netty}\" />\n+ <artifact name=\"${io.netty:netty-buffer}\" />\n+ <artifact name=\"${io.netty:netty-codec}\" />\n+ <artifact name=\"${io.netty:netty-codec-dns}\" />\n+ <artifact name=\"${io.netty:netty-codec-http}\" />\n+ <artifact name=\"${io.netty:netty-codec-http2}\" />\n+ <artifact name=\"${io.netty:netty-codec-socks}\" />\n+ <artifact name=\"${io.netty:netty-common}\" />\n+ <artifact name=\"${io.netty:netty-handler}\" />\n+ <artifact name=\"${io.netty:netty-handler-proxy}\" />\n+ <artifact name=\"${io.netty:netty-resolver}\" />\n+ <artifact name=\"${io.netty:netty-resolver-dns}\" />\n+ <artifact name=\"${io.netty:netty-transport}\" />\n</resources>\n<dependencies>\n<module name=\"javax.api\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/avro/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/avro/main/module.xml",
"diff": "<dependencies>\n<module name=\"org.apache.avro\" export=\"true\" />\n<module name=\"org.slf4j\" />\n+ <module name=\"io.netty\" slot=\"4.1\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"org.apache.camel.core\" />\n<module name=\"org.codehaus.jackson.jackson-core-asl\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/netty4/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/netty4/main/module.xml",
"diff": "</resources>\n<dependencies>\n<module name=\"javax.api\" />\n- <module name=\"org.slf4j\" />\n<module name=\"io.netty\" slot=\"4.1\" />\n+ <module name=\"org.slf4j\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"org.apache.camel.core\" />\n<module name=\"org.apache.commons.pool\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/zookeeper/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/zookeeper/main/module.xml",
"diff": "<module name=\"javax.api\" />\n<module name=\"org.apache.zookeeper\" export=\"true\" />\n<module name=\"org.slf4j\" />\n+ <module name=\"io.netty\" slot=\"4.1\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"org.apache.camel.core\" />\n</dependencies>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/zookeeper/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/zookeeper/main/module.xml",
"diff": "<module name=\"javax.api\" />\n<module name=\"org.apache.log4j\" />\n<module name=\"com.google.guava\" />\n+ <module name=\"io.netty\" slot=\"4.1\" />\n<module name=\"org.slf4j\" />\n</dependencies>\n<exports>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/elasticsearch/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/elasticsearch/main/module.xml",
"diff": "<module name=\"com.fasterxml.jackson.dataformat.yaml\" />\n<module name=\"com.google.guava\" />\n<module name=\"com.netflix.hystrix\" />\n+ <module name=\"io.netty\" slot=\"4.1\" />\n<module name=\"org.apache.lucene\" slot=\"5.5\" />\n<module name=\"org.joda.time\" />\n<module name=\"org.yaml.snakeyaml\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/io/fabric8/kubernetes/model/main/kubernetes-model-1.0.72.jar\n/io/fabric8/openshift/client/main/openshift-client-2.2.14.jar\n/io/fabric8/zjsonpatch/main/zjsonpatch-0.3.0.jar\n-/io/netty/4.1/netty-all-4.1.8.Final.jar\n+/io/netty/4.1/netty-3.10.6.Final.jar\n+/io/netty/4.1/netty-buffer-4.0.45.Final.jar\n+/io/netty/4.1/netty-codec-4.0.45.Final.jar\n+/io/netty/4.1/netty-codec-dns-4.1.8.Final.jar\n+/io/netty/4.1/netty-codec-http-4.0.45.Final.jar\n+/io/netty/4.1/netty-codec-http2-4.1.8.Final.jar\n+/io/netty/4.1/netty-codec-socks-4.1.8.Final.jar\n+/io/netty/4.1/netty-common-4.0.45.Final.jar\n+/io/netty/4.1/netty-handler-4.0.45.Final.jar\n+/io/netty/4.1/netty-handler-proxy-4.1.8.Final.jar\n+/io/netty/4.1/netty-resolver-4.1.8.Final.jar\n+/io/netty/4.1/netty-resolver-dns-4.1.8.Final.jar\n+/io/netty/4.1/netty-transport-4.0.45.Final.jar\n/javax/cache/api/main/cache-api-1.0.0.jar\n/net/sf/dozer/main/dozer-5.5.1.jar\n/net/sf/saxon/main/Saxon-HE-9.7.0-15.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1856] Replace usage of netty-all with individual jars
|
734,358 |
12.05.2017 12:18:44
| -7,200 |
7f28f0d171e6a29d08a5f4123f3514d6802e6863
|
[resolves Add support for component ahc
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "[supported]\n+ahc\namqp\natom\navro\n@@ -134,7 +135,6 @@ xslt\nzookeeper\n[planned]\n-ahc\nahc-ws\nahc-wss\nazure-blob\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-ahc.adoc",
"diff": "+### camel-ahc\n+\n+The http://camel.apache.org/ahc.html[ahc,window=_blank] component provides HTTP based endpoints for consuming external HTTP resources (as a client to call external servers using HTTP). The component uses the https://github.com/AsyncHttpClient/async-http-client[Async Http Client,window=_blank] library.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -4,6 +4,8 @@ This chapter details information about supported camel components\ninclude::camel-activemq.adoc[]\n+include::camel-ahc.adoc[]\n+\ninclude::camel-amqp.adoc[]\ninclude::camel-atom.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<dependencies>\n<module name=\"org.apache.camel.component.activemq\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.ahc\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.amqp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.atom\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.avro\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.apache.camel.component.ahc\">\n+ <include artifact=\"org.apache.camel:camel-ahc\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"io.netty.skipped\" />\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"org.asynchttpclient\" export=\"true\"/>\n+ <module name=\"io.netty\" slot=\"4.1\"/>\n+ <module name=\"org.slf4j\" />\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.amqp\">\n<include artifact=\"org.apache.camel:camel-amqp\" />\n<apply-to-dependencies skip=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/other-modules.xml",
"new_path": "feature/etc/smartics/other-modules.xml",
"diff": "<module name=\"io.netty.skipped\" skip=\"true\">\n<include artifact=\"io.netty:netty-all\" />\n+ <include artifact=\"io.netty:netty-transport-native-epoll\" />\n</module>\n<module name=\"io.sundr\">\n</exports>\n</module>\n+ <module name=\"org.asynchttpclient\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\"/>\n+ </properties>\n+ <include artifact=\"com.typesafe.netty:netty-reactive-streams\" />\n+ <include artifact=\"org.asynchttpclient:async-http-client\" />\n+ <include artifact=\"org.asynchttpclient:async-http-client-netty-utils\" />\n+ <include artifact=\"org.asynchttpclient:netty-codec-dns\" />\n+ <include artifact=\"org.asynchttpclient:netty-resolver\" />\n+ <include artifact=\"org.asynchttpclient:netty-resolver-dns\" />\n+ <include artifact=\"org.reactivestreams:reactive-streams\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"io.netty.skipped\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"io.netty\" slot=\"4.1\"/>\n+ </dependencies>\n+ <exports>\n+ <exclude path=\"io/netty**\" />\n+ <exclude path=\"com/typesafe**\" />\n+ <exclude path=\"org/reactivestreams\" />\n+ </exports>\n+ </module>\n+\n<module name=\"org.beanshell\">\n<properties>\n<property name=\"jboss.api\" value=\"private\"/>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<groupId>org.apache.activemq</groupId>\n<artifactId>activemq-camel</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-ahc</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-amqp</artifactId>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/ahc/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.apache.camel.component.ahc\">\n+ <resources>\n+ <artifact name=\"${org.apache.camel:camel-ahc}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"org.asynchttpclient\" export=\"true\" />\n+ <module name=\"io.netty\" slot=\"4.1\" />\n+ <module name=\"org.slf4j\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"org.apache.camel.component.http.common\" />\n+ <module name=\"org.apache.camel.core\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<dependencies>\n<module name=\"org.apache.camel.component.activemq\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.ahc\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.amqp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.atom\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.avro\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/asynchttpclient/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.asynchttpclient\">\n+ <properties>\n+ <property name=\"jboss.api\" value=\"private\" />\n+ </properties>\n+ <resources>\n+ <artifact name=\"${org.asynchttpclient:async-http-client}\" />\n+ <artifact name=\"${org.asynchttpclient:async-http-client-netty-utils}\" />\n+ <artifact name=\"${org.asynchttpclient:netty-codec-dns}\" />\n+ <artifact name=\"${com.typesafe.netty:netty-reactive-streams}\" />\n+ <artifact name=\"${org.asynchttpclient:netty-resolver}\" />\n+ <artifact name=\"${org.asynchttpclient:netty-resolver-dns}\" />\n+ <artifact name=\"${org.reactivestreams:reactive-streams}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"javax.api\" />\n+ <module name=\"io.netty\" slot=\"4.1\" />\n+ <module name=\"org.slf4j\" />\n+ </dependencies>\n+ <exports>\n+ <exclude path=\"io/netty**\" />\n+ <exclude path=\"com/typesafe**\" />\n+ <exclude path=\"org/reactivestreams\" />\n+ </exports>\n+</module>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/ahc/AhcIntegrationTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.ahc;\n+\n+import java.util.concurrent.Future;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.Message;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.mock.MockEndpoint;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.asynchttpclient.AsyncHttpClient;\n+import org.asynchttpclient.DefaultAsyncHttpClient;\n+import org.asynchttpclient.Response;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.JavaArchive;\n+import org.junit.Assert;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.extension.camel.CamelAware;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class AhcIntegrationTest {\n+\n+ private static final String HTTP_URL = \"http://localhost:8080\";\n+\n+ @Deployment\n+ public static JavaArchive createdeployment() {\n+ final JavaArchive archive = ShrinkWrap.create(JavaArchive.class, \"camel-ahc-test.jar\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void testAsyncHttpClient() throws Exception {\n+\n+ try (AsyncHttpClient client = new DefaultAsyncHttpClient()) {\n+ Future<Response> f = client.prepareGet(HTTP_URL).execute();\n+ Response res = f.get();\n+ Assert.assertEquals(200, res.getStatusCode());\n+ Assert.assertTrue(res.getResponseBody().contains(\"Welcome to WildFly 10\"));\n+ }\n+ }\n+\n+ @Test\n+ public void testAsyncHttpRoute() throws Exception {\n+\n+ CamelContext camelctx = new DefaultCamelContext();\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:start\")\n+ .to(\"ahc:\" + HTTP_URL)\n+ .to(\"mock:results\");\n+ }\n+ });\n+\n+ MockEndpoint mockep = camelctx.getEndpoint(\"mock:results\", MockEndpoint.class);\n+ mockep.setExpectedCount(1);\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.sendBody(\"direct:start\", null);\n+\n+ mockep.assertIsSatisfied();\n+ Message message = mockep.getExchanges().get(0).getIn();\n+ Assert.assertEquals(200, (int) message.getHeader(Exchange.HTTP_RESPONSE_CODE, Integer.class));\n+ Assert.assertTrue(message.getBody(String.class).contains(\"Welcome to WildFly 10\"));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/resources/classloading/exported-path-patterns.txt",
"new_path": "itests/standalone/extra/src/test/resources/classloading/exported-path-patterns.txt",
"diff": "^org/apache/xmlbeans/impl/schema\n^org/apache/xmlbeans/impl/values\n^org/apache/zookeeper(.*)\n+ ^org/asynchttpclient(.*)\n^org/codehaus/groovy(.*)\n^org/dozer(.*)\n^org/eclipse/egit/github/core(.*)\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"diff": "@@ -756,6 +756,8 @@ org/apache/camel/builder\norg/apache/camel/builder/script\norg/apache/camel/coap\norg/apache/camel/component\n+org/apache/camel/component/ahc\n+org/apache/camel/component/ahc/helper\norg/apache/camel/component/amqp\norg/apache/camel/component/atom\norg/apache/camel/component/avro\n@@ -1335,6 +1337,39 @@ org/apache/zookeeper/txn\norg/apache/zookeeper/util\norg/apache/zookeeper/version\norg/apache/zookeeper/version/util\n+org/asynchttpclient\n+org/asynchttpclient/channel\n+org/asynchttpclient/config\n+org/asynchttpclient/cookie\n+org/asynchttpclient/exception\n+org/asynchttpclient/filter\n+org/asynchttpclient/handler\n+org/asynchttpclient/handler/resumable\n+org/asynchttpclient/netty\n+org/asynchttpclient/netty/channel\n+org/asynchttpclient/netty/future\n+org/asynchttpclient/netty/handler\n+org/asynchttpclient/netty/handler/intercept\n+org/asynchttpclient/netty/request\n+org/asynchttpclient/netty/request/body\n+org/asynchttpclient/netty/ssl\n+org/asynchttpclient/netty/timeout\n+org/asynchttpclient/netty/util\n+org/asynchttpclient/netty/ws\n+org/asynchttpclient/ntlm\n+org/asynchttpclient/oauth\n+org/asynchttpclient/proxy\n+org/asynchttpclient/request\n+org/asynchttpclient/request/body\n+org/asynchttpclient/request/body/generator\n+org/asynchttpclient/request/body/multipart\n+org/asynchttpclient/request/body/multipart/part\n+org/asynchttpclient/resolver\n+org/asynchttpclient/spnego\n+org/asynchttpclient/uri\n+org/asynchttpclient/util\n+org/asynchttpclient/webdav\n+org/asynchttpclient/ws\norg/codehaus/groovy\norg/codehaus/groovy/ant\norg/codehaus/groovy/antlr\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/apache/activemq/main/activemq-pool-5.14.5.jar\n/org/apache/activemq/main/activemq-spring-5.14.5.jar\n/org/apache/camel/component/activemq/main/activemq-camel-5.14.5.jar\n+/org/apache/camel/component/ahc/main/camel-ahc-2.19.0.jar\n/org/apache/camel/component/amqp/main/camel-amqp-2.19.0.jar\n/org/apache/camel/component/atom/main/camel-atom-2.19.0.jar\n/org/apache/camel/component/avro/main/camel-avro-2.19.0.jar\n/org/apache/zookeeper/main/curator-framework-2.11.1.jar\n/org/apache/zookeeper/main/curator-recipes-2.11.1.jar\n/org/apache/zookeeper/main/zookeeper-3.4.10.jar\n+/org/asynchttpclient/main/async-http-client-2.0.32.jar\n+/org/asynchttpclient/main/async-http-client-netty-utils-2.0.32.jar\n+/org/asynchttpclient/main/netty-codec-dns-2.0.32.jar\n+/org/asynchttpclient/main/netty-reactive-streams-1.0.8.jar\n+/org/asynchttpclient/main/netty-resolver-2.0.32.jar\n+/org/asynchttpclient/main/netty-resolver-dns-2.0.32.jar\n+/org/asynchttpclient/main/reactive-streams-1.0.0.jar\n/org/beanshell/main/bsh-2.0b6.jar\n/org/bitbucket/jose4j/main/jose4j-0.4.4.jar\n/org/bouncycastle/ext/main/bcpg-jdk15on-1.55.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<version.apache.camel>2.19.0</version.apache.camel>\n<version.apache.activemq>5.14.5</version.apache.activemq>\n<version.apache.lucene>5.5.2</version.apache.lucene>\n+ <version.asynchttpclient>2.0.32</version.asynchttpclient>\n<!-- [#1702] Upgrade to netty-4.1.9 -->\n<version.io.netty>4.1.8.Final</version.io.netty>\n<version>${version.maven.aether.provider}</version>\n</dependency>\n+ <!-- Async HTTP Client -->\n+ <dependency>\n+ <groupId>org.asynchttpclient</groupId>\n+ <artifactId>async-http-client</artifactId>\n+ <version>${version.asynchttpclient}</version>\n+ </dependency>\n+\n<!-- Arquillian -->\n<dependency>\n<groupId>org.jboss.arquillian</groupId>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1402] Add support for component ahc
|
734,358 |
17.05.2017 08:17:51
| -7,200 |
bee05e4e75b8a8cd177379f04d3750af75367fa5
|
[resolves Add support for component ahc-ws
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "[supported]\nahc\n+ahc-ws\n+ahc-wss\namqp\natom\navro\n@@ -135,8 +137,6 @@ xslt\nzookeeper\n[planned]\n-ahc-ws\n-ahc-wss\nazure-blob\nazure-queue\nbonita\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "docs/guide/components/camel-ahc-ws.adoc",
"diff": "+### camel-ahc-ws\n+\n+The http://camel.apache.org/ahc-ws.html[ahc-ws,window=_blank] component provides Websocket based endpoints for a client communicating with external servers over Websocket. The component uses the link:index.html#_camel_ahc[ahc] component that in turn uses the https://github.com/AsyncHttpClient/async-http-client[Async Http Client,window=_blank] library.\n\\ No newline at end of file\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/index.adoc",
"new_path": "docs/guide/components/index.adoc",
"diff": "@@ -6,6 +6,8 @@ include::camel-activemq.adoc[]\ninclude::camel-ahc.adoc[]\n+include::camel-ahc-ws.adoc[]\n+\ninclude::camel-amqp.adoc[]\ninclude::camel-atom.adoc[]\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/etc/managed/wildfly/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<dependencies>\n<module name=\"org.apache.camel.component.activemq\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.ahc\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.ahc-ws\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.amqp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.atom\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.avro\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/etc/smartics/camel-modules.xml",
"new_path": "feature/etc/smartics/camel-modules.xml",
"diff": "</dependencies>\n</module>\n+ <module name=\"org.apache.camel.component.ahc-ws\">\n+ <include artifact=\"org.apache.camel:camel-ahc-ws\" />\n+ <apply-to-dependencies skip=\"true\">\n+ <include module=\"io.netty.skipped\" />\n+ <include module=\"org.apache.camel.apt\" />\n+ <include module=\"org.springframework.boot\" />\n+ </apply-to-dependencies>\n+ <dependencies>\n+ <module name=\"org.slf4j\" />\n+ </dependencies>\n+ </module>\n+\n<module name=\"org.apache.camel.component.amqp\">\n<include artifact=\"org.apache.camel:camel-amqp\" />\n<apply-to-dependencies skip=\"true\">\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pom.xml",
"new_path": "feature/pom.xml",
"diff": "<groupId>org.apache.camel</groupId>\n<artifactId>camel-ahc</artifactId>\n</dependency>\n+ <dependency>\n+ <groupId>org.apache.camel</groupId>\n+ <artifactId>camel-ahc-ws</artifactId>\n+ </dependency>\n<dependency>\n<groupId>org.apache.camel</groupId>\n<artifactId>camel-amqp</artifactId>\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/ahc-ws/main/module.xml",
"diff": "+<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n+<module xmlns=\"urn:jboss:module:1.1\" name=\"org.apache.camel.component.ahc-ws\">\n+ <resources>\n+ <artifact name=\"${org.apache.camel:camel-ahc-ws}\" />\n+ </resources>\n+ <dependencies>\n+ <module name=\"org.slf4j\" />\n+ <module name=\"javax.xml.bind.api\" />\n+ <module name=\"org.apache.camel.component.ahc\" />\n+ <module name=\"org.apache.camel.core\" />\n+ </dependencies>\n+</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"new_path": "feature/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/main/module.xml",
"diff": "<dependencies>\n<module name=\"org.apache.camel.component.activemq\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.ahc\" export=\"true\" services=\"export\" optional=\"true\" />\n+ <module name=\"org.apache.camel.component.ahc-ws\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.amqp\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.atom\" export=\"true\" services=\"export\" optional=\"true\" />\n<module name=\"org.apache.camel.component.avro\" export=\"true\" services=\"export\" optional=\"true\" />\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/ahc/AhcWSIntegrationTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.ahc;\n+\n+import java.util.ArrayList;\n+import java.util.List;\n+import java.util.concurrent.CountDownLatch;\n+import java.util.concurrent.TimeUnit;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.PollingConsumer;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.asynchttpclient.AsyncHttpClient;\n+import org.asynchttpclient.DefaultAsyncHttpClient;\n+import org.asynchttpclient.ws.DefaultWebSocketListener;\n+import org.asynchttpclient.ws.WebSocket;\n+import org.asynchttpclient.ws.WebSocketTextListener;\n+import org.asynchttpclient.ws.WebSocketUpgradeHandler;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.WebArchive;\n+import org.junit.Assert;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.ahc.subA.WebSocketServerEndpoint;\n+import org.wildfly.extension.camel.CamelAware;\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class AhcWSIntegrationTest {\n+\n+ private static final String WEBSOCKET_ENDPOINT = \"localhost:8080/ahc-ws-test/echo\";\n+\n+ @Deployment\n+ public static WebArchive createdeployment() {\n+ WebArchive archive = ShrinkWrap.create(WebArchive.class, \"ahc-ws-test.war\");\n+ archive.addClasses(WebSocketServerEndpoint.class);\n+ return archive;\n+ }\n+\n+ @Test\n+ public void testAsyncHttpClient() throws Exception {\n+\n+ final List<String> messages = new ArrayList<>();\n+ final CountDownLatch latch = new CountDownLatch(1);\n+\n+ WebSocketTextListener listener = new DefaultWebSocketListener() {\n+ @Override\n+ public void onMessage(String message) {\n+ System.out.println(\"onMessage: \" + message);\n+ messages.add(message);\n+ latch.countDown();\n+ }\n+ };\n+\n+ try (AsyncHttpClient client = new DefaultAsyncHttpClient()) {\n+ WebSocketUpgradeHandler handler = new WebSocketUpgradeHandler.Builder().addWebSocketListener(listener).build();\n+ WebSocket websocket = client.prepareGet(\"ws://\" + WEBSOCKET_ENDPOINT).execute(handler).get();\n+ websocket.sendMessage(\"Kermit\");\n+\n+ Assert.assertTrue(latch.await(1, TimeUnit.SECONDS));\n+ Assert.assertEquals(\"Hello Kermit\", messages.get(0));\n+ }\n+ }\n+\n+ @Test\n+ public void testAsyncWsRoute() throws Exception {\n+\n+ CamelContext camelctx = new DefaultCamelContext();\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:start\").to(\"ahc-ws:\" + WEBSOCKET_ENDPOINT);\n+\n+ from(\"ahc-ws:\" + WEBSOCKET_ENDPOINT).to(\"seda:end\");\n+ }\n+ });\n+\n+ PollingConsumer consumer = camelctx.getEndpoint(\"seda:end\").createPollingConsumer();\n+ consumer.start();\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.sendBody(\"direct:start\", \"Kermit\");\n+\n+ Exchange exchange = consumer.receive(1000);\n+ Assert.assertEquals(\"Hello Kermit\", exchange.getIn().getBody(String.class));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/ahc/subA/WebSocketServerEndpoint.java",
"diff": "+package org.wildfly.camel.test.ahc.subA;\n+\n+import java.util.logging.Logger;\n+\n+import javax.websocket.OnClose;\n+import javax.websocket.OnMessage;\n+import javax.websocket.OnOpen;\n+import javax.websocket.Session;\n+import javax.websocket.server.ServerEndpoint;\n+\n+@ServerEndpoint(\"/echo\")\n+public class WebSocketServerEndpoint {\n+\n+ private final Logger logger = Logger.getLogger(this.getClass().getName());\n+\n+ @OnOpen\n+ public void onConnectionOpen(Session session) {\n+ logger.info(\"onConnectionOpen: \" + session.getId());\n+ }\n+\n+ @OnMessage\n+ public String onMessage(String message, Session session) {\n+ logger.info(\"onMessage: \" + message + \" in \" + session.getId());\n+ return \"Hello \" + message;\n+ }\n+\n+ @OnClose\n+ public void onConnectionClose(Session session) {\n+ logger.info(\"onConnectionClose: \" + session.getId());\n+ }\n+}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"new_path": "itests/standalone/extra/src/test/resources/classloading/exported-paths.txt",
"diff": "@@ -758,6 +758,7 @@ org/apache/camel/coap\norg/apache/camel/component\norg/apache/camel/component/ahc\norg/apache/camel/component/ahc/helper\n+org/apache/camel/component/ahc/ws\norg/apache/camel/component/amqp\norg/apache/camel/component/atom\norg/apache/camel/component/avro\n"
},
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/org/apache/activemq/main/activemq-pool-5.14.5.jar\n/org/apache/activemq/main/activemq-spring-5.14.5.jar\n/org/apache/camel/component/activemq/main/activemq-camel-5.14.5.jar\n+/org/apache/camel/component/ahc-ws/main/camel-ahc-ws-2.19.0.jar\n/org/apache/camel/component/ahc/main/camel-ahc-2.19.0.jar\n/org/apache/camel/component/amqp/main/camel-amqp-2.19.0.jar\n/org/apache/camel/component/atom/main/camel-atom-2.19.0.jar\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1403] Add support for component ahc-ws
|
734,358 |
17.05.2017 13:26:48
| -7,200 |
ce4e896c52f0d0be63823a2ce81b92ac5d28ea0d
|
[resolves EC2 test uses hardcoded subnet Id
|
[
{
"change_type": "MODIFY",
"old_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/EC2IntegrationTest.java",
"new_path": "itests/camel/src/test/java/org/wildfly/camel/test/plain/aws/EC2IntegrationTest.java",
"diff": "@@ -67,14 +67,14 @@ public class EC2IntegrationTest {\nMap<String, Object> headers = new HashMap<>();\nheaders.put(EC2Constants.IMAGE_ID, \"ami-02ace471\");\nheaders.put(EC2Constants.INSTANCE_TYPE, InstanceType.T2Micro);\n- headers.put(EC2Constants.SUBNET_ID, \"subnet-4a8b2f3d\");\n+ headers.put(EC2Constants.SUBNET_ID, EC2Utils.getSubnetId(ec2Client));\nheaders.put(EC2Constants.INSTANCE_MIN_COUNT, 1);\nheaders.put(EC2Constants.INSTANCE_MAX_COUNT, 1);\nProducerTemplate template = camelctx.createProducerTemplate();\nRunInstancesResult result1 = template.requestBodyAndHeaders(\"direct:createAndRun\", null, headers, RunInstancesResult.class);\nString instanceId = result1.getReservation().getInstances().get(0).getInstanceId();\n- System.out.println(instanceId);\n+ System.out.println(\"InstanceId: \" + instanceId);\n// Terminate the instance\nheaders = new HashMap<>();\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/EC2Utils.java",
"new_path": "itests/common/src/main/java/org/wildfly/camel/test/common/aws/EC2Utils.java",
"diff": "@@ -21,9 +21,11 @@ package org.wildfly.camel.test.common.aws;\nimport org.apache.camel.CamelContext;\nimport org.apache.camel.builder.RouteBuilder;\n+import org.junit.Assert;\nimport com.amazonaws.services.ec2.AmazonEC2Client;\nimport com.amazonaws.services.ec2.AmazonEC2ClientBuilder;\n+import com.amazonaws.services.ec2.model.Subnet;\npublic class EC2Utils {\n@@ -47,4 +49,17 @@ public class EC2Utils {\n}\n});\n}\n+\n+ public static String getSubnetId(AmazonEC2Client ec2Client) {\n+ Subnet subnet = null;\n+ for (Subnet aux : ec2Client.describeSubnets().getSubnets()) {\n+ System.out.println();\n+ if (aux.getState().equals(\"available\") && aux.getAvailabilityZone().startsWith(\"eu-west-1\")) {\n+ subnet = aux;\n+ break;\n+ }\n+ }\n+ Assert.assertNotNull(\"Subnet not null\", subnet);\n+ return subnet.getSubnetId();\n+ }\n}\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/EC2IntegrationTest.java",
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/aws/EC2IntegrationTest.java",
"diff": "@@ -81,14 +81,14 @@ public class EC2IntegrationTest {\nMap<String, Object> headers = new HashMap<>();\nheaders.put(EC2Constants.IMAGE_ID, \"ami-02ace471\");\nheaders.put(EC2Constants.INSTANCE_TYPE, InstanceType.T2Micro);\n- headers.put(EC2Constants.SUBNET_ID, \"subnet-4a8b2f3d\");\n+ headers.put(EC2Constants.SUBNET_ID, EC2Utils.getSubnetId(ec2Client));\nheaders.put(EC2Constants.INSTANCE_MIN_COUNT, 1);\nheaders.put(EC2Constants.INSTANCE_MAX_COUNT, 1);\nProducerTemplate template = camelctx.createProducerTemplate();\nRunInstancesResult result1 = template.requestBodyAndHeaders(\"direct:createAndRun\", null, headers, RunInstancesResult.class);\nString instanceId = result1.getReservation().getInstances().get(0).getInstanceId();\n- System.out.println(instanceId);\n+ System.out.println(\"InstanceId: \" + instanceId);\n// Terminate the instance\nheaders = new HashMap<>();\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1863] EC2 test uses hardcoded subnet Id
|
734,358 |
24.05.2017 09:52:49
| -7,200 |
b7866dcad74c424d455eb7e563868df05875365e
|
[resolves Add support for component ahc-wss
|
[
{
"change_type": "MODIFY",
"old_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/ahc/AhcWSIntegrationTest.java",
"new_path": "itests/standalone/basic/src/test/java/org/wildfly/camel/test/ahc/AhcWSIntegrationTest.java",
"diff": "@@ -93,7 +93,6 @@ public class AhcWSIntegrationTest {\n@Override\npublic void configure() throws Exception {\nfrom(\"direct:start\").to(\"ahc-ws:\" + WEBSOCKET_ENDPOINT);\n-\nfrom(\"ahc-ws:\" + WEBSOCKET_ENDPOINT).to(\"seda:end\");\n}\n});\n"
},
{
"change_type": "MODIFY",
"old_path": "itests/standalone/extra/pom.xml",
"new_path": "itests/standalone/extra/pom.xml",
"diff": "</goals>\n<configuration>\n<target>\n+ <!-- Copy the websocket keystore -->\n+ <copy file=\"src/test/resources/ahc/application.keystore\" todir=\"${jboss.home}/standalone/configuration\" />\n+ <!-- Add additional security domains -->\n<replace file=\"${jboss.home}/standalone/configuration/${server.config}\">\n<replacetoken><![CDATA[<security-domain name=\"hawtio-domain\"]]></replacetoken>\n<replacevalue><![CDATA[\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/ahc/AhcWSSIntegrationTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.ahc;\n+\n+import org.apache.camel.CamelContext;\n+import org.apache.camel.Exchange;\n+import org.apache.camel.PollingConsumer;\n+import org.apache.camel.ProducerTemplate;\n+import org.apache.camel.builder.RouteBuilder;\n+import org.apache.camel.component.ahc.ws.WsComponent;\n+import org.apache.camel.impl.DefaultCamelContext;\n+import org.apache.camel.util.jsse.KeyManagersParameters;\n+import org.apache.camel.util.jsse.KeyStoreParameters;\n+import org.apache.camel.util.jsse.SSLContextParameters;\n+import org.apache.camel.util.jsse.TrustManagersParameters;\n+import org.jboss.arquillian.container.test.api.Deployment;\n+import org.jboss.arquillian.junit.Arquillian;\n+import org.jboss.shrinkwrap.api.ShrinkWrap;\n+import org.jboss.shrinkwrap.api.spec.WebArchive;\n+import org.junit.Assert;\n+import org.junit.Test;\n+import org.junit.runner.RunWith;\n+import org.wildfly.camel.test.ahc.subA.WebSocketServerEndpoint;\n+import org.wildfly.extension.camel.CamelAware;\n+\n+/*\n+ $ keytool -genkey -alias server -keyalg RSA -keystore application.keystore -validity 10950\n+ Enter keystore password: password\n+*/\n+\n+@CamelAware\n+@RunWith(Arquillian.class)\n+public class AhcWSSIntegrationTest {\n+\n+ private static final String WEBSOCKET_ENDPOINT = \"localhost:8443/ahc-wss-test/echo\";\n+\n+ private static final String KEYSTORE = \"application.keystore\";\n+ private static final String KEYSTORE_PASSWORD=\"password\";\n+\n+ @Deployment\n+ public static WebArchive createdeployment() {\n+ WebArchive archive = ShrinkWrap.create(WebArchive.class, \"ahc-wss-test.war\");\n+ archive.addClasses(WebSocketServerEndpoint.class);\n+ archive.addAsResource(\"ahc/application.keystore\", \"application.keystore\");\n+ archive.addAsWebResource(\"ahc/websocket.js\", \"websocket.js\");\n+ archive.addAsWebResource(\"ahc/index.jsp\", \"index.jsp\");\n+ archive.addAsWebInfResource(\"ahc/web.xml\", \"web.xml\");\n+ return archive;\n+ }\n+\n+ @Test\n+ public void testAsyncWssRoute() throws Exception {\n+\n+ CamelContext camelctx = new DefaultCamelContext();\n+ camelctx.addRoutes(new RouteBuilder() {\n+ @Override\n+ public void configure() throws Exception {\n+ from(\"direct:start\").to(\"ahc-wss:\" + WEBSOCKET_ENDPOINT);\n+ from(\"ahc-wss:\" + WEBSOCKET_ENDPOINT).to(\"seda:end\");\n+ }\n+ });\n+\n+ WsComponent wsComponent = (WsComponent) camelctx.getComponent(\"ahc-wss\");\n+ wsComponent.setSslContextParameters(defineSSLContextClientParameters());\n+\n+ PollingConsumer consumer = camelctx.getEndpoint(\"seda:end\").createPollingConsumer();\n+ consumer.start();\n+\n+ camelctx.start();\n+ try {\n+ ProducerTemplate producer = camelctx.createProducerTemplate();\n+ producer.sendBody(\"direct:start\", \"Kermit\");\n+\n+ Exchange exchange = consumer.receive(1000);\n+ Assert.assertEquals(\"Hello Kermit\", exchange.getIn().getBody(String.class));\n+\n+ } finally {\n+ camelctx.stop();\n+ }\n+ }\n+\n+ private static SSLContextParameters defineSSLContextClientParameters() {\n+\n+ KeyStoreParameters ksp = new KeyStoreParameters();\n+ ksp.setResource(\"/\" + KEYSTORE);\n+ ksp.setPassword(KEYSTORE_PASSWORD);\n+\n+ KeyManagersParameters kmp = new KeyManagersParameters();\n+ kmp.setKeyPassword(KEYSTORE_PASSWORD);\n+ kmp.setKeyStore(ksp);\n+\n+ TrustManagersParameters tmp = new TrustManagersParameters();\n+ tmp.setKeyStore(ksp);\n+\n+ SSLContextParameters scp = new SSLContextParameters();\n+ scp.setKeyManagers(kmp);\n+ scp.setTrustManagers(tmp);\n+\n+ return scp;\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/java/org/wildfly/camel/test/ahc/subA/WebSocketServerEndpoint.java",
"diff": "+package org.wildfly.camel.test.ahc.subA;\n+\n+import java.util.logging.Logger;\n+\n+import javax.websocket.OnClose;\n+import javax.websocket.OnMessage;\n+import javax.websocket.OnOpen;\n+import javax.websocket.Session;\n+import javax.websocket.server.ServerEndpoint;\n+\n+@ServerEndpoint(\"/echo\")\n+public class WebSocketServerEndpoint {\n+\n+ private final Logger logger = Logger.getLogger(this.getClass().getName());\n+\n+ @OnOpen\n+ public void onConnectionOpen(Session session) {\n+ logger.info(\"onConnectionOpen: \" + session.getId());\n+ }\n+\n+ @OnMessage\n+ public String onMessage(String message, Session session) {\n+ logger.info(\"onMessage: \" + message + \" in \" + session.getId());\n+ return \"Hello \" + message;\n+ }\n+\n+ @OnClose\n+ public void onConnectionClose(Session session) {\n+ logger.info(\"onConnectionClose: \" + session.getId());\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": "itests/standalone/extra/src/test/resources/ahc/application.keystore",
"new_path": "itests/standalone/extra/src/test/resources/ahc/application.keystore",
"diff": "Binary files /dev/null and b/itests/standalone/extra/src/test/resources/ahc/application.keystore differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/resources/ahc/index.jsp",
"diff": "+<%@page contentType=\"text/html\" pageEncoding=\"UTF-8\"%>\n+<!DOCTYPE html>\n+<html>\n+ <head>\n+ <meta http-equiv=\"Content-Type\" content=\"text/html; charset=UTF-8\">\n+ <title>WebSocket Security</title>\n+\n+ </head>\n+ <body>\n+ <h1>WebSocket Security</h1>\n+\n+ <div style=\"text-align: center;\">\n+ <form action=\"\">\n+ <input id=\"myField\" value=\"WebSocket\" type=\"text\"><br>\n+ <input onclick=\"echo();\" value=\"Echo\" type=\"button\">\n+ </form>\n+ </div>\n+ <div id=\"output\"></div>\n+ <script language=\"javascript\" type=\"text/javascript\" src=\"websocket.js\">\n+ </script>\n+ </body>\n+</html>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/resources/ahc/web.xml",
"diff": "+<web-app xmlns=\"http://xmlns.jcp.org/xml/ns/javaee\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n+ xsi:schemaLocation=\"http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd\"\n+ version=\"3.1\">\n+\n+ <security-constraint>\n+ <web-resource-collection>\n+ <web-resource-name>Secure WebSocket</web-resource-name>\n+ <url-pattern>/*</url-pattern>\n+ </web-resource-collection>\n+ <user-data-constraint>\n+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>\n+ </user-data-constraint>\n+ </security-constraint>\n+\n+</web-app>\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "itests/standalone/extra/src/test/resources/ahc/websocket.js",
"diff": "+var wsUri = \"wss://\" + document.location.host + \"/ahc-wss-test/echo\";\n+//var wsUri = \"ws://\" + document.location.hostname + \":8080/ahc-wss-test/echo\";\n+console.log(\"Connecting to \" + wsUri);\n+var websocket = new WebSocket(wsUri);\n+websocket.onopen = function(evt) { onOpen(evt) };\n+websocket.onmessage = function(evt) { onMessage(evt) };\n+websocket.onerror = function(evt) { onError(evt) };\n+\n+var output = document.getElementById(\"output\");\n+\n+function echo() {\n+ console.log(\"echo: \" + myField.value);\n+ websocket.send(myField.value);\n+ writeToScreen(\"SENT (text): \" + myField.value);\n+}\n+\n+function onOpen() {\n+ console.log(\"onOpen\");\n+ writeToScreen(\"CONNECTED\");\n+}\n+\n+function onMessage(evt) {\n+ writeToScreen(\"RECEIVED (text): \" + evt.data);\n+}\n+\n+function onError(evt) {\n+ writeToScreen('<span style=\"color: red;\">ERROR:</span> ' + evt.data);\n+}\n+\n+function writeToScreen(message) {\n+ var pre = document.createElement(\"p\");\n+ pre.style.wordWrap = \"break-word\";\n+ pre.innerHTML = message;\n+ output.appendChild(pre);\n+}\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1404] Add support for component ahc-wss
|
734,358 |
26.05.2017 13:55:24
| -7,200 |
82cd072e58f918df79dcd85b044683d6929b6713
|
[resolves Opentracing component missing from roadmap
|
[
{
"change_type": "MODIFY",
"old_path": "catalog/pom.xml",
"new_path": "catalog/pom.xml",
"diff": "</configuration>\n</execution>\n<execution>\n- <id>unpack-dependencies</id>\n+ <id>copy-dependencies</id>\n<phase>process-resources</phase>\n<goals>\n- <goal>unpack-dependencies</goal>\n+ <goal>copy-dependencies</goal>\n</goals>\n<configuration>\n<includeGroupIds>org.apache.camel</includeGroupIds>\n- <includes>org/apache/camel/**/*.json,org/apache/camel/**/*.class</includes>\n+ <stripVersion>true</stripVersion>\n</configuration>\n</execution>\n</executions>\n"
},
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/java/org/wildfly/camel/catalog/CatalogCreator.java",
"new_path": "catalog/src/main/java/org/wildfly/camel/catalog/CatalogCreator.java",
"diff": "@@ -35,6 +35,7 @@ import java.nio.file.attribute.BasicFileAttributes;\nimport java.util.ArrayList;\nimport java.util.Collections;\nimport java.util.HashMap;\n+import java.util.LinkedHashMap;\nimport java.util.List;\nimport java.util.Map;\n@@ -53,7 +54,7 @@ public final class CatalogCreator {\nstatic final Path outdir = basedir().resolve(Paths.get(\"target/classes\"));\npublic static enum Kind {\n- component, dataformat, language;\n+ component, dataformat, language, other;\n}\npublic static enum State {\n@@ -64,13 +65,13 @@ public final class CatalogCreator {\nfinal Path path;\nfinal Kind kind;\nfinal String name;\n- final String javaType;\n+ final String artifactId;\nfinal boolean deprecated;\nState state = State.undecided;\n- Item(Path path, Kind kind, String javaType, boolean deprecated) {\n+ Item(Path path, Kind kind, String artifactId, boolean deprecated) {\nthis.path = path;\nthis.kind = kind;\n- this.javaType = javaType;\n+ this.artifactId = artifactId;\nthis.deprecated = deprecated;\nString nspec = path.getFileName().toString();\nnspec = nspec.substring(0, nspec.indexOf(\".\"));\n@@ -110,24 +111,37 @@ public final class CatalogCreator {\n}\n}\n- public static Map<Kind, RoadMap> ROAD_MAPS = new HashMap<>();\n- static {\n+ private Map<Kind, RoadMap> ROAD_MAPS = new LinkedHashMap<>();\n+\n+ public CatalogCreator() {\nROAD_MAPS.put(Kind.component, new RoadMap(Kind.component));\nROAD_MAPS.put(Kind.dataformat, new RoadMap(Kind.dataformat));\nROAD_MAPS.put(Kind.language, new RoadMap(Kind.language));\n+ ROAD_MAPS.put(Kind.other, new RoadMap(Kind.other));\n}\npublic static void main(String[] args) throws Exception {\n- new CatalogCreator().createCatalog();\n+ new CatalogCreator().collect().generate();\n}\n- private void createCatalog() throws Exception {\n-\n+ public CatalogCreator collect() throws Exception {\ncollectAvailable();\ncollectSupported();\n+ return this;\n+ }\n+ public CatalogCreator generate() throws Exception {\ngenerateProperties();\ngenerateRoadmaps();\n+ return this;\n+ }\n+\n+ public RoadMap getRoadmap(Kind kind) {\n+ return ROAD_MAPS.get(kind);\n+ }\n+\n+ public List<RoadMap> getRoadmaps() {\n+ return new ArrayList<>(ROAD_MAPS.values());\n}\nprivate void collectAvailable() throws IOException {\n@@ -138,24 +152,29 @@ public final class CatalogCreator {\nif (path.toString().endsWith(\".json\")) {\nPath relpath = srcdir.relativize(path);\nObjectMapper mapper = new ObjectMapper();\n- JsonNode tree = mapper.readTree(path.toFile());\n- JsonNode findNode = tree.findValue(\"kind\");\n- String kind = findNode != null ? findNode.textValue() : null;\n- findNode = tree.findValue(\"javaType\");\n- String javaType = findNode != null ? findNode.textValue() : null;\n- boolean deprecated = Boolean.parseBoolean(tree.findValue(\"deprecated\").textValue());\n- if (validKind(kind) && javaType != null) {\n- Item item = new Item(relpath, Kind.valueOf(kind), javaType, deprecated);\n+ JsonNode treeNode = mapper.readTree(path.toFile());\n+ JsonNode valnode = treeNode.findValue(\"kind\");\n+ String kind = valnode != null ? valnode.textValue() : null;\n+ valnode = treeNode.findValue(\"artifactId\");\n+ String artifactId = valnode != null ? valnode.textValue() : null;\n+ boolean deprecated = Boolean.parseBoolean(treeNode.findValue(\"deprecated\").textValue());\n+ if (validKind(kind, treeNode)) {\n+ Item item = new Item(relpath, Kind.valueOf(kind), artifactId, deprecated);\nROAD_MAPS.get(item.kind).add(item);\n}\n}\nreturn FileVisitResult.CONTINUE;\n}\n- boolean validKind(String kind) {\n+ boolean validKind(String kind, JsonNode node) {\n+ JsonNode valnode = node.findValue(\"name\");\n+ String name = valnode != null ? valnode.textValue() : null;\ntry {\nKind.valueOf(kind);\nreturn true;\n} catch (IllegalArgumentException e) {\n+ if (name != null && name.contains(\"opentracing\")) {\n+ System.out.println(node);\n+ }\nreturn false;\n}\n}\n@@ -195,8 +214,7 @@ public final class CatalogCreator {\nPath rootPath = basedir().resolve(Paths.get(\"target\", \"dependency\"));\nfor (RoadMap roadmap : ROAD_MAPS.values()) {\nfor (Item item : roadmap.items.values()) {\n- Path javaType = Paths.get(item.javaType.replace('.', '/') + \".class\");\n- if (rootPath.resolve(javaType).toFile().isFile()) {\n+ if (rootPath.resolve(item.artifactId + \".jar\").toFile().isFile()) {\nPath subpath = item.path.subpath(2, item.path.getNameCount());\nPath targetPath = Paths.get(\"org\", \"wildfly\").resolve(subpath);\nPath target = outdir.resolve(targetPath);\n"
},
{
"change_type": "MODIFY",
"old_path": "catalog/src/main/resources/component.roadmap",
"new_path": "catalog/src/main/resources/component.roadmap",
"diff": "@@ -52,6 +52,7 @@ ftps\ngit\ngithub\nhttp4\n+http4s\nimap\nimaps\ninfinispan\n@@ -157,7 +158,6 @@ google-pubsub\ngrpc\nhbase\nhdfs2\n-http4s\nignite-cache\nignite-compute\nignite-events\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "catalog/src/main/resources/other.roadmap",
"diff": "+[supported]\n+cdi\n+cxf-transport\n+hystrix\n+jasypt\n+spring-security\n+swagger-java\n+zipkin\n+\n+[planned]\n+\n+[undecided]\n+kura\n+leveldb\n+opentracing\n+ribbon\n+shiro\n+spring-cloud\n+spring-cloud-netflix\n+spring-javaconfig\n+\n+[rejected]\n+bam (deprecated)\n+blueprint\n+eclipse (deprecated)\n+groovy-dsl (deprecated)\n+guice (deprecated)\n+hawtdb (deprecated)\n+ruby (deprecated)\n+rx (deprecated)\n+scala (deprecated)\n+scr (deprecated)\n+servletlistener (deprecated)\n+spring-boot\n+spring-dm (deprecated)\n+swagger (deprecated)\n+test\n+test-blueprint\n+test-cdi\n+test-karaf\n+test-spring\n+testng (deprecated)\n+urlrewrite (deprecated)\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "catalog/src/test/java/org/wildfly/camel/test/catalog/CatalogCreatorTest.java",
"diff": "+/*\n+ * #%L\n+ * Wildfly Camel :: Testsuite\n+ * %%\n+ * Copyright (C) 2013 - 2014 RedHat\n+ * %%\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ * #L%\n+ */\n+\n+package org.wildfly.camel.test.catalog;\n+\n+import java.util.List;\n+\n+import org.junit.Assert;\n+import org.junit.Test;\n+import org.wildfly.camel.catalog.CatalogCreator;\n+import org.wildfly.camel.catalog.CatalogCreator.Item;\n+import org.wildfly.camel.catalog.CatalogCreator.Kind;\n+import org.wildfly.camel.catalog.CatalogCreator.RoadMap;\n+\n+public final class CatalogCreatorTest {\n+\n+ @Test\n+ public void createCatalog() throws Exception {\n+\n+ CatalogCreator creator = new CatalogCreator().collect();\n+ List<RoadMap> roadmaps = creator.getRoadmaps();\n+ Assert.assertEquals(4, roadmaps.size());\n+\n+ RoadMap roadmap = creator.getRoadmap(Kind.other);\n+ Assert.assertNotNull(\"Other roadmap not null\", roadmap);\n+\n+ Item item = roadmap.item(\"opentracing\");\n+ Assert.assertNotNull(\"Item not null\", item);\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "RENAME",
"old_path": "catalog/src/test/java/org/wildfly/camel/test/catalog/UndecidedComponentsTest.java",
"new_path": "catalog/src/test/java/org/wildfly/camel/test/catalog/GenerateRoadmapIssuesTest.java",
"diff": "@@ -44,7 +44,7 @@ import org.wildfly.camel.catalog.CatalogCreator;\nimport org.wildfly.camel.catalog.CatalogCreator.RoadMap;\n@FixMethodOrder(MethodSorters.NAME_ASCENDING)\n-public final class UndecidedComponentsTest {\n+public final class GenerateRoadmapIssuesTest {\nprivate static final String MILESTONE = \"4.8.0\";\nprivate static final Label LABEL = new Label().setName(\"feature\");\n@@ -54,8 +54,10 @@ public final class UndecidedComponentsTest {\n@Test\npublic void createIssuesStepA() throws Exception {\n+ CatalogCreator creator = new CatalogCreator().collect();\n+\nList<String> collection = new ArrayList<>();\n- for (RoadMap rm : CatalogCreator.ROAD_MAPS.values()) {\n+ for (RoadMap rm : creator.getRoadmaps()) {\nString prefix = null;\nFile file = rm.getOutpath().toFile();\ntry (BufferedReader br = new BufferedReader(new FileReader(file))) {\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1860] Opentracing component missing from roadmap
|
734,358 |
30.05.2017 13:30:18
| -7,200 |
3d6ecdf0700df1fcce7994618f01d586ce889e79
|
[resolves Add support for wildfly-swarm-2017.6.0
|
[
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<version.maven.archetype.packaging>2.3</version.maven.archetype.packaging>\n<version.osgi>5.0.0</version.osgi>\n<version.redis.embedded>0.6</version.redis.embedded>\n- <version.wildfly.swarm>2017.5.0-SNAPSHOT</version.wildfly.swarm>\n<!-- Plugin versions -->\n<version-apache-scr-plugin>1.21.0</version-apache-scr-plugin>\n"
},
{
"change_type": "MODIFY",
"old_path": "swarm/pom.xml",
"new_path": "swarm/pom.xml",
"diff": "<artifactId>wildfly-camel-swarm</artifactId>\n<properties>\n+ <version.wildfly.swarm>2017.6.0-SNAPSHOT</version.wildfly.swarm>\n<outdir>${basedir}/target/generated</outdir>\n</properties>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1895] Add support for wildfly-swarm-2017.6.0
|
734,358 |
08.06.2017 17:06:36
| -7,200 |
37db0316c4cf1c8e7c41a64dea095959fb6b03fc
|
[resolves Revisit docker image creation
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "docker/README.md",
"diff": "+## WildFly Docker Setup\n+\n+Details about the WildFly CentOS image are described [here](https://github.com/openshift/openshift-docs/blob/master/using_images/s2i_images/wildfly.adoc).\n+\n+ minishift delete\n+ minishift start --vm-driver=virtualbox --memory 12048 --cpus 3\n+ eval $(minishift docker-env)\n+\n+Build the WildFly Camel docker image\n+\n+ mvn clean install -Ddocker -pl docker -am\n+\n+Run the WildFly Camel docker image\n+\n+ docker run --rm -ti -e WILDFLY_MANAGEMENT_USER=admin -e WILDFLY_MANAGEMENT_PASSWORD=admin -p 8080:8080 -p 9990:9990 wildflyext/wildfly-camel\n+\n+Test access to the console http://192.168.99.100:9990/console and to hawtio http://192.168.99.100:8080/hawtio\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/pom.xml",
"new_path": "docker/pom.xml",
"diff": "<docker.image.version>latest</docker.image.version>\n<docker.removeAll>true</docker.removeAll>\n<server.config>standalone-camel.xml</server.config>\n+ <server.home>/wildfly</server.home>\n</properties>\n<!-- Dependencies -->\n</exec>\n</cmd>\n<env>\n- <JBOSS_HOME>/wildfly</JBOSS_HOME>\n+ <JBOSS_HOME>${server.home}</JBOSS_HOME>\n<LAUNCH_JBOSS_IN_BACKGROUND>true</LAUNCH_JBOSS_IN_BACKGROUND>\n</env>\n<assembly>\n<basedir>/</basedir>\n<descriptor>${project.basedir}/s2i/assembly-artifacts.xml</descriptor>\n- <user>default:root:1001</user>\n+ <user>default:root:default</user>\n</assembly>\n<runCmds>\n- <run>/wildfly/bin/fuseconfig.sh --configs camel --enable</run>\n+ <run>${server.home}/bin/fuseconfig.sh --configs camel --enable</run>\n</runCmds>\n<optimise>true</optimise>\n</build>\n"
},
{
"change_type": "MODIFY",
"old_path": "docker/s2i/assembly-artifacts.xml",
"new_path": "docker/s2i/assembly-artifacts.xml",
"diff": "<includes>\n<include>org.wildfly.camel:wildfly-camel-patch:tar.gz</include>\n</includes>\n- <outputDirectory>wildfly</outputDirectory>\n+ <outputDirectory>${server.home}</outputDirectory>\n<scope>provided</scope>\n<unpack>true</unpack>\n<unpackOptions>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1902] Revisit docker image creation
|
734,358 |
08.05.2017 09:05:21
| -7,200 |
b6cea278925191823d83d452bd53935c664b8b61
|
[resolves Upgrade to camel-2.19.1
|
[
{
"change_type": "MODIFY",
"old_path": "patch/etc/baseline/module-list.txt",
"new_path": "patch/etc/baseline/module-list.txt",
"diff": "/com/jcraft/jsch/main/jsch-0.1.54.jar\n/com/netflix/hystrix/main/HdrHistogram-2.1.6.jar\n/com/netflix/hystrix/main/archaius-core-0.4.1.jar\n-/com/netflix/hystrix/main/hystrix-core-1.5.10.jar\n-/com/netflix/hystrix/main/hystrix-metrics-event-stream-1.5.10.jar\n-/com/netflix/hystrix/main/hystrix-serialization-1.5.10.jar\n+/com/netflix/hystrix/main/hystrix-core-1.5.12.jar\n+/com/netflix/hystrix/main/hystrix-metrics-event-stream-1.5.12.jar\n+/com/netflix/hystrix/main/hystrix-serialization-1.5.12.jar\n/com/netflix/hystrix/main/rxjava-1.2.0.jar\n/com/rometools/rome/main/rome-1.0.jar\n/com/squareup/moshi/main/moshi-1.2.0.jar\n/org/apache/activemq/main/activemq-pool-5.14.5.jar\n/org/apache/activemq/main/activemq-spring-5.14.5.jar\n/org/apache/camel/component/activemq/main/activemq-camel-5.14.5.jar\n-/org/apache/camel/component/ahc-ws/main/camel-ahc-ws-2.19.0.jar\n-/org/apache/camel/component/ahc/main/camel-ahc-2.19.0.jar\n-/org/apache/camel/component/amqp/main/camel-amqp-2.19.0.jar\n-/org/apache/camel/component/atom/main/camel-atom-2.19.0.jar\n-/org/apache/camel/component/avro/main/camel-avro-2.19.0.jar\n-/org/apache/camel/component/aws/main/camel-aws-2.19.0.jar\n-/org/apache/camel/component/barcode/main/camel-barcode-2.19.0.jar\n+/org/apache/camel/component/ahc-ws/main/camel-ahc-ws-2.19.1.jar\n+/org/apache/camel/component/ahc/main/camel-ahc-2.19.1.jar\n+/org/apache/camel/component/amqp/main/camel-amqp-2.19.1.jar\n+/org/apache/camel/component/atom/main/camel-atom-2.19.1.jar\n+/org/apache/camel/component/avro/main/camel-avro-2.19.1.jar\n+/org/apache/camel/component/aws/main/camel-aws-2.19.1.jar\n+/org/apache/camel/component/barcode/main/camel-barcode-2.19.1.jar\n/org/apache/camel/component/barcode/main/core-3.3.0.jar\n/org/apache/camel/component/barcode/main/javase-3.3.0.jar\n-/org/apache/camel/component/base64/main/camel-base64-2.19.0.jar\n-/org/apache/camel/component/bean/validator/main/camel-bean-validator-2.19.0.jar\n+/org/apache/camel/component/base64/main/camel-base64-2.19.1.jar\n+/org/apache/camel/component/bean/validator/main/camel-bean-validator-2.19.1.jar\n/org/apache/camel/component/beanio/main/beanio-2.1.0.jar\n-/org/apache/camel/component/beanio/main/camel-beanio-2.19.0.jar\n-/org/apache/camel/component/bindy/main/camel-bindy-2.19.0.jar\n-/org/apache/camel/component/box/main/camel-box-2.19.0.jar\n-/org/apache/camel/component/box/main/camel-box-api-2.19.0.jar\n+/org/apache/camel/component/beanio/main/camel-beanio-2.19.1.jar\n+/org/apache/camel/component/bindy/main/camel-bindy-2.19.1.jar\n+/org/apache/camel/component/box/main/camel-box-2.19.1.jar\n+/org/apache/camel/component/box/main/camel-box-api-2.19.1.jar\n/org/apache/camel/component/braintree/main/braintree-java-2.63.0.jar\n-/org/apache/camel/component/braintree/main/camel-braintree-2.19.0.jar\n-/org/apache/camel/component/cassandra/main/camel-cassandraql-2.19.0.jar\n+/org/apache/camel/component/braintree/main/camel-braintree-2.19.1.jar\n+/org/apache/camel/component/cassandra/main/camel-cassandraql-2.19.1.jar\n/org/apache/camel/component/cassandra/main/cassandra-driver-core-3.2.0.jar\n-/org/apache/camel/component/castor/main/camel-castor-2.19.0.jar\n+/org/apache/camel/component/castor/main/camel-castor-2.19.1.jar\n/org/apache/camel/component/castor/main/castor-core-1.3.3.jar\n/org/apache/camel/component/castor/main/castor-xml-1.3.3.jar\n-/org/apache/camel/component/cdi/main/camel-cdi-2.19.0.jar\n-/org/apache/camel/component/coap/main/camel-coap-2.19.0.jar\n-/org/apache/camel/component/context/main/camel-context-2.19.0.jar\n-/org/apache/camel/component/couchdb/main/camel-couchdb-2.19.0.jar\n+/org/apache/camel/component/cdi/main/camel-cdi-2.19.1.jar\n+/org/apache/camel/component/coap/main/camel-coap-2.19.1.jar\n+/org/apache/camel/component/context/main/camel-context-2.19.1.jar\n+/org/apache/camel/component/couchdb/main/camel-couchdb-2.19.1.jar\n/org/apache/camel/component/couchdb/main/lightcouch-0.1.8.jar\n-/org/apache/camel/component/crypto/main/camel-crypto-2.19.0.jar\n-/org/apache/camel/component/csv/main/camel-csv-2.19.0.jar\n-/org/apache/camel/component/cxf/main/camel-cxf-2.19.0.jar\n-/org/apache/camel/component/cxf/main/camel-cxf-transport-2.19.0.jar\n-/org/apache/camel/component/dns/main/camel-dns-2.19.0.jar\n+/org/apache/camel/component/crypto/main/camel-crypto-2.19.1.jar\n+/org/apache/camel/component/csv/main/camel-csv-2.19.1.jar\n+/org/apache/camel/component/cxf/main/camel-cxf-2.19.1.jar\n+/org/apache/camel/component/cxf/main/camel-cxf-transport-2.19.1.jar\n+/org/apache/camel/component/dns/main/camel-dns-2.19.1.jar\n/org/apache/camel/component/dns/main/dnsjava-2.1.8.jar\n-/org/apache/camel/component/dozer/main/camel-dozer-2.19.0.jar\n-/org/apache/camel/component/dropbox/main/camel-dropbox-2.19.0.jar\n+/org/apache/camel/component/dozer/main/camel-dozer-2.19.1.jar\n+/org/apache/camel/component/dropbox/main/camel-dropbox-2.19.1.jar\n/org/apache/camel/component/dropbox/main/dropbox-core-sdk-1.8.2.jar\n-/org/apache/camel/component/ejb/main/camel-ejb-2.19.0.jar\n-/org/apache/camel/component/elasticsearch/main/camel-elasticsearch-2.19.0.jar\n-/org/apache/camel/component/elsql/main/camel-elsql-2.19.0.jar\n+/org/apache/camel/component/ejb/main/camel-ejb-2.19.1.jar\n+/org/apache/camel/component/elasticsearch/main/camel-elasticsearch-2.19.1.jar\n+/org/apache/camel/component/elsql/main/camel-elsql-2.19.1.jar\n/org/apache/camel/component/elsql/main/elsql-1.2.jar\n-/org/apache/camel/component/exec/main/camel-exec-2.19.0.jar\n-/org/apache/camel/component/facebook/main/camel-facebook-2.19.0.jar\n+/org/apache/camel/component/exec/main/camel-exec-2.19.1.jar\n+/org/apache/camel/component/facebook/main/camel-facebook-2.19.1.jar\n/org/apache/camel/component/facebook/main/facebook4j-core-2.4.8.jar\n-/org/apache/camel/component/flatpack/main/camel-flatpack-2.19.0.jar\n+/org/apache/camel/component/flatpack/main/camel-flatpack-2.19.1.jar\n/org/apache/camel/component/flatpack/main/flatpack-3.4.3.jar\n-/org/apache/camel/component/freemarker/main/camel-freemarker-2.19.0.jar\n+/org/apache/camel/component/freemarker/main/camel-freemarker-2.19.1.jar\n/org/apache/camel/component/freemarker/main/freemarker-2.3.23.jar\n-/org/apache/camel/component/ftp/main/camel-ftp-2.19.0.jar\n+/org/apache/camel/component/ftp/main/camel-ftp-2.19.1.jar\n/org/apache/camel/component/git/main/JavaEWAH-1.1.6.jar\n-/org/apache/camel/component/git/main/camel-git-2.19.0.jar\n+/org/apache/camel/component/git/main/camel-git-2.19.1.jar\n/org/apache/camel/component/git/main/org.eclipse.jgit-4.7.0.201704051617-r.jar\n-/org/apache/camel/component/github/main/camel-github-2.19.0.jar\n+/org/apache/camel/component/github/main/camel-github-2.19.1.jar\n/org/apache/camel/component/github/main/org.eclipse.egit.github.core-2.1.5.jar\n-/org/apache/camel/component/groovy/main/camel-groovy-2.19.0.jar\n-/org/apache/camel/component/gson/main/camel-gson-2.19.0.jar\n-/org/apache/camel/component/hl7/main/camel-hl7-2.19.0.jar\n+/org/apache/camel/component/groovy/main/camel-groovy-2.19.1.jar\n+/org/apache/camel/component/gson/main/camel-gson-2.19.1.jar\n+/org/apache/camel/component/hl7/main/camel-hl7-2.19.1.jar\n/org/apache/camel/component/hl7/main/hapi-base-2.2.jar\n/org/apache/camel/component/hl7/main/hapi-structures-v24-2.2.jar\n/org/apache/camel/component/hl7/main/hapi-structures-v25-2.2.jar\n-/org/apache/camel/component/http/common/main/camel-http-common-2.19.0.jar\n-/org/apache/camel/component/http4/main/camel-http4-2.19.0.jar\n-/org/apache/camel/component/hystrix/main/camel-hystrix-2.19.0.jar\n-/org/apache/camel/component/infinispan/main/camel-infinispan-2.19.0.jar\n-/org/apache/camel/component/influxdb/main/camel-influxdb-2.19.0.jar\n+/org/apache/camel/component/http/common/main/camel-http-common-2.19.1.jar\n+/org/apache/camel/component/http4/main/camel-http4-2.19.1.jar\n+/org/apache/camel/component/hystrix/main/camel-hystrix-2.19.1.jar\n+/org/apache/camel/component/infinispan/main/camel-infinispan-2.19.1.jar\n+/org/apache/camel/component/influxdb/main/camel-influxdb-2.19.1.jar\n/org/apache/camel/component/influxdb/main/influxdb-java-2.5.jar\n-/org/apache/camel/component/irc/main/camel-irc-2.19.0.jar\n+/org/apache/camel/component/irc/main/camel-irc-2.19.1.jar\n/org/apache/camel/component/irc/main/irclib-1.10.jar\n-/org/apache/camel/component/jackson/main/camel-jackson-2.19.0.jar\n-/org/apache/camel/component/jacksonxml/main/camel-jacksonxml-2.19.0.jar\n-/org/apache/camel/component/jasypt/main/camel-jasypt-2.19.0.jar\n-/org/apache/camel/component/jaxb/main/camel-jaxb-2.19.0.jar\n-/org/apache/camel/component/jbpm/main/camel-jbpm-2.19.0.jar\n-/org/apache/camel/component/jcache/main/camel-jcache-2.19.0.jar\n-/org/apache/camel/component/jdbc/main/camel-jdbc-2.19.0.jar\n-/org/apache/camel/component/jgroups/main/camel-jgroups-2.19.0.jar\n-/org/apache/camel/component/jms/main/camel-jms-2.19.0.jar\n-/org/apache/camel/component/jmx/main/camel-jmx-2.19.0.jar\n-/org/apache/camel/component/jpa/main/camel-jpa-2.19.0.jar\n-/org/apache/camel/component/jsch/main/camel-jsch-2.19.0.jar\n+/org/apache/camel/component/jackson/main/camel-jackson-2.19.1.jar\n+/org/apache/camel/component/jacksonxml/main/camel-jacksonxml-2.19.1.jar\n+/org/apache/camel/component/jasypt/main/camel-jasypt-2.19.1.jar\n+/org/apache/camel/component/jaxb/main/camel-jaxb-2.19.1.jar\n+/org/apache/camel/component/jbpm/main/camel-jbpm-2.19.1.jar\n+/org/apache/camel/component/jcache/main/camel-jcache-2.19.1.jar\n+/org/apache/camel/component/jdbc/main/camel-jdbc-2.19.1.jar\n+/org/apache/camel/component/jgroups/main/camel-jgroups-2.19.1.jar\n+/org/apache/camel/component/jms/main/camel-jms-2.19.1.jar\n+/org/apache/camel/component/jmx/main/camel-jmx-2.19.1.jar\n+/org/apache/camel/component/jpa/main/camel-jpa-2.19.1.jar\n+/org/apache/camel/component/jsch/main/camel-jsch-2.19.1.jar\n/org/apache/camel/component/jsonpath/main/accessors-smart-1.1.jar\n-/org/apache/camel/component/jsonpath/main/camel-jsonpath-2.19.0.jar\n+/org/apache/camel/component/jsonpath/main/camel-jsonpath-2.19.1.jar\n/org/apache/camel/component/jsonpath/main/json-path-2.1.0.jar\n/org/apache/camel/component/jsonpath/main/json-smart-2.2.1.jar\n-/org/apache/camel/component/kafka/main/camel-kafka-2.19.0.jar\n-/org/apache/camel/component/kubernetes/main/camel-kubernetes-2.19.0.jar\n-/org/apache/camel/component/ldap/main/camel-ldap-2.19.0.jar\n-/org/apache/camel/component/linkedin/main/camel-linkedin-2.19.0.jar\n-/org/apache/camel/component/linkedin/main/camel-linkedin-api-2.19.0.jar\n-/org/apache/camel/component/lucene/main/camel-lucene-2.19.0.jar\n-/org/apache/camel/component/mail/main/camel-mail-2.19.0.jar\n-/org/apache/camel/component/metrics/main/camel-metrics-2.19.0.jar\n+/org/apache/camel/component/kafka/main/camel-kafka-2.19.1.jar\n+/org/apache/camel/component/kubernetes/main/camel-kubernetes-2.19.1.jar\n+/org/apache/camel/component/ldap/main/camel-ldap-2.19.1.jar\n+/org/apache/camel/component/linkedin/main/camel-linkedin-2.19.1.jar\n+/org/apache/camel/component/linkedin/main/camel-linkedin-api-2.19.1.jar\n+/org/apache/camel/component/lucene/main/camel-lucene-2.19.1.jar\n+/org/apache/camel/component/mail/main/camel-mail-2.19.1.jar\n+/org/apache/camel/component/metrics/main/camel-metrics-2.19.1.jar\n/org/apache/camel/component/metrics/main/metrics-core-3.1.3.jar\n/org/apache/camel/component/metrics/main/metrics-json-3.1.3.jar\n-/org/apache/camel/component/mina2/main/camel-mina2-2.19.0.jar\n-/org/apache/camel/component/mllp/main/camel-mllp-2.19.0.jar\n-/org/apache/camel/component/mongodb/main/camel-mongodb-2.19.0.jar\n+/org/apache/camel/component/mina2/main/camel-mina2-2.19.1.jar\n+/org/apache/camel/component/mllp/main/camel-mllp-2.19.1.jar\n+/org/apache/camel/component/mongodb/main/camel-mongodb-2.19.1.jar\n/org/apache/camel/component/mongodb/main/mongo-java-driver-3.4.2.jar\n-/org/apache/camel/component/mqtt/main/camel-mqtt-2.19.0.jar\n-/org/apache/camel/component/mvel/main/camel-mvel-2.19.0.jar\n-/org/apache/camel/component/mybatis/main/camel-mybatis-2.19.0.jar\n+/org/apache/camel/component/mqtt/main/camel-mqtt-2.19.1.jar\n+/org/apache/camel/component/mvel/main/camel-mvel-2.19.1.jar\n+/org/apache/camel/component/mybatis/main/camel-mybatis-2.19.1.jar\n/org/apache/camel/component/mybatis/main/mybatis-3.4.2.jar\n-/org/apache/camel/component/nats/main/camel-nats-2.19.0.jar\n+/org/apache/camel/component/nats/main/camel-nats-2.19.1.jar\n/org/apache/camel/component/nats/main/jnats-1.0.jar\n-/org/apache/camel/component/netty4/main/camel-netty4-2.19.0.jar\n-/org/apache/camel/component/ognl/main/camel-ognl-2.19.0.jar\n-/org/apache/camel/component/olingo2/main/camel-olingo2-2.19.0.jar\n-/org/apache/camel/component/olingo2/main/camel-olingo2-api-2.19.0.jar\n-/org/apache/camel/component/optaplanner/main/camel-optaplanner-2.19.0.jar\n+/org/apache/camel/component/netty4/main/camel-netty4-2.19.1.jar\n+/org/apache/camel/component/ognl/main/camel-ognl-2.19.1.jar\n+/org/apache/camel/component/olingo2/main/camel-olingo2-2.19.1.jar\n+/org/apache/camel/component/olingo2/main/camel-olingo2-api-2.19.1.jar\n+/org/apache/camel/component/optaplanner/main/camel-optaplanner-2.19.1.jar\n/org/apache/camel/component/optaplanner/main/optaplanner-core-6.5.0.Final.jar\n-/org/apache/camel/component/paho/main/camel-paho-2.19.0.jar\n+/org/apache/camel/component/paho/main/camel-paho-2.19.1.jar\n/org/apache/camel/component/paho/main/org.eclipse.paho.client.mqttv3-1.1.0.jar\n-/org/apache/camel/component/pdf/main/camel-pdf-2.19.0.jar\n-/org/apache/camel/component/protobuf/main/camel-protobuf-2.19.0.jar\n+/org/apache/camel/component/pdf/main/camel-pdf-2.19.1.jar\n+/org/apache/camel/component/protobuf/main/camel-protobuf-2.19.1.jar\n/org/apache/camel/component/protobuf/main/protobuf-java-3.1.0.jar\n/org/apache/camel/component/protobuf/main/protobuf-java-util-3.1.0.jar\n-/org/apache/camel/component/quartz2/main/camel-quartz2-2.19.0.jar\n+/org/apache/camel/component/quartz2/main/camel-quartz2-2.19.1.jar\n/org/apache/camel/component/rabbitmq/main/amqp-client-4.1.0.jar\n-/org/apache/camel/component/rabbitmq/main/camel-rabbitmq-2.19.0.jar\n-/org/apache/camel/component/reactive/streams/main/camel-reactive-streams-2.19.0.jar\n-/org/apache/camel/component/rest/swagger/main/camel-rest-swagger-2.19.0.jar\n-/org/apache/camel/component/rss/main/camel-rss-2.19.0.jar\n+/org/apache/camel/component/rabbitmq/main/camel-rabbitmq-2.19.1.jar\n+/org/apache/camel/component/reactive/streams/main/camel-reactive-streams-2.19.1.jar\n+/org/apache/camel/component/rest/swagger/main/camel-rest-swagger-2.19.1.jar\n+/org/apache/camel/component/rss/main/camel-rss-2.19.1.jar\n/org/apache/camel/component/salesforce/main/bayeux-api-3.0.10.jar\n-/org/apache/camel/component/salesforce/main/camel-salesforce-2.19.0.jar\n+/org/apache/camel/component/salesforce/main/camel-salesforce-2.19.1.jar\n/org/apache/camel/component/salesforce/main/cometd-java-client-3.0.10.jar\n/org/apache/camel/component/salesforce/main/cometd-java-common-3.0.10.jar\n-/org/apache/camel/component/sap/netweaver/main/camel-sap-netweaver-2.19.0.jar\n-/org/apache/camel/component/saxon/main/camel-saxon-2.19.0.jar\n-/org/apache/camel/component/schematron/main/camel-schematron-2.19.0.jar\n-/org/apache/camel/component/script/main/camel-script-2.19.0.jar\n-/org/apache/camel/component/servicenow/main/camel-servicenow-2.19.0.jar\n-/org/apache/camel/component/servlet/main/camel-servlet-2.19.0.jar\n-/org/apache/camel/component/sjms/main/camel-sjms-2.19.0.jar\n-/org/apache/camel/component/sjms2/main/camel-sjms2-2.19.0.jar\n-/org/apache/camel/component/smpp/main/camel-smpp-2.19.0.jar\n+/org/apache/camel/component/sap/netweaver/main/camel-sap-netweaver-2.19.1.jar\n+/org/apache/camel/component/saxon/main/camel-saxon-2.19.1.jar\n+/org/apache/camel/component/schematron/main/camel-schematron-2.19.1.jar\n+/org/apache/camel/component/script/main/camel-script-2.19.1.jar\n+/org/apache/camel/component/servicenow/main/camel-servicenow-2.19.1.jar\n+/org/apache/camel/component/servlet/main/camel-servlet-2.19.1.jar\n+/org/apache/camel/component/sjms/main/camel-sjms-2.19.1.jar\n+/org/apache/camel/component/sjms2/main/camel-sjms2-2.19.1.jar\n+/org/apache/camel/component/smpp/main/camel-smpp-2.19.1.jar\n/org/apache/camel/component/smpp/main/jsmpp-2.3.4.jar\n-/org/apache/camel/component/snakeyaml/main/camel-snakeyaml-2.19.0.jar\n-/org/apache/camel/component/snmp/main/camel-snmp-2.19.0.jar\n+/org/apache/camel/component/snakeyaml/main/camel-snakeyaml-2.19.1.jar\n+/org/apache/camel/component/snmp/main/camel-snmp-2.19.1.jar\n/org/apache/camel/component/snmp/main/org.apache.servicemix.bundles.snmp4j-2.3.4_1.jar\n-/org/apache/camel/component/soap/main/camel-soap-2.19.0.jar\n-/org/apache/camel/component/splunk/main/camel-splunk-2.19.0.jar\n+/org/apache/camel/component/soap/main/camel-soap-2.19.1.jar\n+/org/apache/camel/component/splunk/main/camel-splunk-2.19.1.jar\n/org/apache/camel/component/splunk/main/org.apache.servicemix.bundles.splunk-1.5.0.0_1.jar\n-/org/apache/camel/component/spring/batch/main/camel-spring-batch-2.19.0.jar\n-/org/apache/camel/component/spring/integration/main/camel-spring-integration-2.19.0.jar\n-/org/apache/camel/component/spring/ldap/main/camel-spring-ldap-2.19.0.jar\n-/org/apache/camel/component/spring/redis/main/camel-spring-redis-2.19.0.jar\n-/org/apache/camel/component/spring/security/main/camel-spring-security-2.19.0.jar\n-/org/apache/camel/component/sql/main/camel-sql-2.19.0.jar\n-/org/apache/camel/component/ssh/main/camel-ssh-2.19.0.jar\n-/org/apache/camel/component/stax/main/camel-stax-2.19.0.jar\n-/org/apache/camel/component/stream/main/camel-stream-2.19.0.jar\n-/org/apache/camel/component/swagger/main/camel-swagger-java-2.19.0.jar\n+/org/apache/camel/component/spring/batch/main/camel-spring-batch-2.19.1.jar\n+/org/apache/camel/component/spring/integration/main/camel-spring-integration-2.19.1.jar\n+/org/apache/camel/component/spring/ldap/main/camel-spring-ldap-2.19.1.jar\n+/org/apache/camel/component/spring/redis/main/camel-spring-redis-2.19.1.jar\n+/org/apache/camel/component/spring/security/main/camel-spring-security-2.19.1.jar\n+/org/apache/camel/component/sql/main/camel-sql-2.19.1.jar\n+/org/apache/camel/component/ssh/main/camel-ssh-2.19.1.jar\n+/org/apache/camel/component/stax/main/camel-stax-2.19.1.jar\n+/org/apache/camel/component/stream/main/camel-stream-2.19.1.jar\n+/org/apache/camel/component/swagger/main/camel-swagger-java-2.19.1.jar\n/org/apache/camel/component/swagger/main/swagger-annotations-1.5.13.jar\n/org/apache/camel/component/swagger/main/swagger-core-1.5.13.jar\n/org/apache/camel/component/swagger/main/swagger-jaxrs-1.5.13.jar\n/org/apache/camel/component/swagger/main/swagger-models-1.5.13.jar\n/org/apache/camel/component/swagger/main/swagger-parser-1.0.28.jar\n-/org/apache/camel/component/syslog/main/camel-syslog-2.19.0.jar\n-/org/apache/camel/component/tagsoup/main/camel-tagsoup-2.19.0.jar\n+/org/apache/camel/component/syslog/main/camel-syslog-2.19.1.jar\n+/org/apache/camel/component/tagsoup/main/camel-tagsoup-2.19.1.jar\n/org/apache/camel/component/tagsoup/main/tagsoup-1.2.1.jar\n-/org/apache/camel/component/tarfile/main/camel-tarfile-2.19.0.jar\n-/org/apache/camel/component/twitter/main/camel-twitter-2.19.0.jar\n+/org/apache/camel/component/tarfile/main/camel-tarfile-2.19.1.jar\n+/org/apache/camel/component/twitter/main/camel-twitter-2.19.1.jar\n/org/apache/camel/component/twitter/main/twitter4j-core-4.0.6.jar\n/org/apache/camel/component/twitter/main/twitter4j-stream-4.0.6.jar\n-/org/apache/camel/component/undertow/main/camel-undertow-2.19.0.jar\n-/org/apache/camel/component/velocity/main/camel-velocity-2.19.0.jar\n-/org/apache/camel/component/vertx/main/camel-vertx-2.19.0.jar\n+/org/apache/camel/component/undertow/main/camel-undertow-2.19.1.jar\n+/org/apache/camel/component/velocity/main/camel-velocity-2.19.1.jar\n+/org/apache/camel/component/vertx/main/camel-vertx-2.19.1.jar\n/org/apache/camel/component/vertx/main/vertx-core-3.4.1.jar\n-/org/apache/camel/component/weather/main/camel-weather-2.19.0.jar\n-/org/apache/camel/component/xmlbeans/main/camel-xmlbeans-2.19.0.jar\n-/org/apache/camel/component/xmlsecurity/main/camel-xmlsecurity-2.19.0.jar\n-/org/apache/camel/component/xstream/main/camel-xstream-2.19.0.jar\n-/org/apache/camel/component/zipfile/main/camel-zipfile-2.19.0.jar\n+/org/apache/camel/component/weather/main/camel-weather-2.19.1.jar\n+/org/apache/camel/component/xmlbeans/main/camel-xmlbeans-2.19.1.jar\n+/org/apache/camel/component/xmlsecurity/main/camel-xmlsecurity-2.19.1.jar\n+/org/apache/camel/component/xstream/main/camel-xstream-2.19.1.jar\n+/org/apache/camel/component/zipfile/main/camel-zipfile-2.19.1.jar\n/org/apache/camel/component/zipkin/main/brave-core-4.2.0.jar\n/org/apache/camel/component/zipkin/main/brave-spancollector-scribe-4.2.0.jar\n-/org/apache/camel/component/zipkin/main/camel-zipkin-2.19.0.jar\n+/org/apache/camel/component/zipkin/main/camel-zipkin-2.19.1.jar\n/org/apache/camel/component/zipkin/main/libthrift-0.9.3.jar\n/org/apache/camel/component/zipkin/main/zipkin-1.23.2.jar\n/org/apache/camel/component/zipkin/main/zipkin-reporter-0.7.0.jar\n-/org/apache/camel/component/zookeeper/main/camel-zookeeper-2.19.0.jar\n-/org/apache/camel/core/main/camel-core-2.19.0.jar\n-/org/apache/camel/core/xml/main/camel-core-xml-2.19.0.jar\n+/org/apache/camel/component/zookeeper/main/camel-zookeeper-2.19.1.jar\n+/org/apache/camel/core/main/camel-core-2.19.1.jar\n+/org/apache/camel/core/xml/main/camel-core-xml-2.19.1.jar\n/org/apache/camel/script/groovy/main/groovy-all-2.4.11.jar\n/org/apache/camel/script/jruby/main/jruby-complete-1.7.18.jar\n/org/apache/camel/script/jruby/main/scriptengines-jruby-1.1.1.jar\n/org/apache/camel/script/rhino/main/js-1.7R2.jar\n/org/apache/camel/script/rhino/main/livetribe-jsr223-2.0.3.jar\n/org/apache/camel/script/rhino/main/scriptengines-javascript-1.1.1.jar\n-/org/apache/camel/spring/main/camel-spring-2.19.0.jar\n+/org/apache/camel/spring/main/camel-spring-2.19.1.jar\n/org/apache/commons/compress/main/commons-compress-1.13.jar\n/org/apache/commons/configuration/main/commons-configuration-1.8.jar\n/org/apache/commons/csv/main/commons-csv-1.4.jar\n"
},
{
"change_type": "MODIFY",
"old_path": "pom.xml",
"new_path": "pom.xml",
"diff": "<properties>\n<!-- Camel versions -->\n- <version.apache.camel>2.19.0</version.apache.camel>\n+ <version.apache.camel>2.19.1</version.apache.camel>\n<version.apache.lucene>5.5.2</version.apache.lucene>\n- <version.asynchttpclient>2.0.32</version.asynchttpclient>\n<!-- [#1702] Upgrade to netty-4.1.9 -->\n<version.io.netty40>4.0.45.Final</version.io.netty40>\n<version>${version.maven.aether.provider}</version>\n</dependency>\n- <!-- Async HTTP Client -->\n- <dependency>\n- <groupId>org.asynchttpclient</groupId>\n- <artifactId>async-http-client</artifactId>\n- <version>${version.asynchttpclient}</version>\n- </dependency>\n-\n<!-- Arquillian -->\n<dependency>\n<groupId>org.jboss.arquillian</groupId>\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #1803] Upgrade to camel-2.19.1
|
734,367 |
17.09.2017 21:50:14
| -7,200 |
c957444b7beeb9d6f2b316fe85661e4f59444c68
|
[resolves ClassNotFoundException when turning on metrics gathering
|
[
{
"change_type": "MODIFY",
"old_path": "feature/pack/etc/smartics/camel-modules.xml",
"new_path": "feature/pack/etc/smartics/camel-modules.xml",
"diff": "<include path=\"sun/misc\" />\n</imports>\n</module>\n+ <module name=\"com.fasterxml.jackson.core.jackson-core\" />\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/pack/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/metrics/main/module.xml",
"new_path": "feature/pack/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/metrics/main/module.xml",
"diff": "<include path=\"sun/misc\" />\n</imports>\n</module>\n+ <module name=\"com.fasterxml.jackson.core.jackson-core\" />\n<module name=\"com.fasterxml.jackson.core.jackson-databind\" />\n<module name=\"javax.xml.bind.api\" />\n<module name=\"org.apache.camel.core\" />\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[resolves #2078] ClassNotFoundException when turning on metrics gathering
|
734,364 |
26.09.2018 18:02:40
| -19,080 |
c71e3d735e17b2dbee28f645691bf447dc1f8a53
|
Add fuse conditionals to documentation
resolves
|
[
{
"change_type": "MODIFY",
"old_path": "docs/guide/javaee/jaxrs.adoc",
"new_path": "docs/guide/javaee/jaxrs.adoc",
"diff": "@@ -116,6 +116,25 @@ By setting the binding mode, Camel can marshal and unmarshal JSON data either by\nRefer to the link:index.html#_jax_rs_security[JAX-RS security section].\n+ifndef::red-hat-fuse[]\n+\n#### Code examples on GitHub\nAn example https://github.com/wildfly-extras/wildfly-camel-examples/tree/master/camel-cxf-jaxrs[Camel CXF application,window=_blank] is available on GitHub.\n+\n+endif::[]\n+\n+ifdef::red-hat-fuse[]\n+\n+#### Quickstart examples in Fuse on EAP\n+\n+A quickstart example is available in your Fuse on EAP installation at `quickstarts/camel/camel-cxf-jaxrs` directory.\n+\n+endif::[]\n+\n+\n+\n+\n+\n+\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/javaee/jaxws.adoc",
"new_path": "docs/guide/javaee/jaxws.adoc",
"diff": "@@ -93,8 +93,21 @@ String result = producer.requestBody(\"direct:start\", serviceParams, String.class\nRefer to the https://github.com/wildfly-extras/wildfly-camel-examples/tree/master/camel-cxf-jaxws-secure[JAX-WS security section].\n+ifndef::red-hat-fuse[]\n+\n#### Code examples on GitHub\nExample JAX-WS applications are available on GitHub.\n* https://github.com/wildfly-extras/wildfly-camel-examples/tree/master/camel-cxf-jaxws[Camel CXF application,window=_blank]\n+\n+endif::[]\n+\n+ifdef::red-hat-fuse[]\n+\n+#### Quickstart examples in Fuse on EAP\n+\n+A quickstart example is available in your Fuse on EAP installation at `quickstarts/camel/camel-cxf-jaxws` directory.\n+\n+endif::red-hat-fuse[]\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "docs/guide/javaee/jms.adoc",
"new_path": "docs/guide/javaee/jms.adoc",
"diff": "@@ -216,7 +216,19 @@ private Context configureInitialContext() throws NamingException {\nRefer to the link:index.html#_jms_security[JMS security section].\n+ifndef::red-hat-fuse[]\n#### Code examples on GitHub\nAn example https://github.com/wildfly-extras/wildfly-camel-examples/tree/master/camel-jms[camel-jms application,window=_blank] is available on GitHub.\n+\n+endif::[]\n+\n+ifdef::red-hat-fuse[]\n+\n+#### Quickstart examples in Fuse on EAP\n+\n+A quickstart example is available in your Fuse on EAP installation at `quickstarts/camel/camel-jms` directory.\n+\n+endif::red-hat-fuse[]\n+\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[FUSEDOC-2397] Add fuse conditionals to documentation
resolves #2673
|
734,357 |
31.12.2018 07:21:25
| -19,080 |
93e0629cfbad360177f4e64948367678e9138cde
|
[ENTESB-9964]Camel FTPS throws java.lang.NoClassDefFoundError: javax/net/ssl/SSLException
[ENTESB-9964]Camel FTPS throws java.lang.NoClassDefFoundError: javax/net/ssl/SSLException
[ENTESB-9964]Camel FTPS throws java.lang.NoClassDefFoundError: javax/net/ssl/SSLException
|
[
{
"change_type": "MODIFY",
"old_path": "feature/modules/etc/smartics/camel-modules.xml",
"new_path": "feature/modules/etc/smartics/camel-modules.xml",
"diff": "<include module=\"org.springframework.boot\" />\n</apply-to-dependencies>\n<dependencies>\n+ <module name=\"javax.api\"/>\n<module name=\"org.slf4j\"/>\n</dependencies>\n</module>\n"
},
{
"change_type": "MODIFY",
"old_path": "feature/modules/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/ftp/main/module.xml",
"new_path": "feature/modules/src/main/resources/modules/system/layers/fuse/org/apache/camel/component/ftp/main/module.xml",
"diff": "<artifact name=\"${org.apache.camel:camel-ftp}\" />\n</resources>\n<dependencies>\n+ <module name=\"javax.api\" />\n<module name=\"org.slf4j\" />\n<module name=\"com.jcraft.jsch\" />\n<module name=\"javax.xml.bind.api\" />\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
[ENTESB-9964]Camel FTPS throws java.lang.NoClassDefFoundError: javax/net/ssl/SSLException
[ENTESB-9964]Camel FTPS throws java.lang.NoClassDefFoundError: javax/net/ssl/SSLException
[ENTESB-9964]Camel FTPS throws java.lang.NoClassDefFoundError: javax/net/ssl/SSLException
|
734,363 |
26.07.2019 15:23:02
| -19,080 |
b9d1749a94005223f9e64557bc2ccb74fccecb23
|
Added Maven repo link for downstream documentation.
|
[
{
"change_type": "MODIFY",
"old_path": "docs/guide/components/camel-activemq.adoc",
"new_path": "docs/guide/components/camel-activemq.adoc",
"diff": "@@ -6,7 +6,12 @@ The component can be configured to work with an embedded or external broker. For\n#### {wildfly} ActiveMQ resource adapter configuration\n+ifndef::red-hat-fuse[]\nDownload the https://repository.apache.org/content/repositories/releases/org/apache/activemq/activemq-rar/5.11.1/activemq-rar-5.11.1.rar[ActiveMQ resource adapter rar file,window=_blank]. The following steps outline how to configure the ActiveMQ resource adapter.\n+endif::[]\n+ifdef::red-hat-fuse[]\n+Download the https://maven.repository.redhat.com/ga/org/apache/activemq/activemq-rar/5.11.0.redhat-630396/activemq-rar-5.11.0.redhat-630396.rar[ActiveMQ resource adapter rar file,window=_blank]. The following steps outline how to configure the ActiveMQ resource adapter.\n+endif::[]\n. Stop your {wildfly} instance.\n"
}
] |
Java
|
Apache License 2.0
|
wildfly-extras/wildfly-camel
|
Added Maven repo link for downstream documentation.
|
594,239 |
08.11.2017 10:48:56
| -28,800 |
b80b793cbcd57b0f58d668fd19d7e9c42e661605
|
Add Tizen TV samples(FlexContainerSample)
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "TV/FlexContainerSample/FlexContainerSample/src/FlexContainerSample.cs",
"diff": "+/*\n+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ */\n+\n+using System;\n+using Tizen;\n+using System.Runtime.InteropServices;\n+using Tizen.NUI;\n+using Tizen.NUI.UIComponents;\n+using Tizen.NUI.BaseComponents;\n+using Tizen.NUI.Constants;\n+\n+namespace FlexContainerSample\n+{\n+ /// <summary>\n+ /// This example demonstrates a proof of concept for FlexContainer UI control.\n+ /// The flexbox properties can be changed by pressing different buttons in the\n+ /// toolbar.\n+ /// </summary>\n+ class FlexContainerSample : NUIApplication\n+ {\n+ private FlexContainer flexContainer;\n+ private const int NUM_FLEX_ITEMS = 8;\n+ private TableView tableView;\n+\n+ /// <summary>\n+ /// The constructor with null\n+ /// </summary>\n+ public FlexContainerSample() : base()\n+ {\n+ }\n+\n+ /// <summary>\n+ /// Overrides this method if want to handle behaviour.\n+ /// </summary>\n+ protected override void OnCreate()\n+ {\n+ base.OnCreate();\n+ Initialize();\n+ }\n+\n+ /// <summary>\n+ /// Flex Container Sample Application initialisation.\n+ /// </summary>\n+ public void Initialize()\n+ {\n+ Window.Instance.BackgroundColor = new Color(0.8f, 0.8f, 0.8f, 1.0f);\n+\n+ // Create FlexContainer\n+ flexContainer = new FlexContainer();\n+ flexContainer.PositionUsesPivotPoint = true;\n+ flexContainer.PivotPoint = PivotPoint.TopLeft;\n+ flexContainer.ParentOrigin = ParentOrigin.TopLeft;\n+ flexContainer.Position = new Position(220, 160, 0);\n+ flexContainer.SizeWidth = 700;\n+ flexContainer.SizeHeight = 700;\n+ flexContainer.BackgroundColor = Color.Yellow;\n+ flexContainer.FlexDirection = FlexContainer.FlexDirectionType.Column;\n+ Window.Instance.GetDefaultLayer().Add(flexContainer);\n+\n+ // Create flex items and add them to the container\n+ for (int i = 0; i < NUM_FLEX_ITEMS; i++)\n+ {\n+ TextLabel flexItem = new TextLabel();\n+ flexItem.PositionUsesPivotPoint = true;\n+ flexItem.PivotPoint = PivotPoint.TopLeft;\n+ flexItem.ParentOrigin = ParentOrigin.TopLeft;\n+ // Set different background colour to help to identify different items\n+ flexItem.BackgroundColor = new Vector4(((float)i) / NUM_FLEX_ITEMS, ((float)(NUM_FLEX_ITEMS - i)) / NUM_FLEX_ITEMS, 1.0f, 1.0f);\n+ flexItem.Text = i + \"\";\n+ flexItem.Name = i + \"\";\n+ flexItem.HorizontalAlignment = HorizontalAlignment.Center;\n+ flexItem.VerticalAlignment = VerticalAlignment.Center;\n+ // Set a fixed size to the items so that we can wrap the line and test these\n+ // flex properties that only work when there are multiple lines in the layout\n+ flexItem.WidthResizePolicy = ResizePolicyType.Fixed;\n+ flexItem.HeightResizePolicy = ResizePolicyType.Fixed;\n+ // Make sure there are still extra space in the line after wrapping\n+ flexItem.SizeWidth = flexContainer.SizeWidth / NUM_FLEX_ITEMS * 1.25f;\n+ flexItem.SizeHeight = flexContainer.SizeHeight / NUM_FLEX_ITEMS * 1.25f;\n+ flexContainer.Add(flexItem);\n+ }\n+\n+ // Create the tableView which is the parent of the Pushbuttons\n+ // which can change the flexcontainer's properties\n+ tableView = new TableView(6, 1);\n+ tableView.SizeWidth = 500;\n+ tableView.SizeHeight = 400;\n+ tableView.CellPadding = new Vector2(5, 5);\n+ tableView.PositionUsesPivotPoint = true;\n+ tableView.PivotPoint = PivotPoint.BottomRight;\n+ tableView.ParentOrigin = ParentOrigin.BottomRight;\n+ tableView.Position = new Position(-100,-100, 0);\n+ Window.Instance.GetDefaultLayer().Add(tableView);\n+\n+ // Create the pushbutton which can change the property of ContentDirection.\n+ // The default value of flexcontainer's ContentDirection\n+ // is FlexContainer.ContentDirectionType.Inherit.\n+ PushButton button0 = new PushButton();\n+ button0.Name = \"ContentDirection\";\n+ button0.Label = CreateText(\"ContentDirection : Inherit\");\n+ button0.SizeWidth = tableView.SizeWidth;\n+ button0.Focusable = true;\n+ button0.Clicked += ButtonClick;\n+ tableView.AddChild(button0, new TableView.CellPosition(0, 0));\n+\n+ // Create the pushbutton which can change the property of FlexDirection.\n+ // The current value of flexcontainer's FlexDirection\n+ // is FlexContainer.ContentDirectionType.Column\n+ PushButton button1 = new PushButton();\n+ button1.Name = \"FlexDirection\";\n+ button1.Label = CreateText(\"FlexDirection : Column\");\n+ button1.SizeWidth = tableView.SizeWidth;\n+ button1.Clicked += ButtonClick;\n+ tableView.AddChild(button1, new TableView.CellPosition(1, 0));\n+\n+ // Create the pushbutton which can change the property of FlexWrap\n+ // The current value of flexcontainer's FlexWrap\n+ // is FlexContainer.WrapType.NoWrap\n+ PushButton button2 = new PushButton();\n+ button2.Name = \"FlexWrap\";\n+ button2.Label = CreateText(\"FlexWrap : NoWrap\");\n+ button2.SizeWidth = tableView.SizeWidth;\n+ button2.Clicked += ButtonClick;\n+ tableView.AddChild(button2, new TableView.CellPosition(2, 0));\n+\n+ // Create the pushbutton which can change the property of JustifyContent\n+ // The current value of flexcontainer's JustifyContent\n+ // is FlexContainer.Justification.JustifyFlexStart\n+ PushButton button3 = new PushButton();\n+ button3.Name = \"JustifyContent\";\n+ button3.Label = CreateText(\"JustifyContent : JustifyFlexStart\");\n+ button3.SizeWidth = tableView.SizeWidth;\n+ button3.Clicked += ButtonClick;\n+ tableView.AddChild(button3, new TableView.CellPosition(3, 0));\n+\n+ // Create the pushbutton which can change the property of AlignItems\n+ // The current value of flexcontainer's AlignItems\n+ // is FlexContainer.Alignment.AlignStretch\n+ PushButton button4 = new PushButton();\n+ button4.Name = \"AlignItems\";\n+ button4.Label = CreateText(\"AlignItems : AlignStretch\");\n+ button4.SizeWidth = tableView.SizeWidth;\n+ button4.Clicked += ButtonClick;\n+ tableView.AddChild(button4, new TableView.CellPosition(4, 0));\n+\n+ // Create the pushbutton which can change the property of AlignContent\n+ // The current value of flexcontainer's AlignContent\n+ // is FlexContainer.Alignment.AlignFlexStart\n+ PushButton button5 = new PushButton();\n+ button5.Name = \"AlignContent\";\n+ button5.Label = CreateText(\"AlignContent : AlignFlexStart\");\n+ button5.SizeWidth = tableView.SizeWidth;\n+ button5.Clicked += ButtonClick;\n+ tableView.AddChild(button5, new TableView.CellPosition(5, 0));\n+\n+ FocusManager.Instance.SetCurrentFocusView(button0);\n+ Window.Instance.KeyEvent += AppBack;\n+ }\n+\n+ /// <summary>\n+ /// The event will be triggered when pushbutton clicked\n+ /// </summary>\n+ /// <param name=\"source\">The clicked PushButton.</param>\n+ /// <param name=\"e\">event</param>\n+ /// <returns>the consume flag</returns>\n+ private bool ButtonClick(object source, EventArgs e)\n+ {\n+ PushButton button = source as PushButton;\n+\n+ // Judge the button can change flexContainer's property of ContentDirection.\n+ // If true, change the value of ContentDirection circularly.\n+ // At the same time, changed the pushbutton's LabelText to the current ContentDirection's value\n+ // The property change the primary direction in which content is ordered\n+ //\n+ // LTR : From left to right\n+ // RTL : From right to left\n+ // Inherit : Inherits the same direction from the parent\n+ if (button.Name == \"ContentDirection\")\n+ {\n+ if (flexContainer.ContentDirection == FlexContainer.ContentDirectionType.Inherit)\n+ {\n+ flexContainer.ContentDirection = FlexContainer.ContentDirectionType.LTR;\n+ button.Label = CreateText(\"ContentDirection : LTR\");\n+ }\n+ else if (flexContainer.ContentDirection == FlexContainer.ContentDirectionType.LTR)\n+ {\n+ flexContainer.ContentDirection = FlexContainer.ContentDirectionType.RTL;\n+ button.Label = CreateText(\"ContentDirection : RTL\");\n+ }\n+ else\n+ {\n+ flexContainer.ContentDirection = FlexContainer.ContentDirectionType.Inherit;\n+ button.Label = CreateText(\"ContentDirection : Inherit\");\n+ }\n+ }\n+\n+ // Judge the button can change flexContainer's property of FlexDirection.\n+ // If true, change the value of FlexDirection circularly.\n+ // At the same time, changed the pushbutton's LabelText to the current FlexDirection's value\n+ // The property change the direction of the main-axis which determines the direction that flex items are laid out\n+ //\n+ // ColumnReverse : The flexible items are displayed vertically as a column, but in reverse order\n+ // Row : The flexible items are displayed horizontally as a row\n+ // RowReverse : The flexible items are displayed horizontally as a row, but in reverse order\n+ // Column : The flexible items are displayed vertically as a column\n+ else if (button.Name == \"FlexDirection\")\n+ {\n+ if (flexContainer.FlexDirection == FlexContainer.FlexDirectionType.Column)\n+ {\n+ flexContainer.FlexDirection = FlexContainer.FlexDirectionType.ColumnReverse;\n+ button.Label = CreateText(\"FlexDirection : ColumnReverse\");\n+ }\n+ else if (flexContainer.FlexDirection == FlexContainer.FlexDirectionType.ColumnReverse)\n+ {\n+ flexContainer.FlexDirection = FlexContainer.FlexDirectionType.Row;\n+ button.Label = CreateText(\"FlexDirection : Row\");\n+ }\n+ else if (flexContainer.FlexDirection == FlexContainer.FlexDirectionType.Row)\n+ {\n+ flexContainer.FlexDirection = FlexContainer.FlexDirectionType.RowReverse;\n+ button.Label = CreateText(\"FlexDirection : RowReverse\");\n+ }\n+ else\n+ {\n+ flexContainer.FlexDirection = FlexContainer.FlexDirectionType.Column;\n+ button.Label = CreateText(\"FlexDirection : Column\");\n+ }\n+ }\n+\n+ // Judge the button can change flexContainer's property of FlexWrap.\n+ // If true, change the value of FlexWrap circularly.\n+ // At the same time, changed the pushbutton's LabelText to the current FlexWrap's value\n+ // The property show whether the flex items should wrap or not if there is no enough room for them on one flex line\n+ // Wrap : Flex items laid out in single line (shrunk to fit the flex container along the main axis)\n+ // NoWrap : Flex items laid out in multiple lines if needed\n+ else if (button.Name == \"FlexWrap\")\n+ {\n+ if (flexContainer.FlexWrap == FlexContainer.WrapType.NoWrap)\n+ {\n+ flexContainer.FlexWrap = FlexContainer.WrapType.Wrap;\n+ button.Label = CreateText(\"FlexWrap : Wrap\");\n+ }\n+ else\n+ {\n+ flexContainer.FlexWrap = FlexContainer.WrapType.NoWrap;\n+ button.Label = CreateText(\"FlexWrap : NoWrap\");\n+ }\n+ }\n+\n+ // Judge the button can change flexContainer's property of JustifyContent.\n+ // If true, change the value of JustifyContent circularly.\n+ // At the same time, changed the pushbutton's LabelText to the current JustifyContent's value\n+ // The property show whether the flex items should wrap or not if there is no enough room for them on one flex line\n+ //\n+ // JustifyFlexEnd : FItems are positioned at the end of the container\n+ // JustifyFlexStart : Items are positioned at the beginning of the container\n+ // JustifySpaceAround : Items are positioned with equal space before, between, and after the lines\n+ // JustifySpaceBetween : Items are positioned with equal space between the lines\n+ // JustifyCenter : Items are positioned at the center of the container\n+ else if (button.Name == \"JustifyContent\")\n+ {\n+ if (flexContainer.JustifyContent == FlexContainer.Justification.JustifyCenter)\n+ {\n+ flexContainer.JustifyContent = FlexContainer.Justification.JustifyFlexEnd;\n+ button.Label = CreateText(\"JustifyContent : JustifyFlexEnd\");\n+ }\n+ else if (flexContainer.JustifyContent == FlexContainer.Justification.JustifyFlexEnd)\n+ {\n+ flexContainer.JustifyContent = FlexContainer.Justification.JustifyFlexStart;\n+ button.Label = CreateText(\"JustifyContent : JustifyFlexStart\");\n+ }\n+ else if (flexContainer.JustifyContent == FlexContainer.Justification.JustifyFlexStart)\n+ {\n+ flexContainer.JustifyContent = FlexContainer.Justification.JustifySpaceAround;\n+ button.Label = CreateText(\"JustifyContent : JustifySpaceAround\");\n+ }\n+ else if (flexContainer.JustifyContent == FlexContainer.Justification.JustifySpaceAround)\n+ {\n+ flexContainer.JustifyContent = FlexContainer.Justification.JustifySpaceBetween;\n+ button.Label = CreateText(\"JustifyContent : JustifySpaceBetween\");\n+ }\n+ else\n+ {\n+ flexContainer.JustifyContent = FlexContainer.Justification.JustifyCenter;\n+ button.Label = CreateText(\"JustifyContent : JustifyCenter\");\n+ }\n+ }\n+\n+ // Judge the button can change flexContainer's property of AlignItems.\n+ // If true, change the value of AlignItems circularly.\n+ // At the same time, changed the pushbutton's LabelText to the current AlignItems's value\n+ // The property show the alignment of flex items when the items do not use all available space on the cross-axis\n+ //\n+ // AlignCenter : At the center of the container\n+ // AlignFlexEnd : At the end of the container\n+ // AlignFlexStart : At the beginning of the container\n+ // AlignStretch : Stretch to fit the container\n+ // AlignAuto : Inherits the same alignment from the parent\n+ else if (button.Name == \"AlignItems\")\n+ {\n+ if (flexContainer.AlignItems == FlexContainer.Alignment.AlignAuto)\n+ {\n+ flexContainer.AlignItems = FlexContainer.Alignment.AlignCenter;\n+ button.Label = CreateText(\"AlignItems : AlignCenter\");\n+ }\n+ else if (flexContainer.AlignItems == FlexContainer.Alignment.AlignCenter)\n+ {\n+ flexContainer.AlignItems = FlexContainer.Alignment.AlignFlexEnd;\n+ button.Label = CreateText(\"AlignItems : AlignFlexEnd\");\n+ }\n+ else if (flexContainer.AlignItems == FlexContainer.Alignment.AlignFlexEnd)\n+ {\n+ flexContainer.AlignItems = FlexContainer.Alignment.AlignFlexStart;\n+ button.Label = CreateText(\"AlignItems : AlignFlexStart\");\n+ }\n+ else if (flexContainer.AlignItems == FlexContainer.Alignment.AlignFlexStart)\n+ {\n+ flexContainer.AlignItems = FlexContainer.Alignment.AlignStretch;\n+ button.Label = CreateText(\"AlignItems : AlignStretch\");\n+ }\n+ else\n+ {\n+ flexContainer.AlignItems = FlexContainer.Alignment.AlignAuto;\n+ button.Label = CreateText(\"AlignItems : AlignAuto\");\n+ }\n+ }\n+\n+ // Judge the button can change flexContainer's property of AlignItems.\n+ // If true, change the value of AlignItems circularly.\n+ // At the same time, changed the pushbutton's LabelText to the current AlignItems's value\n+ // The property is similar to \"alignItems\", but it aligns flex lines,\n+ // so only works when there are multiple lines\n+ else if (button.Name == \"AlignContent\")\n+ {\n+ if (flexContainer.AlignContent == FlexContainer.Alignment.AlignAuto)\n+ {\n+ flexContainer.AlignContent = FlexContainer.Alignment.AlignCenter;\n+ button.Label = CreateText(\"AlignContent : AlignCenter\");\n+ }\n+ else if (flexContainer.AlignContent == FlexContainer.Alignment.AlignCenter)\n+ {\n+ flexContainer.AlignContent = FlexContainer.Alignment.AlignFlexEnd;\n+ button.Label = CreateText(\"AlignContent : AlignFlexEnd\");\n+ }\n+ else if (flexContainer.AlignContent == FlexContainer.Alignment.AlignFlexEnd)\n+ {\n+ flexContainer.AlignContent = FlexContainer.Alignment.AlignFlexStart;\n+ button.Label = CreateText(\"AlignContent : AlignFlexStart\");\n+ }\n+ else if (flexContainer.AlignContent == FlexContainer.Alignment.AlignFlexStart)\n+ {\n+ flexContainer.AlignContent = FlexContainer.Alignment.AlignStretch;\n+ button.Label = CreateText(\"AlignContent : AlignStretch\");\n+ }\n+ else\n+ {\n+ flexContainer.AlignContent = FlexContainer.Alignment.AlignAuto;\n+ button.Label = CreateText(\"AlignContent : AlignAuto\");\n+ }\n+ }\n+\n+ return true;\n+ }\n+\n+ /// <summary>\n+ /// Creates propertyMap used t set button.Label\n+ /// </summary>\n+ /// <param name=\"text\">text</param>\n+ ///<returns>The created propertyMap</returns>\n+ private PropertyMap CreateText(string text)\n+ {\n+ PropertyMap textVisual = new PropertyMap();\n+ textVisual.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text));\n+ textVisual.Add(TextVisualProperty.Text, new PropertyValue(text));\n+ textVisual.Add(TextVisualProperty.TextColor, new PropertyValue(Color.Black));\n+ textVisual.Add(TextVisualProperty.PointSize, new PropertyValue(7));\n+ textVisual.Add(TextVisualProperty.HorizontalAlignment, new PropertyValue(\"CENTER\"));\n+ textVisual.Add(TextVisualProperty.VerticalAlignment, new PropertyValue(\"CENTER\"));\n+ return textVisual;\n+ }\n+\n+ /// <summary>\n+ /// This Application will be exited when back key entered.\n+ /// </summary>\n+ /// <param name=\"source\">Window.Instance</param>\n+ /// <param name=\"e\">event</param>\n+ private void AppBack(object source, Window.KeyEventArgs e)\n+ {\n+ if (e.Key.State == Key.StateType.Down)\n+ {\n+ if (e.Key.KeyPressedName == \"XF86Back\")\n+ {\n+ this.Exit();\n+ }\n+ }\n+ }\n+ }\n+}\n\\ No newline at end of file\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "TV/FlexContainerSample/FlexContainerSample/src/Program.cs",
"diff": "+/*\n+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ */\n+\n+using System;\n+using Tizen;\n+\n+namespace FlexContainerSample\n+{\n+ public class Program\n+ {\n+ /// <summary>\n+ /// The enter point of FlexContainerSample.\n+ /// </summary>\n+ /// <param name=\"args\">args</param>\n+ [STAThread]\n+ static void Main(string[] args)\n+ {\n+ Log.Info(\"NUI\", \"========== Hello, FlexContainerSample ==========\");\n+ new FlexContainerSample().Run(args);\n+ }\n+ }\n+}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Add Tizen TV samples(FlexContainerSample)
|
594,239 |
08.11.2017 10:50:33
| -28,800 |
bfb41e65fa137de19ab3916417d016615b8b496d
|
Add Tizen TV samples(TextSample)
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "TV/TextSample/TextSample/src/Program.cs",
"diff": "+/*\n+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n+ *\n+ * Licensed under the Apache License, Version 2.0 (the \"License\");\n+ * you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ *\n+ */\n+\n+using System;\n+using Tizen;\n+\n+namespace TextSample\n+{\n+ public class Program\n+ {\n+ /// <summary>\n+ /// The enter point of TextSample.\n+ /// </summary>\n+ /// <param name=\"args\">args</param>\n+ static void Main(string[] args)\n+ {\n+ Log.Info(\"Tag\", \"========== Hello, TextSample ==========\");\n+ new TextSample().Run(args);\n+ }\n+ }\n+}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Add Tizen TV samples(TextSample)
|
594,239 |
21.12.2017 16:29:33
| -28,800 |
b1112aae37ed64c4ae467f75c5142169079786be
|
Delete FlexContainerSample.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FlexContainerSample/FlexContainerSample/src/FlexContainerSample.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using System;\n-using Tizen;\n-using System.Runtime.InteropServices;\n-using Tizen.NUI;\n-using Tizen.NUI.UIComponents;\n-using Tizen.NUI.BaseComponents;\n-using Tizen.NUI.Constants;\n-\n-namespace FlexContainerSample\n-{\n- /// <summary>\n- /// This example demonstrates a proof of concept for FlexContainer UI control.\n- /// The flexbox properties can be changed by pressing different buttons in the\n- /// toolbar.\n- /// </summary>\n- class FlexContainerSample : NUIApplication\n- {\n- private FlexContainer flexContainer;\n- private const int NUM_FLEX_ITEMS = 8;\n- private TableView tableView;\n-\n- /// <summary>\n- /// The constructor with null\n- /// </summary>\n- public FlexContainerSample() : base()\n- {\n- }\n-\n- /// <summary>\n- /// Overrides this method if want to handle behaviour.\n- /// </summary>\n- protected override void OnCreate()\n- {\n- base.OnCreate();\n- Initialize();\n- }\n-\n- /// <summary>\n- /// Flex Container Sample Application initialisation.\n- /// </summary>\n- public void Initialize()\n- {\n- Window.Instance.BackgroundColor = new Color(0.8f, 0.8f, 0.8f, 1.0f);\n-\n- // Create FlexContainer\n- flexContainer = new FlexContainer();\n- flexContainer.PositionUsesPivotPoint = true;\n- flexContainer.PivotPoint = PivotPoint.TopLeft;\n- flexContainer.ParentOrigin = ParentOrigin.TopLeft;\n- flexContainer.Position = new Position(220, 160, 0);\n- flexContainer.SizeWidth = 700;\n- flexContainer.SizeHeight = 700;\n- flexContainer.BackgroundColor = Color.Yellow;\n- flexContainer.FlexDirection = FlexContainer.FlexDirectionType.Column;\n- Window.Instance.GetDefaultLayer().Add(flexContainer);\n-\n- // Create flex items and add them to the container\n- for (int i = 0; i < NUM_FLEX_ITEMS; i++)\n- {\n- TextLabel flexItem = new TextLabel();\n- flexItem.PositionUsesPivotPoint = true;\n- flexItem.PivotPoint = PivotPoint.TopLeft;\n- flexItem.ParentOrigin = ParentOrigin.TopLeft;\n- // Set different background colour to help to identify different items\n- flexItem.BackgroundColor = new Vector4(((float)i) / NUM_FLEX_ITEMS, ((float)(NUM_FLEX_ITEMS - i)) / NUM_FLEX_ITEMS, 1.0f, 1.0f);\n- flexItem.Text = i + \"\";\n- flexItem.Name = i + \"\";\n- flexItem.HorizontalAlignment = HorizontalAlignment.Center;\n- flexItem.VerticalAlignment = VerticalAlignment.Center;\n- // Set a fixed size to the items so that we can wrap the line and test these\n- // flex properties that only work when there are multiple lines in the layout\n- flexItem.WidthResizePolicy = ResizePolicyType.Fixed;\n- flexItem.HeightResizePolicy = ResizePolicyType.Fixed;\n- // Make sure there are still extra space in the line after wrapping\n- flexItem.SizeWidth = flexContainer.SizeWidth / NUM_FLEX_ITEMS * 1.25f;\n- flexItem.SizeHeight = flexContainer.SizeHeight / NUM_FLEX_ITEMS * 1.25f;\n- flexContainer.Add(flexItem);\n- }\n-\n- // Create the tableView which is the parent of the Pushbuttons\n- // which can change the flexcontainer's properties\n- tableView = new TableView(6, 1);\n- tableView.SizeWidth = 500;\n- tableView.SizeHeight = 400;\n- tableView.CellPadding = new Vector2(5, 5);\n- tableView.PositionUsesPivotPoint = true;\n- tableView.PivotPoint = PivotPoint.BottomRight;\n- tableView.ParentOrigin = ParentOrigin.BottomRight;\n- tableView.Position = new Position(-100,-100, 0);\n- Window.Instance.GetDefaultLayer().Add(tableView);\n-\n- // Create the pushbutton which can change the property of ContentDirection.\n- // The default value of flexcontainer's ContentDirection\n- // is FlexContainer.ContentDirectionType.Inherit.\n- PushButton button0 = new PushButton();\n- button0.Name = \"ContentDirection\";\n- button0.Label = CreateText(\"ContentDirection : Inherit\");\n- button0.SizeWidth = tableView.SizeWidth;\n- button0.Focusable = true;\n- button0.Clicked += ButtonClick;\n- tableView.AddChild(button0, new TableView.CellPosition(0, 0));\n-\n- // Create the pushbutton which can change the property of FlexDirection.\n- // The current value of flexcontainer's FlexDirection\n- // is FlexContainer.ContentDirectionType.Column\n- PushButton button1 = new PushButton();\n- button1.Name = \"FlexDirection\";\n- button1.Label = CreateText(\"FlexDirection : Column\");\n- button1.SizeWidth = tableView.SizeWidth;\n- button1.Clicked += ButtonClick;\n- tableView.AddChild(button1, new TableView.CellPosition(1, 0));\n-\n- // Create the pushbutton which can change the property of FlexWrap\n- // The current value of flexcontainer's FlexWrap\n- // is FlexContainer.WrapType.NoWrap\n- PushButton button2 = new PushButton();\n- button2.Name = \"FlexWrap\";\n- button2.Label = CreateText(\"FlexWrap : NoWrap\");\n- button2.SizeWidth = tableView.SizeWidth;\n- button2.Clicked += ButtonClick;\n- tableView.AddChild(button2, new TableView.CellPosition(2, 0));\n-\n- // Create the pushbutton which can change the property of JustifyContent\n- // The current value of flexcontainer's JustifyContent\n- // is FlexContainer.Justification.JustifyFlexStart\n- PushButton button3 = new PushButton();\n- button3.Name = \"JustifyContent\";\n- button3.Label = CreateText(\"JustifyContent : JustifyFlexStart\");\n- button3.SizeWidth = tableView.SizeWidth;\n- button3.Clicked += ButtonClick;\n- tableView.AddChild(button3, new TableView.CellPosition(3, 0));\n-\n- // Create the pushbutton which can change the property of AlignItems\n- // The current value of flexcontainer's AlignItems\n- // is FlexContainer.Alignment.AlignStretch\n- PushButton button4 = new PushButton();\n- button4.Name = \"AlignItems\";\n- button4.Label = CreateText(\"AlignItems : AlignStretch\");\n- button4.SizeWidth = tableView.SizeWidth;\n- button4.Clicked += ButtonClick;\n- tableView.AddChild(button4, new TableView.CellPosition(4, 0));\n-\n- // Create the pushbutton which can change the property of AlignContent\n- // The current value of flexcontainer's AlignContent\n- // is FlexContainer.Alignment.AlignFlexStart\n- PushButton button5 = new PushButton();\n- button5.Name = \"AlignContent\";\n- button5.Label = CreateText(\"AlignContent : AlignFlexStart\");\n- button5.SizeWidth = tableView.SizeWidth;\n- button5.Clicked += ButtonClick;\n- tableView.AddChild(button5, new TableView.CellPosition(5, 0));\n-\n- FocusManager.Instance.SetCurrentFocusView(button0);\n- Window.Instance.KeyEvent += AppBack;\n- }\n-\n- /// <summary>\n- /// The event will be triggered when pushbutton clicked\n- /// </summary>\n- /// <param name=\"source\">The clicked PushButton.</param>\n- /// <param name=\"e\">event</param>\n- /// <returns>the consume flag</returns>\n- private bool ButtonClick(object source, EventArgs e)\n- {\n- PushButton button = source as PushButton;\n-\n- // Judge the button can change flexContainer's property of ContentDirection.\n- // If true, change the value of ContentDirection circularly.\n- // At the same time, changed the pushbutton's LabelText to the current ContentDirection's value\n- // The property change the primary direction in which content is ordered\n- //\n- // LTR : From left to right\n- // RTL : From right to left\n- // Inherit : Inherits the same direction from the parent\n- if (button.Name == \"ContentDirection\")\n- {\n- if (flexContainer.ContentDirection == FlexContainer.ContentDirectionType.Inherit)\n- {\n- flexContainer.ContentDirection = FlexContainer.ContentDirectionType.LTR;\n- button.Label = CreateText(\"ContentDirection : LTR\");\n- }\n- else if (flexContainer.ContentDirection == FlexContainer.ContentDirectionType.LTR)\n- {\n- flexContainer.ContentDirection = FlexContainer.ContentDirectionType.RTL;\n- button.Label = CreateText(\"ContentDirection : RTL\");\n- }\n- else\n- {\n- flexContainer.ContentDirection = FlexContainer.ContentDirectionType.Inherit;\n- button.Label = CreateText(\"ContentDirection : Inherit\");\n- }\n- }\n-\n- // Judge the button can change flexContainer's property of FlexDirection.\n- // If true, change the value of FlexDirection circularly.\n- // At the same time, changed the pushbutton's LabelText to the current FlexDirection's value\n- // The property change the direction of the main-axis which determines the direction that flex items are laid out\n- //\n- // ColumnReverse : The flexible items are displayed vertically as a column, but in reverse order\n- // Row : The flexible items are displayed horizontally as a row\n- // RowReverse : The flexible items are displayed horizontally as a row, but in reverse order\n- // Column : The flexible items are displayed vertically as a column\n- else if (button.Name == \"FlexDirection\")\n- {\n- if (flexContainer.FlexDirection == FlexContainer.FlexDirectionType.Column)\n- {\n- flexContainer.FlexDirection = FlexContainer.FlexDirectionType.ColumnReverse;\n- button.Label = CreateText(\"FlexDirection : ColumnReverse\");\n- }\n- else if (flexContainer.FlexDirection == FlexContainer.FlexDirectionType.ColumnReverse)\n- {\n- flexContainer.FlexDirection = FlexContainer.FlexDirectionType.Row;\n- button.Label = CreateText(\"FlexDirection : Row\");\n- }\n- else if (flexContainer.FlexDirection == FlexContainer.FlexDirectionType.Row)\n- {\n- flexContainer.FlexDirection = FlexContainer.FlexDirectionType.RowReverse;\n- button.Label = CreateText(\"FlexDirection : RowReverse\");\n- }\n- else\n- {\n- flexContainer.FlexDirection = FlexContainer.FlexDirectionType.Column;\n- button.Label = CreateText(\"FlexDirection : Column\");\n- }\n- }\n-\n- // Judge the button can change flexContainer's property of FlexWrap.\n- // If true, change the value of FlexWrap circularly.\n- // At the same time, changed the pushbutton's LabelText to the current FlexWrap's value\n- // The property show whether the flex items should wrap or not if there is no enough room for them on one flex line\n- // Wrap : Flex items laid out in single line (shrunk to fit the flex container along the main axis)\n- // NoWrap : Flex items laid out in multiple lines if needed\n- else if (button.Name == \"FlexWrap\")\n- {\n- if (flexContainer.FlexWrap == FlexContainer.WrapType.NoWrap)\n- {\n- flexContainer.FlexWrap = FlexContainer.WrapType.Wrap;\n- button.Label = CreateText(\"FlexWrap : Wrap\");\n- }\n- else\n- {\n- flexContainer.FlexWrap = FlexContainer.WrapType.NoWrap;\n- button.Label = CreateText(\"FlexWrap : NoWrap\");\n- }\n- }\n-\n- // Judge the button can change flexContainer's property of JustifyContent.\n- // If true, change the value of JustifyContent circularly.\n- // At the same time, changed the pushbutton's LabelText to the current JustifyContent's value\n- // The property show whether the flex items should wrap or not if there is no enough room for them on one flex line\n- //\n- // JustifyFlexEnd : FItems are positioned at the end of the container\n- // JustifyFlexStart : Items are positioned at the beginning of the container\n- // JustifySpaceAround : Items are positioned with equal space before, between, and after the lines\n- // JustifySpaceBetween : Items are positioned with equal space between the lines\n- // JustifyCenter : Items are positioned at the center of the container\n- else if (button.Name == \"JustifyContent\")\n- {\n- if (flexContainer.JustifyContent == FlexContainer.Justification.JustifyCenter)\n- {\n- flexContainer.JustifyContent = FlexContainer.Justification.JustifyFlexEnd;\n- button.Label = CreateText(\"JustifyContent : JustifyFlexEnd\");\n- }\n- else if (flexContainer.JustifyContent == FlexContainer.Justification.JustifyFlexEnd)\n- {\n- flexContainer.JustifyContent = FlexContainer.Justification.JustifyFlexStart;\n- button.Label = CreateText(\"JustifyContent : JustifyFlexStart\");\n- }\n- else if (flexContainer.JustifyContent == FlexContainer.Justification.JustifyFlexStart)\n- {\n- flexContainer.JustifyContent = FlexContainer.Justification.JustifySpaceAround;\n- button.Label = CreateText(\"JustifyContent : JustifySpaceAround\");\n- }\n- else if (flexContainer.JustifyContent == FlexContainer.Justification.JustifySpaceAround)\n- {\n- flexContainer.JustifyContent = FlexContainer.Justification.JustifySpaceBetween;\n- button.Label = CreateText(\"JustifyContent : JustifySpaceBetween\");\n- }\n- else\n- {\n- flexContainer.JustifyContent = FlexContainer.Justification.JustifyCenter;\n- button.Label = CreateText(\"JustifyContent : JustifyCenter\");\n- }\n- }\n-\n- // Judge the button can change flexContainer's property of AlignItems.\n- // If true, change the value of AlignItems circularly.\n- // At the same time, changed the pushbutton's LabelText to the current AlignItems's value\n- // The property show the alignment of flex items when the items do not use all available space on the cross-axis\n- //\n- // AlignCenter : At the center of the container\n- // AlignFlexEnd : At the end of the container\n- // AlignFlexStart : At the beginning of the container\n- // AlignStretch : Stretch to fit the container\n- // AlignAuto : Inherits the same alignment from the parent\n- else if (button.Name == \"AlignItems\")\n- {\n- if (flexContainer.AlignItems == FlexContainer.Alignment.AlignAuto)\n- {\n- flexContainer.AlignItems = FlexContainer.Alignment.AlignCenter;\n- button.Label = CreateText(\"AlignItems : AlignCenter\");\n- }\n- else if (flexContainer.AlignItems == FlexContainer.Alignment.AlignCenter)\n- {\n- flexContainer.AlignItems = FlexContainer.Alignment.AlignFlexEnd;\n- button.Label = CreateText(\"AlignItems : AlignFlexEnd\");\n- }\n- else if (flexContainer.AlignItems == FlexContainer.Alignment.AlignFlexEnd)\n- {\n- flexContainer.AlignItems = FlexContainer.Alignment.AlignFlexStart;\n- button.Label = CreateText(\"AlignItems : AlignFlexStart\");\n- }\n- else if (flexContainer.AlignItems == FlexContainer.Alignment.AlignFlexStart)\n- {\n- flexContainer.AlignItems = FlexContainer.Alignment.AlignStretch;\n- button.Label = CreateText(\"AlignItems : AlignStretch\");\n- }\n- else\n- {\n- flexContainer.AlignItems = FlexContainer.Alignment.AlignAuto;\n- button.Label = CreateText(\"AlignItems : AlignAuto\");\n- }\n- }\n-\n- // Judge the button can change flexContainer's property of AlignItems.\n- // If true, change the value of AlignItems circularly.\n- // At the same time, changed the pushbutton's LabelText to the current AlignItems's value\n- // The property is similar to \"alignItems\", but it aligns flex lines,\n- // so only works when there are multiple lines\n- else if (button.Name == \"AlignContent\")\n- {\n- if (flexContainer.AlignContent == FlexContainer.Alignment.AlignAuto)\n- {\n- flexContainer.AlignContent = FlexContainer.Alignment.AlignCenter;\n- button.Label = CreateText(\"AlignContent : AlignCenter\");\n- }\n- else if (flexContainer.AlignContent == FlexContainer.Alignment.AlignCenter)\n- {\n- flexContainer.AlignContent = FlexContainer.Alignment.AlignFlexEnd;\n- button.Label = CreateText(\"AlignContent : AlignFlexEnd\");\n- }\n- else if (flexContainer.AlignContent == FlexContainer.Alignment.AlignFlexEnd)\n- {\n- flexContainer.AlignContent = FlexContainer.Alignment.AlignFlexStart;\n- button.Label = CreateText(\"AlignContent : AlignFlexStart\");\n- }\n- else if (flexContainer.AlignContent == FlexContainer.Alignment.AlignFlexStart)\n- {\n- flexContainer.AlignContent = FlexContainer.Alignment.AlignStretch;\n- button.Label = CreateText(\"AlignContent : AlignStretch\");\n- }\n- else\n- {\n- flexContainer.AlignContent = FlexContainer.Alignment.AlignAuto;\n- button.Label = CreateText(\"AlignContent : AlignAuto\");\n- }\n- }\n-\n- return true;\n- }\n-\n- /// <summary>\n- /// Creates propertyMap used t set button.Label\n- /// </summary>\n- /// <param name=\"text\">text</param>\n- ///<returns>The created propertyMap</returns>\n- private PropertyMap CreateText(string text)\n- {\n- PropertyMap textVisual = new PropertyMap();\n- textVisual.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text));\n- textVisual.Add(TextVisualProperty.Text, new PropertyValue(text));\n- textVisual.Add(TextVisualProperty.TextColor, new PropertyValue(Color.Black));\n- textVisual.Add(TextVisualProperty.PointSize, new PropertyValue(7));\n- textVisual.Add(TextVisualProperty.HorizontalAlignment, new PropertyValue(\"CENTER\"));\n- textVisual.Add(TextVisualProperty.VerticalAlignment, new PropertyValue(\"CENTER\"));\n- return textVisual;\n- }\n-\n- /// <summary>\n- /// This Application will be exited when back key entered.\n- /// </summary>\n- /// <param name=\"source\">Window.Instance</param>\n- /// <param name=\"e\">event</param>\n- private void AppBack(object source, Window.KeyEventArgs e)\n- {\n- if (e.Key.State == Key.StateType.Down)\n- {\n- if (e.Key.KeyPressedName == \"XF86Back\")\n- {\n- this.Exit();\n- }\n- }\n- }\n- }\n-}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete FlexContainerSample.cs
|
594,239 |
21.12.2017 19:08:30
| -28,800 |
1a2c6997a318050d3d8947b92ef274f73e725f13
|
Delete VisualSample.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/VisualSample/VisualSample/src/VisualSample.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using System;\n-using System.Runtime.InteropServices;\n-using Tizen.NUI;\n-using Tizen.NUI.UIComponents;\n-using Tizen.NUI.BaseComponents;\n-using Tizen.NUI.Constants;\n-\n-namespace VisualSample\n-{\n- /// <summary>\n- /// This sample application demonstrates many kinds of visuals.\n- /// </summary>\n- class VisualSample : NUIApplication\n- {\n- // The text to mark visual.\n- private TextLabel[] text;\n- // A visual view be used to added some visuals on it.\n- private VisualView _visualView;\n- // A visual view be used to added svg visual on it.\n- private VisualView _svgVisuallView;\n- // The source of images.\n- private const String resources = \"/home/owner/apps_rw/org.tizen.example.VisualSample/res/images/\";\n- private String image_jpg = resources + \"gallery-1.jpg\";\n- private String image_gif = resources + \"dog-anim.gif\";\n- private String image_svg = resources + \"Kid1.svg\";\n- private String image_9patch = resources + \"focus_grid.9.png\";\n-\n- /// <summary>\n- /// The constructor with null\n- /// </summary>\n- public VisualSample() : base()\n- {\n- }\n-\n- /// <summary>\n- /// Overrides this method if want to handle behaviour.\n- /// </summary>\n- protected override void OnCreate()\n- {\n- base.OnCreate();\n- Initialize();\n- }\n-\n- /// <summary>\n- /// Visual Sample Application initialisation.\n- /// </summary>\n- private void Initialize()\n- {\n- Window.Instance.BackgroundColor = Color.White;\n- // Show Visuals Type.\n- // There are 11 Visuals will be marked with text\n- // Color visual will be used to _visualView's Background\n- // TextVisual don't need use it.\n- text = new TextLabel[11];\n-\n- // Create a visual view.\n- // Make it fill to Window.\n- // Visuals will put on it.\n- _visualView = new VisualView();\n- _visualView.PositionUsesPivotPoint = true;\n- _visualView.ParentOrigin = ParentOrigin.TopLeft;\n- _visualView.PivotPoint = PivotPoint.TopLeft;\n- _visualView.Size2D = Window.Instance.Size;\n-\n- // color visual.\n- // color.R/G/B/A range 0 - 1(contain 0 and 1)\n- // Renders a color to the visual's quad geometry.\n- ColorVisual colorVisual = new ColorVisual();\n- colorVisual.Color = new Color(0.8f, 0.8f, 0.8f, 1.0f);\n- _visualView.Background = colorVisual.OutputVisualMap;\n- Window.Instance.GetDefaultLayer().Add(_visualView);\n-\n- // Create the text mark normal image visual.\n- text[0] = CreateTextLabel(\"normal image visual\", new Position2D(20, 20));\n- Window.Instance.GetDefaultLayer().Add(text[0]);\n- // normal image visual.\n- // Renders a raster image ( jpg, png etc.) into the visual's quad geometry.\n- ImageVisual imageVisual = new ImageVisual();\n- imageVisual.URL = image_jpg;\n- imageVisual.Size = new Size2D(200, 200);\n- imageVisual.Position = new Vector2(20.0f, 120.0f);\n- imageVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- imageVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- imageVisual.Origin = Visual.AlignType.TopBegin;\n- imageVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"imageVisual\", imageVisual);\n-\n- // Create the text mark normal image visual.\n- text[1] = CreateTextLabel(\"svg image visual\", new Position2D(340, 20));\n- Window.Instance.GetDefaultLayer().Add(text[1]);\n- // svg image visual.\n- // Renders a svg image into the visual's quad geometry\n- _svgVisuallView = new VisualView();\n- _svgVisuallView.Size2D = new Vector2(200, 200);\n- _svgVisuallView.PositionUsesPivotPoint = true;\n- _svgVisuallView.ParentOrigin = ParentOrigin.TopLeft;\n- _svgVisuallView.PivotPoint = PivotPoint.TopLeft;\n- _svgVisuallView.Position = new Position(340, 120, 0);\n- Window.Instance.GetDefaultLayer().Add(_svgVisuallView);\n- SVGVisual svgVisual = new SVGVisual();\n- svgVisual.URL = image_svg;\n- svgVisual.Size = new Vector2(200, 200);\n- svgVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- svgVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- svgVisual.Origin = Visual.AlignType.Center;\n- svgVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- _svgVisuallView.AddVisual(\"svgVisual\", svgVisual);\n-\n- // Create the text mark npatch image visual.\n- text[2] = CreateTextLabel(\"npatch image visual\", new Position2D(680, 20));\n- Window.Instance.GetDefaultLayer().Add(text[2]);\n- // n patch image visual.\n- // Renders an npatch or a 9patch image. Uses nonquad\n- // geometry. Both geometry and texture are cached to\n- // reduce memory consumption if the same npatch image\n- // is used elsewhere.\n- NPatchVisual nPatchVisual = new NPatchVisual();\n- nPatchVisual.URL = image_9patch;\n- nPatchVisual.Size = new Vector2(200, 200);\n- nPatchVisual.Position = new Vector2(680, 120);\n- nPatchVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- nPatchVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- nPatchVisual.Origin = Visual.AlignType.TopBegin;\n- nPatchVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"nPatchVisual\", nPatchVisual);\n-\n- // Create the text mark animated image visual.\n- text[3] = CreateTextLabel(\"animated image visual\", new Position2D(1000, 20));\n- Window.Instance.GetDefaultLayer().Add(text[3]);\n- // animated image visual.\n- // Renders an animated image into the visual's quad geometry.\n- // Currently, only the GIF format is supported.\n- AnimatedImageVisual animatedImageVisual = new AnimatedImageVisual();\n- animatedImageVisual.URL = image_gif;\n- animatedImageVisual.Size = new Size2D(200, 200);\n- animatedImageVisual.Position = new Vector2(1000.0f, 120.0f);\n- animatedImageVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- animatedImageVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- animatedImageVisual.Origin = Visual.AlignType.TopBegin;\n- animatedImageVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"animatedImageVisual\", animatedImageVisual);\n-\n- // text visual.\n- TextVisual textVisual = new TextVisual();\n- textVisual.Text = \"This is a TextVisual\";\n- textVisual.PointSize = 5.0f;\n- textVisual.Size = new Vector2(400.0f, 100.0f);\n- textVisual.Position = new Vector2(1150.0f, 60.0f);\n- textVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- textVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- textVisual.Origin = Visual.AlignType.TopBegin;\n- textVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- textVisual.HorizontalAlignment = HorizontalAlignment.Center;\n- _visualView.AddVisual(\"textVisual\", textVisual);\n-\n- // Create the text mark border visual.\n- text[4] = CreateTextLabel(\"border visual\", new Position2D(20, 450));\n- Window.Instance.GetDefaultLayer().Add(text[4]);\n- // borderVisual\n- // Renders a color as an internal border to the visual's geometry.\n- BorderVisual borderVisual = new BorderVisual();\n- borderVisual.Color = Color.Red;\n- borderVisual.BorderSize = 5.0f;\n- borderVisual.Size = new Vector2(200.0f, 200.0f);\n- borderVisual.Position = new Vector2(20.0f, 550.0f);\n- borderVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- borderVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- borderVisual.Origin = Visual.AlignType.TopBegin;\n- borderVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"borderVisual\", borderVisual);\n-\n- // Create the text mark gradient visual.\n- text[5] = CreateTextLabel(\"gradient visual\", new Position2D(240, 450));\n- Window.Instance.GetDefaultLayer().Add(text[5]);\n- // gradient visual\n- // Renders a smooth transition of colors to the visual's quad geometry.\n- // Both Linear and Radial gradients are supported.\n- GradientVisual gradientVisual = new GradientVisual();\n- // Create the PropertyArray of stopOffset.\n- PropertyArray stopOffset = new PropertyArray();\n- stopOffset.Add(new PropertyValue(0.0f));\n- stopOffset.Add(new PropertyValue(0.3f));\n- stopOffset.Add(new PropertyValue(0.6f));\n- stopOffset.Add(new PropertyValue(0.8f));\n- stopOffset.Add(new PropertyValue(1.0f));\n- gradientVisual.StopOffset = stopOffset;\n- // Create the PropertyArray of stopColor.\n- PropertyArray stopColor = new PropertyArray();\n- stopColor.Add(new PropertyValue(new Vector4(129.0f, 198.0f, 193.0f, 255.0f) / 255.0f));\n- stopColor.Add(new PropertyValue(new Vector4(196.0f, 198.0f, 71.0f, 122.0f) / 255.0f));\n- stopColor.Add(new PropertyValue(new Vector4(214.0f, 37.0f, 139.0f, 191.0f) / 255.0f));\n- stopColor.Add(new PropertyValue(new Vector4(129.0f, 198.0f, 193.0f, 150.0f) / 255.0f));\n- stopColor.Add(new PropertyValue(Color.Yellow));\n- // Set the color at the stop offsets.\n- // At least 2 values required to show a gradient.\n- gradientVisual.StopColor = stopColor;\n- // Set the start position of a linear gradient.\n- gradientVisual.StartPosition = new Vector2(0.5f, 0.5f);\n- // Set the end position of a linear gradient.\n- gradientVisual.EndPosition = new Vector2(-0.5f, -0.5f);\n- // Set the center point of a radial gradient.\n- gradientVisual.Center = new Vector2(0.5f, 0.5f);\n- // Set the size of the radius of a radial gradient.\n- gradientVisual.Radius = 1.414f;\n- gradientVisual.Size = new Vector2(200.0f, 200.0f);\n- gradientVisual.Position = new Vector2(240.0f, 550.0f);\n- gradientVisual.PositionPolicy = VisualTransformPolicyType.Absolute;\n- gradientVisual.SizePolicy = VisualTransformPolicyType.Absolute;\n- gradientVisual.Origin = Visual.AlignType.TopBegin;\n- gradientVisual.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"gradientVisual1\", gradientVisual);\n-\n- // Create the text mark gradient visual.\n- text[6] = CreateTextLabel(\"primitive visual: Cone\", new Position2D(460, 450));\n- Window.Instance.GetDefaultLayer().Add(text[6]);\n- // primitive visual: Cone\n- // Renders a simple 3D shape, such as a cube or sphere. Scaled to fit the control.\n- // The shapes are generated with clockwise winding and backface culling on by default.\n- // Cone : Equivalent to a conical frustrum with top radius of zero.\n- PrimitiveVisual primitiveVisual1 = new PrimitiveVisual();\n- primitiveVisual1.Shape = PrimitiveVisualShapeType.Cone;\n- primitiveVisual1.BevelPercentage = 0.3f;\n- primitiveVisual1.BevelSmoothness = 0.0f;\n- primitiveVisual1.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f);\n- primitiveVisual1.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f);\n- primitiveVisual1.Size = new Vector2(200.0f, 200.0f);\n- primitiveVisual1.Position = new Vector2(460.0f, 550.0f);\n- primitiveVisual1.PositionPolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual1.SizePolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual1.Origin = Visual.AlignType.TopBegin;\n- primitiveVisual1.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"primitiveVisual1\", primitiveVisual1);\n-\n- // Create the text mark primitive visual: Sphere.\n- text[7] = CreateTextLabel(\"primitive visual: Sphere\", new Position2D(680, 450));\n- Window.Instance.GetDefaultLayer().Add(text[7]);\n- // primitive visual: Sphere\n- // Sphere : Default.\n- PrimitiveVisual primitiveVisual2 = new PrimitiveVisual();\n- primitiveVisual2.Shape = PrimitiveVisualShapeType.Sphere;\n- primitiveVisual2.BevelPercentage = 0.3f;\n- primitiveVisual2.BevelSmoothness = 0.0f;\n- primitiveVisual2.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f);\n- primitiveVisual2.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f);\n- primitiveVisual2.Size = new Vector2(200.0f, 200.0f);\n- primitiveVisual2.Position = new Vector2(680.0f, 550.0f);\n- primitiveVisual2.PositionPolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual2.SizePolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual2.Origin = Visual.AlignType.TopBegin;\n- primitiveVisual2.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"primitiveVisual2\", primitiveVisual2);\n-\n- // Create the text mark primitive visual: Cylinder.\n- text[8] = CreateTextLabel(\"primitive visual: Cylinder\", new Position2D(1000, 450));\n- Window.Instance.GetDefaultLayer().Add(text[8]);\n- // primitive visual: Cylinder\n- // Cylinder : Equivalent to a conical frustrum with\n- // equal radii for the top and bottom circles.\n- PrimitiveVisual primitiveVisual3 = new PrimitiveVisual();\n- primitiveVisual3.Shape = PrimitiveVisualShapeType.Cylinder;\n- primitiveVisual3.BevelPercentage = 0.3f;\n- primitiveVisual3.BevelSmoothness = 0.0f;\n- primitiveVisual3.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f);\n- primitiveVisual3.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f);\n- primitiveVisual3.Size = new Vector2(200.0f, 200.0f);\n- primitiveVisual3.Position = new Vector2(1000.0f, 550.0f);\n- primitiveVisual3.PositionPolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual3.SizePolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual3.Origin = Visual.AlignType.TopBegin;\n- primitiveVisual3.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"primitiveVisual3\", primitiveVisual3);\n-\n- // Create the text mark primitive visual: ConicalFrustrum.\n- text[9] = CreateTextLabel(\"primitive visual: ConicalFrustrum\", new Position2D(1220, 450));\n- Window.Instance.GetDefaultLayer().Add(text[9]);\n- // primitive visual: ConicalFrustrum\n- // ConicalFrustrum : The area bound between two circles,\n- // i.e. a cone with the tip removed.\n- PrimitiveVisual primitiveVisual4 = new PrimitiveVisual();\n- primitiveVisual4.Shape = PrimitiveVisualShapeType.ConicalFrustrum;\n- primitiveVisual4.BevelPercentage = 0.3f;\n- primitiveVisual4.BevelSmoothness = 0.0f;\n- primitiveVisual4.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f);\n- primitiveVisual4.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f);\n- primitiveVisual4.Size = new Vector2(200.0f, 200.0f);\n- primitiveVisual4.Position = new Vector2(1220.0f, 550.0f);\n- primitiveVisual4.PositionPolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual4.SizePolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual4.Origin = Visual.AlignType.TopBegin;\n- primitiveVisual4.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"primitiveVisual4\", primitiveVisual4);\n-\n- // Create the text mark primitive visual: ConicalFrustrum.\n- text[10] = CreateTextLabel(\"primitive visual: Cube\", new Position2D(1460, 450));\n- Window.Instance.GetDefaultLayer().Add(text[10]);\n- // primitive visual: Cube\n- // Cube : Equivalent to a bevelled cube with a\n- // bevel percentage of zero.\n- PrimitiveVisual primitiveVisual5 = new PrimitiveVisual();\n- primitiveVisual5.Shape = PrimitiveVisualShapeType.Cube;\n- primitiveVisual5.BevelPercentage = 0.3f;\n- primitiveVisual5.BevelSmoothness = 0.0f;\n- primitiveVisual5.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f);\n- primitiveVisual5.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f);\n- primitiveVisual5.Size = new Vector2(200.0f, 200.0f);\n- primitiveVisual5.Position = new Vector2(1460.0f, 550.0f);\n- primitiveVisual5.PositionPolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual5.SizePolicy = VisualTransformPolicyType.Absolute;\n- primitiveVisual5.Origin = Visual.AlignType.TopBegin;\n- primitiveVisual5.AnchorPoint = Visual.AlignType.TopBegin;\n- _visualView.AddVisual(\"primitiveVisual5\", primitiveVisual5);\n-\n- Window.Instance.KeyEvent += AppBack;\n- }\n-\n- /// <summary>\n- /// To create a TextLabel which indicate Visuals'type\n- /// </summary>\n- /// <param name=\"text\">text</param>\n- /// <param name=\"position2D\">position</param>\n- /// <returns>\n- /// the created textLabel\n- /// </returns>\n- private TextLabel CreateTextLabel(string text, Position2D position2D)\n- {\n- TextLabel textLabel = new TextLabel();\n- textLabel.Text = text;\n- textLabel.PointSize = 6.0f;\n- textLabel.Size2D = new Size2D(200, 100);\n- textLabel.MultiLine = true;\n- textLabel.Position2D = position2D;\n- textLabel.HorizontalAlignment = HorizontalAlignment.Center;\n- textLabel.VerticalAlignment = VerticalAlignment.Center;\n- return textLabel;\n- }\n-\n- /// <summary>\n- /// This Application will be exited when back key entered.\n- /// </summary>\n- /// <param name=\"source\">Window.Instance</param>\n- /// <param name=\"e\">event</param>\n- private void AppBack(object source, Window.KeyEventArgs e)\n- {\n- if (e.Key.State == Key.StateType.Down)\n- {\n- if (e.Key.KeyPressedName == \"XF86Back\")\n- {\n- this.Exit();\n- }\n- }\n- }\n- }\n-}\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete VisualSample.cs
|
594,275 |
08.01.2018 17:39:06
| -32,400 |
ad64fffda2465e5e42145a20dee26f7c915230db
|
Location wearable
|
[
{
"change_type": "ADD",
"old_path": "Wearable/Location/.vs/Location/v15/.suo",
"new_path": "Wearable/Location/.vs/Location/v15/.suo",
"diff": "Binary files /dev/null and b/Wearable/Location/.vs/Location/v15/.suo differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/db.lock",
"new_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/db.lock",
"diff": ""
},
{
"change_type": "ADD",
"old_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide",
"new_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide",
"diff": "Binary files /dev/null and b/Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide-shm",
"new_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide-shm",
"diff": "Binary files /dev/null and b/Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide-shm differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide-wal",
"new_path": "Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide-wal",
"diff": "Binary files /dev/null and b/Wearable/Location/.vs/Location/v15/Server/sqlite3/storage.ide-wal differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Wearable/Location/Location/Location.Tizen.Wearable/Location.Tizen.Wearable.cs",
"diff": "+namespace Location.Tizen.Wearable\n+{\n+ class Program : global::Xamarin.Forms.Platform.Tizen.FormsApplication\n+ {\n+ /// <summary>\n+ /// This method called when the application created.\n+ /// </summary>\n+ protected override void OnCreate()\n+ {\n+ base.OnCreate();\n+ LoadApplication(new App());\n+ }\n+\n+ /// <summary>\n+ /// The main entrance of the application.\n+ /// </summary>\n+ /// <param name=\"args\">The <see cref=\"string\"/> arguments.</param>\n+ static void Main(string[] args)\n+ {\n+ var app = new Program();\n+ global::Xamarin.Forms.Platform.Tizen.Forms.Init(app);\n+ app.Run(args);\n+ }\n+ }\n+}\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/Location/Location/Location.Tizen.Wearable/shared/res/Location.Tizen.Wearable.png",
"new_path": "Wearable/Location/Location/Location.Tizen.Wearable/shared/res/Location.Tizen.Wearable.png",
"diff": "Binary files /dev/null and b/Wearable/Location/Location/Location.Tizen.Wearable/shared/res/Location.Tizen.Wearable.png differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Wearable/Location/Location/Location/Location.cs",
"diff": "+using Xamarin.Forms;\n+\n+namespace Location\n+{\n+ /// <summary>\n+ /// The location application\n+ /// </summary>\n+ public class App : Application\n+ {\n+ /// <summary>\n+ /// Initializes a new instance\n+ /// </summary>\n+ public App()\n+ {\n+ // The root page of your application\n+ MainPage = new LocationServices.InitializePage();\n+ }\n+\n+ /// <summary>\n+ /// Called when your app starts.\n+ /// </summary>\n+ protected override void OnStart()\n+ {\n+ // Handle when your app starts\n+ }\n+\n+ /// <summary>\n+ /// Called when your app sleeps.\n+ /// </summary>\n+ protected override void OnSleep()\n+ {\n+ // Handle when your app sleeps\n+ }\n+\n+ /// <summary>\n+ /// Called when your app resumes.\n+ /// </summary>\n+ protected override void OnResume()\n+ {\n+ // Handle when your app resumes\n+ }\n+ }\n+}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Location wearable
Signed-off-by: kj7.sung <kj7.sung@samsung.com>
|
594,218 |
09.01.2018 19:45:15
| -3,600 |
8fe87c789d64e909d19968218b3feaf39f2eb605
|
Add .gitignore file to repository
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": ".gitignore",
"diff": "+## Ignore Visual Studio temporary files, build results, and\n+## files generated by popular Visual Studio add-ons.\n+##\n+## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore\n+\n+# User-specific files\n+*.suo\n+*.user\n+*.userosscache\n+*.sln.docstates\n+\n+# User-specific files (MonoDevelop/Xamarin Studio)\n+*.userprefs\n+\n+# Build results\n+[Dd]ebug/\n+[Dd]ebugPublic/\n+[Rr]elease/\n+[Rr]eleases/\n+x64/\n+x86/\n+bld/\n+[Bb]in/\n+[Oo]bj/\n+[Ll]og/\n+\n+# Visual Studio 2015/2017 cache/options directory\n+.vs/\n+# Uncomment if you have tasks that create the project's static files in wwwroot\n+#wwwroot/\n+\n+# Visual Studio 2017 auto generated files\n+Generated\\ Files/\n+\n+# MSTest test Results\n+[Tt]est[Rr]esult*/\n+[Bb]uild[Ll]og.*\n+\n+# NUNIT\n+*.VisualState.xml\n+TestResult.xml\n+\n+# Build Results of an ATL Project\n+[Dd]ebugPS/\n+[Rr]eleasePS/\n+dlldata.c\n+\n+# Benchmark Results\n+BenchmarkDotNet.Artifacts/\n+\n+# .NET Core\n+project.lock.json\n+project.fragment.lock.json\n+artifacts/\n+**/Properties/launchSettings.json\n+\n+# StyleCop\n+StyleCopReport.xml\n+\n+# Files built by Visual Studio\n+*_i.c\n+*_p.c\n+*_i.h\n+*.ilk\n+*.meta\n+*.obj\n+*.pch\n+*.pdb\n+*.pgc\n+*.pgd\n+*.rsp\n+*.sbr\n+*.tlb\n+*.tli\n+*.tlh\n+*.tmp\n+*.tmp_proj\n+*.log\n+*.vspscc\n+*.vssscc\n+.builds\n+*.pidb\n+*.svclog\n+*.scc\n+\n+# Chutzpah Test files\n+_Chutzpah*\n+\n+# Visual C++ cache files\n+ipch/\n+*.aps\n+*.ncb\n+*.opendb\n+*.opensdf\n+*.sdf\n+*.cachefile\n+*.VC.db\n+*.VC.VC.opendb\n+\n+# Visual Studio profiler\n+*.psess\n+*.vsp\n+*.vspx\n+*.sap\n+\n+# Visual Studio Trace Files\n+*.e2e\n+\n+# TFS 2012 Local Workspace\n+$tf/\n+\n+# Guidance Automation Toolkit\n+*.gpState\n+\n+# ReSharper is a .NET coding add-in\n+_ReSharper*/\n+*.[Rr]e[Ss]harper\n+*.DotSettings.user\n+\n+# JustCode is a .NET coding add-in\n+.JustCode\n+\n+# TeamCity is a build add-in\n+_TeamCity*\n+\n+# DotCover is a Code Coverage Tool\n+*.dotCover\n+\n+# AxoCover is a Code Coverage Tool\n+.axoCover/*\n+!.axoCover/settings.json\n+\n+# Visual Studio code coverage results\n+*.coverage\n+*.coveragexml\n+\n+# NCrunch\n+_NCrunch_*\n+.*crunch*.local.xml\n+nCrunchTemp_*\n+\n+# MightyMoose\n+*.mm.*\n+AutoTest.Net/\n+\n+# Web workbench (sass)\n+.sass-cache/\n+\n+# Installshield output folder\n+[Ee]xpress/\n+\n+# DocProject is a documentation generator add-in\n+DocProject/buildhelp/\n+DocProject/Help/*.HxT\n+DocProject/Help/*.HxC\n+DocProject/Help/*.hhc\n+DocProject/Help/*.hhk\n+DocProject/Help/*.hhp\n+DocProject/Help/Html2\n+DocProject/Help/html\n+\n+# Click-Once directory\n+publish/\n+\n+# Publish Web Output\n+*.[Pp]ublish.xml\n+*.azurePubxml\n+# Note: Comment the next line if you want to checkin your web deploy settings,\n+# but database connection strings (with potential passwords) will be unencrypted\n+*.pubxml\n+*.publishproj\n+\n+# Microsoft Azure Web App publish settings. Comment the next line if you want to\n+# checkin your Azure Web App publish settings, but sensitive information contained\n+# in these scripts will be unencrypted\n+PublishScripts/\n+\n+# NuGet Packages\n+*.nupkg\n+# The packages folder can be ignored because of Package Restore\n+**/[Pp]ackages/*\n+# except build/, which is used as an MSBuild target.\n+!**/[Pp]ackages/build/\n+# Uncomment if necessary however generally it will be regenerated when needed\n+#!**/[Pp]ackages/repositories.config\n+# NuGet v3's project.json files produces more ignorable files\n+*.nuget.props\n+*.nuget.targets\n+\n+# Microsoft Azure Build Output\n+csx/\n+*.build.csdef\n+\n+# Microsoft Azure Emulator\n+ecf/\n+rcf/\n+\n+# Windows Store app package directories and files\n+AppPackages/\n+BundleArtifacts/\n+Package.StoreAssociation.xml\n+_pkginfo.txt\n+*.appx\n+\n+# Visual Studio cache files\n+# files ending in .cache can be ignored\n+*.[Cc]ache\n+# but keep track of directories ending in .cache\n+!*.[Cc]ache/\n+\n+# Others\n+ClientBin/\n+~$*\n+*~\n+*.dbmdl\n+*.dbproj.schemaview\n+*.jfm\n+*.pfx\n+*.publishsettings\n+orleans.codegen.cs\n+\n+# Including strong name files can present a security risk\n+# (https://github.com/github/gitignore/pull/2483#issue-259490424)\n+#*.snk\n+\n+# Since there are multiple workflows, uncomment next line to ignore bower_components\n+# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)\n+#bower_components/\n+\n+# RIA/Silverlight projects\n+Generated_Code/\n+\n+# Backup & report files from converting an old project file\n+# to a newer Visual Studio version. Backup files are not needed,\n+# because we have git ;-)\n+_UpgradeReport_Files/\n+Backup*/\n+UpgradeLog*.XML\n+UpgradeLog*.htm\n+\n+# SQL Server files\n+*.mdf\n+*.ldf\n+*.ndf\n+\n+# Business Intelligence projects\n+*.rdl.data\n+*.bim.layout\n+*.bim_*.settings\n+\n+# Microsoft Fakes\n+FakesAssemblies/\n+\n+# GhostDoc plugin setting file\n+*.GhostDoc.xml\n+\n+# Node.js Tools for Visual Studio\n+.ntvs_analysis.dat\n+node_modules/\n+\n+# TypeScript v1 declaration files\n+typings/\n+\n+# Visual Studio 6 build log\n+*.plg\n+\n+# Visual Studio 6 workspace options file\n+*.opt\n+\n+# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)\n+*.vbw\n+\n+# Visual Studio LightSwitch build output\n+**/*.HTMLClient/GeneratedArtifacts\n+**/*.DesktopClient/GeneratedArtifacts\n+**/*.DesktopClient/ModelManifest.xml\n+**/*.Server/GeneratedArtifacts\n+**/*.Server/ModelManifest.xml\n+_Pvt_Extensions\n+\n+# Paket dependency manager\n+.paket/paket.exe\n+paket-files/\n+\n+# FAKE - F# Make\n+.fake/\n+\n+# JetBrains Rider\n+.idea/\n+*.sln.iml\n+\n+# CodeRush\n+.cr/\n+\n+# Python Tools for Visual Studio (PTVS)\n+__pycache__/\n+*.pyc\n+\n+# Cake - Uncomment if you are using it\n+# tools/**\n+# !tools/packages.config\n+\n+# Tabs Studio\n+*.tss\n+\n+# Telerik's JustMock configuration file\n+*.jmconfig\n+\n+# BizTalk build output\n+*.btp.cs\n+*.btm.cs\n+*.odx.cs\n+*.xsd.cs\n+\n+# OpenCover UI analysis results\n+OpenCover/\n+\n+# Azure Stream Analytics local run output\n+ASALocalRun/\n+\n+# MSBuild Binary and Structured Log\n+*.binlog\n+\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Add .gitignore file to repository
|
594,239 |
10.01.2018 15:34:35
| -28,800 |
bcab983e4bb4b9fffd41ffa4f2c9ab65a4650c39
|
Delete App.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FirstScreen/FirstScreen/src/App.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using Tizen.NUI;\n-using Tizen.NUI.UIComponents;\n-using Tizen.NUI.BaseComponents;\n-using System;\n-using System.Runtime.InteropServices;\n-using System.Collections.Generic;\n-using Tizen.NUI.Constants;\n-\n-namespace FirstScreen\n-{\n- /// <summary>\n- /// This sample application demonstrates the first screen on TV.\n- /// </summary>\n- public class FirstScreenApp : NUIApplication\n- {\n- // Reference to Dali stage.\n- private Window _stage;\n- // Reference to Dali stage size.\n- private Size2D _stageSize;\n- // Top Container added to the Stage will contain Poster ScrollContainers.\n- private View _topContainer;\n- // Bottom Container added to the Stage will contain Menu ScrollContainer.\n- private View _bottomContainer;\n- // Current Poster Container ID visible on the Top Container / Stage.\n- private int _currentPostersContainerID;\n- // Number of Poster ScrollContainers to be added on Top Container.\n- private int _totalPostersContainers;\n- // List collection of Poster ScrollContainers used on the Top Container\n- // in this demo application.\n- private List<ScrollContainer> _postersContainer;\n- // Menu ScrollContainer used on the Bottom Container in this demo application.\n- private ScrollContainer _menuContainer;\n- // Clip layer (Dali Clip Layer instance) used for Bottom Container.\n- private View _bottomClipLayer;\n- // Clip layer (Dali Clip Layer instance) used for Top Container.\n- private View _topClipLayer;\n- // FocusEffect is used to apply Focus animation effect on any supplied item/image.\n- private FocusEffect _focusEffect;\n- // Contains the physical location of all images used in the demo application.\n- private string _imagePath;\n- // Reference to the ImageView (Keyboard Focus indicator)\n- // applied to the focused item on ScrollContainer.\n- private ImageView _keyboardFocusIndicator;\n- // Reference to the ImageView used for launcher separation\n- // (Launcher consists of three image icons on left of Menu ScrollContainer).\n- private ImageView _launcherSeparator;\n- // ImageViews used for launcher Icons.\n- private ImageView[] launcherIcon;\n- // Animation used to show/unhide Bottom Container\n- // (Menu ScrollContainer) when it is focused.\n- private Animation _showBottomContainerAnimation;\n- // Animation used to hide Bottom Container\n- // (Menu ScrollContainer) when it is focused.\n- private Animation _hideBottomContainerAnimation;\n- // Animation used to move Poster scrollContainer\n- // from bottom to top and make it non-transparent.\n- private Animation _showAnimation;\n- // Animation used to make the unused specified Poster scrollContainer transparent.\n- private Animation _hideAnimation;\n- // The unused Poster scrollContainer which needs to be transparent.\n- private ScrollContainer _hideScrollContainer;\n- // Reference to Dali KeyboardFocusManager.\n- FocusManager _keyboardFocusManager;\n-\n- /// <summary>\n- /// Overrides this method if want to handle behaviour.\n- /// </summary>\n- protected override void OnCreate()\n- {\n- base.OnCreate();\n- OnInitialize();\n- }\n-\n- /// <summary>\n- /// Create Items for Poster ScrollContainer\n- /// </summary>\n- private void CreatePosters()\n- {\n- for (int j = 0; j < _totalPostersContainers; j++)\n- {\n- View posterContainer = _postersContainer[j].Container;\n- for (int i = 0; i < Constants.PostersItemsCount; i++)\n- {\n- if (j % _totalPostersContainers == 0)\n- {\n- View item = new ImageView(_imagePath + \"/poster\" + j + \"/\" + (i % 14) + \".jpg\");\n- item.Name = (\"poster-item-\" + _postersContainer[j].ItemCount);\n- _postersContainer[j].Add(item);\n- }\n- else\n- {\n- View item = new ImageView(_imagePath + \"/poster\" + j + \"/\" + (i % 6) + \".jpg\");\n- item.Name = (\"poster-item-\" + _postersContainer[j].ItemCount);\n- _postersContainer[j].Add(item);\n- }\n- }\n-\n- if (j == 0)\n- {\n- Show(_postersContainer[j]);\n- }\n- else\n- {\n- Hide(_postersContainer[j]);\n- }\n-\n- _postersContainer[j].SetFocused(false);\n- }\n-\n- _currentPostersContainerID = 0;\n- }\n-\n- /// <summary>\n- /// Create Items for Menu ScrollContainer\n- /// <summary>\n- private void CreateMenu()\n- {\n- View menuContainer = _menuContainer.Container;\n- menuContainer.Position = new Position(150, 0.0f, 0.0f);\n-\n- for (int i = 0; i < Constants.MenuItemsCount; i++)\n- {\n- ImageView menuItem = new ImageView(_imagePath + \"/menu/\" + i % 5 + \".png\");\n- menuItem.Name = (\"menu-item-\" + _menuContainer.ItemCount);\n- _menuContainer.Add(menuItem);\n- }\n- }\n-\n- /// <summary>\n- /// Callback when the keyboard focus is going to be changed.\n- /// </summary>\n- /// <param name=\"source\">FocusManager.Instance</param>\n- /// <param name=\"e\">event</param>\n- /// <returns> The view to move the keyboard focus to.</returns>\n- private View OnKeyboardPreFocusChangeSignal(object source, FocusManager.PreFocusChangeEventArgs e)\n- {\n- if (!e.CurrentView && !e.ProposedView)\n- {\n- return _menuContainer;\n- }\n-\n- View actor = _menuContainer.Container;\n-\n- if (e.Direction == View.FocusDirection.Up)\n- {\n- // Move the Focus to Poster ScrollContainer and hide Bottom Container (Menu ScrollContainer)\n- if (_menuContainer.IsFocused)\n- {\n- actor = _postersContainer[_currentPostersContainerID].GetCurrentFocusedActor();\n- _menuContainer.SetFocused(false);\n- _postersContainer[_currentPostersContainerID].SetFocused(true);\n- //HideBottomContainer();\n- }\n- }\n- else if (e.Direction == View.FocusDirection.Down)\n- {\n- // Show Bottom Container (Menu ScrollContainer) and move the Focus to it\n- if (!_menuContainer.IsFocused)\n- {\n- ShowBottomContainer();\n- actor = _menuContainer.GetCurrentFocusedActor();\n- _postersContainer[_currentPostersContainerID].SetFocused(false);\n- _menuContainer.SetFocused(true);\n- }\n- }\n- else\n- {\n- // Set the next focus view.\n- actor = e.ProposedView;\n- }\n-\n- if (e.Direction == View.FocusDirection.Left)\n- {\n- if (_menuContainer.IsFocused)\n- {\n- int id = _menuContainer.FocusedItemID % _totalPostersContainers;\n- if (id != _currentPostersContainerID)\n- {\n- Hide(_postersContainer[_currentPostersContainerID]);\n- _currentPostersContainerID = id;\n-\n- Show(_postersContainer[_currentPostersContainerID]);\n- }\n- }\n- }\n- else if (e.Direction == View.FocusDirection.Right)\n- {\n- if (_menuContainer.IsFocused)\n- {\n- int id = _menuContainer.FocusedItemID % _totalPostersContainers;\n- if (id != _currentPostersContainerID)\n- {\n- Hide(_postersContainer[_currentPostersContainerID]);\n- _currentPostersContainerID = id;\n- Show(_postersContainer[_currentPostersContainerID]);\n- }\n- }\n- }\n-\n- return (View)actor;\n- }\n-\n- /// <summary>\n- /// Perform Focus animation Effect on the current Focused Item on ScrollContainer.\n- /// </summary>\n- /// <param name=\"scrollContainer\">Scroll Container</param>\n- /// <param name=\"direction\">Direction</param>\n- private void FocusAnimation(ScrollContainer scrollContainer, FocusEffectDirection direction)\n- {\n- _focusEffect.FocusAnimation(scrollContainer.GetCurrentFocusedActor(), scrollContainer.ItemSize, 1000, direction);\n- }\n-\n- /// <summary>\n- /// Perform Show animation on ScrollContainer (used only for Poster Container)\n- /// </summary>\n- /// <param name=\"scrollContainer\">scrollContainer</param>\n- private void Show(ScrollContainer scrollContainer)\n- {\n- scrollContainer.Add(scrollContainer.Container);\n-\n- _hideScrollContainer = null;\n-\n- // This animation will move Poster scrollContainer\n- // from bottom to top and make it non-transparent.\n- _showAnimation = new Animation(350);\n- _showAnimation.AnimateTo(scrollContainer.Container, \"ColorAlpha\", 1.0f);\n-\n- scrollContainer.Container.PositionY = scrollContainer.Container.Position.Y + 200.0f;\n- float targetPositionY = scrollContainer.Container.Position.Y - 200.0f;\n-\n- _showAnimation.AnimateTo(scrollContainer.Container, \"PositionY\", targetPositionY, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n-\n- _showAnimation.Play();\n- }\n-\n- /// <summary>\n- /// Perform Hide animation on ScrollContainer (used only for Poster Container)\n- /// </summary>\n- /// <param name=\"scrollContainer\">scrollContainer</param>\n- private void Hide(ScrollContainer scrollContainer)\n- {\n- if (_hideAnimation)\n- {\n- _hideAnimation.Clear();\n- _hideAnimation.Reset();\n- }\n-\n- int duration = 350;\n- _hideAnimation = new Animation(duration);\n- _hideAnimation.Duration = duration;\n- _hideAnimation.AnimateTo(scrollContainer.Container, \"ColorAlpha\", 0.0f, 0, (int)((float)duration * 0.75f), new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- _hideAnimation.Finished += OnHideAnimationFinished;\n- _hideScrollContainer = scrollContainer;\n- _hideAnimation.Play();\n- }\n-\n- /// <summary>\n- /// This removes all the items from the specified unused\n- /// Poster ScrollContainer (hence Stage) to improve performance.\n- /// <summary>\n- private void OnHideAnimationFinished(object source, EventArgs e)\n- {\n- if (_hideScrollContainer)\n- {\n- _hideScrollContainer.Remove(_hideScrollContainer.Container);\n- }\n- }\n-\n- /// <summary>\n- /// Hide Bottom Container (Menu ScrollContainer) when it is not focused\n- /// </summary>\n- private void HideBottomContainer()\n- {\n- _hideBottomContainerAnimation.AnimateTo(_bottomContainer, \"Position\", new Position(0.0f, _stageSize.Height * Constants.BottomContainerHidePositionFactor, 0.0f),\n- new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n-\n- _hideBottomContainerAnimation.Play();\n- }\n-\n- /// <summary>\n- /// Show (unhide) Bottom Container (Menu ScrollContainer) when it is focused\n- /// </summary>\n- private void ShowBottomContainer()\n- {\n- _showBottomContainerAnimation.AnimateTo(_bottomContainer, \"Position\", new Position(0.0f, _stageSize.Height * Constants.BottomContainerShowPositionFactor, 0.0f),\n- new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- _showBottomContainerAnimation.Play();\n- }\n-\n- /// <summary>\n- /// First screen demo Application initialisation\n- /// </summary>\n- private void OnInitialize()\n- {\n- Tizen.Log.Debug(\"NUI\", \"OnInitialize() is called!\");\n- _hideScrollContainer = null;\n- _stage = Window.Instance;\n- _stageSize = _stage.Size;\n- _totalPostersContainers = Constants.TotalPostersContainers;\n- _imagePath = Constants.ImageResourcePath;\n-\n- _postersContainer = new List<ScrollContainer>();\n- _menuContainer = new ScrollContainer();\n-\n- _hideBottomContainerAnimation = new Animation(250);\n- _showBottomContainerAnimation = new Animation(250);\n-\n- // Create a Top Container for poster items\n- _topContainer = new View();\n- _topContainer.Size2D = new Vector2(_stageSize.Width, _stageSize.Height * Constants.TopContainerHeightFactor);\n- _topContainer.Position = new Position(0.0f, _stageSize.Height * Constants.TopContainerPositionFactor - 80, 0.0f);\n- _topContainer.ParentOrigin = ParentOrigin.TopLeft;\n- _topContainer.PivotPoint = PivotPoint.TopLeft;\n- _topContainer.PositionUsesPivotPoint = true;\n-\n- // Add a background to Top container\n- PropertyMap visual = new PropertyMap();\n- visual.Insert(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));\n- visual.Insert(ImageVisualProperty.URL, new PropertyValue(_imagePath + \"/focuseffect/background.png\"));\n- _topContainer.Background = visual;\n- _topContainer.Name = \"TopControl\";\n-\n- // Create a Bottom Container\n- _bottomContainer = new View();\n- _bottomContainer.Size2D = new Vector2(_stageSize.Width, _stageSize.Height * Constants.BottomContainerHeightFactor);\n- _bottomContainer.Position = new Position(0.0f, _stageSize.Height * Constants.BottomContainerHidePositionFactor, 0.0f);\n- _bottomContainer.ParentOrigin = ParentOrigin.TopLeft;\n- _bottomContainer.PivotPoint = PivotPoint.TopLeft;\n- _bottomContainer.PositionUsesPivotPoint = true;\n-\n- // Add a background to Bottom Container\n- visual = new PropertyMap();\n- visual.Insert(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image));\n- visual.Insert(ImageVisualProperty.URL, new PropertyValue(_imagePath + \"/focuseffect/background.png\"));\n- _bottomContainer.Background = visual;\n- _bottomContainer.Name = \"BottomControl\";\n-\n- // Add both Top and Bottom Containers to Stage\n- _stage.GetDefaultLayer().Add(_topContainer);\n- _stage.GetDefaultLayer().Add(_bottomContainer);\n-\n- // Add a clip layer to Top Container\n- _topClipLayer = new View();\n- _topClipLayer.ParentOrigin = ParentOrigin.BottomCenter;\n- _topClipLayer.PivotPoint = PivotPoint.BottomCenter;\n- _topClipLayer.PositionUsesPivotPoint = true;\n-\n- _topContainer.Add(_topClipLayer);\n-\n- // Create a SpotLight for items / images of both\n- // Poster and Menu ScrollContainers\n- ImageView spotLight = new ImageView(_imagePath + \"/focuseffect/highlight_spot.png\");\n- spotLight.WidthResizePolicy = ResizePolicyType.UseNaturalSize;\n- spotLight.HeightResizePolicy = ResizePolicyType.UseNaturalSize;\n- spotLight.ParentOrigin = ParentOrigin.Center;\n- spotLight.PivotPoint = PivotPoint.Center;\n- spotLight.PositionUsesPivotPoint = true;\n- spotLight.Name = \"spotLight\";\n-\n- // Create a shadowBorder for items / images of Poster ScrollContainers\n- ImageView shadowBorder = new ImageView(_imagePath + \"/focuseffect/thumbnail_shadow.9.png\");\n- shadowBorder.ParentOrigin = ParentOrigin.Center;\n- shadowBorder.PivotPoint = PivotPoint.Center;\n- shadowBorder.PositionUsesPivotPoint = true;\n- shadowBorder.WidthResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent;\n- shadowBorder.HeightResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent;\n- shadowBorder.SizeModeFactor = (new Vector3(32.0f, 41.0f, 0.0f));\n- shadowBorder.Name = \"poster shadowBorder\";\n-\n- // Create Poster Containers and add them to Top Clip layer\n- for (int i = 0; i < _totalPostersContainers; i++)\n- {\n- _postersContainer.Add(new ScrollContainer());\n- _postersContainer[i].Container.Name = \"poster\" + i;\n- if (i == 0)\n- {\n- _postersContainer[i].ItemSize = new Vector2((_stageSize.Width * Constants.Poster0ItemWidthFactor) - Constants.PostersContainerPadding,\n- _stageSize.Height * Constants.PostersItemHeightFactor);\n- }\n- else\n- {\n- _postersContainer[i].ItemSize = new Vector2((_stageSize.Width * Constants.Poster1ItemWidthFactor) - Constants.PostersContainerPadding,\n- _stageSize.Height * Constants.PostersItemHeightFactor);\n- }\n-\n- _postersContainer[i].Gap = Constants.PostersContainerPadding;\n- _postersContainer[i].MarginX = Constants.PostersContainerMargin;\n- _postersContainer[i].OffsetYFator = Constants.PostersContainerOffsetYFactor;\n- _postersContainer[i].Width = _stageSize.Width;\n- _postersContainer[i].Height = _stageSize.Height * Constants.PostersContainerHeightFactor;\n- _postersContainer[i].ShadowBorder = shadowBorder;\n- _postersContainer[i].ShadowBorder.Position = new Position(0.0f, 4.0f, 0.0f);\n- _topClipLayer.Add(_postersContainer[i]);\n- }\n-\n- // Add a clip layer to Bottom Container\n- _bottomClipLayer = new View();\n- _bottomClipLayer.PivotPoint = PivotPoint.BottomLeft;\n- _bottomClipLayer.PositionUsesPivotPoint = true;\n- _bottomClipLayer.ParentOrigin = ParentOrigin.BottomLeft;\n- _bottomClipLayer.Position = new Position(Constants.LauncherWidth, 35, 0);\n- _bottomClipLayer.SizeWidth = _stageSize.Width - Constants.LauncherWidth;\n- _bottomClipLayer.SizeHeight = _stageSize.Height * Constants.MenuContainerHeightFactor;\n- _bottomContainer.ClippingMode = ClippingModeType.ClipChildren;\n- _bottomContainer.Add(_bottomClipLayer);\n-\n- // Add Launcher items to Bottom Container. Launcher is used\n- // to display three images on left of Menu ScrollContainer\n- launcherIcon = new ImageView[Convert.ToInt32(Constants.LauncherItemsCount)];\n- for (int launcherIndex = 0; launcherIndex < Constants.LauncherItemsCount; launcherIndex++)\n- {\n- launcherIcon[launcherIndex] = new ImageView(_imagePath + \"/focuseffect/\" + launcherIndex + \"-normal.png\");\n- launcherIcon[launcherIndex].Name = \"launcherIcon\" + launcherIndex;\n- launcherIcon[launcherIndex].WidthResizePolicy = ResizePolicyType.UseNaturalSize;\n- launcherIcon[launcherIndex].HeightResizePolicy = ResizePolicyType.UseNaturalSize;\n- launcherIcon[launcherIndex].ParentOrigin = ParentOrigin.CenterLeft;\n- launcherIcon[launcherIndex].PivotPoint = PivotPoint.CenterLeft;\n- launcherIcon[launcherIndex].PositionUsesPivotPoint = true;\n- launcherIcon[launcherIndex].Position = new Position(Constants.LauncherIconWidth * launcherIndex + Constants.LauncherLeftMargin, 0.0f, 0.0f);\n- _bottomContainer.Add(launcherIcon[launcherIndex]);\n- }\n-\n- // Add a shadow seperator image between last Launcher\n- // icon and Menu ScrollContainer\n- _launcherSeparator = new ImageView(_imagePath + \"/focuseffect/focus_launcher_shadow_n.png\");\n- _launcherSeparator.Name = \"launcherSeparator\";\n- _launcherSeparator.WidthResizePolicy = ResizePolicyType.UseNaturalSize;\n- _launcherSeparator.HeightResizePolicy = ResizePolicyType.FillToParent;\n- _launcherSeparator.ParentOrigin = ParentOrigin.CenterLeft;\n- _launcherSeparator.PivotPoint = PivotPoint.CenterLeft;\n- _launcherSeparator.PositionUsesPivotPoint = true;\n- _launcherSeparator.Position = new Position(Constants.LauncherIconWidth * Constants.LauncherItemsCount + Constants.LauncherLeftMargin, 0.0f, 0.0f);\n- _bottomContainer.Add(_launcherSeparator);\n-\n- // Create Menu Container and add it to Bottom Clip Layer\n- Vector2 menuItemSize = new Vector2((_stageSize.Width * Constants.MenuItemWidthFactor) - Constants.MenuContainerPadding,\n- _stageSize.Height * Constants.MenuItemHeightFactor);\n- _menuContainer.Container.Name = \"menu\";\n- _menuContainer.ItemSize = new Vector2(110, 110);\n- Tizen.Log.Fatal(\"NUI\", \"ItemSize.Width: \" + _menuContainer.ItemSize.Width + \" ItemSize.Height: \" + _menuContainer.ItemSize.Height);\n- _menuContainer.Gap = Constants.MenuContainerPadding;\n- _menuContainer.MarginX = Constants.MenuContainerMargin;\n- _menuContainer.OffsetYFator = Constants.MenuContainerOffsetYFactor;\n- _menuContainer.OffsetX = Constants.LauncherWidth;\n- _menuContainer.Width = _stageSize.Width - Constants.LauncherWidth;\n- _menuContainer.Height = _stageSize.Height * Constants.MenuContainerHeightFactor;\n- _menuContainer.ShadowBorder = new ImageView(_imagePath + \"/focuseffect/focus_launcher_shadow.9.png\");\n- _menuContainer.ShadowBorder.Name = \"_menuContainer.ShadowBorder\";\n- _menuContainer.ShadowBorder.Size2D = new Vector2(_menuContainer.ItemSize.Width + 40.0f, _menuContainer.ItemSize.Height + 50.0f);\n- _menuContainer.ShadowBorder.Position = new Position(0.0f, 0.0f, 0.0f);\n- _menuContainer.ShadowBorder.ParentOrigin = ParentOrigin.Center;\n- _menuContainer.ShadowBorder.PivotPoint = PivotPoint.Center;\n- _menuContainer.ShadowBorder.PositionUsesPivotPoint = true;\n- _menuContainer.ClippingMode = ClippingModeType.ClipChildren;\n- _bottomClipLayer.Add(_menuContainer);\n-\n- // Create Items for Poster ScrollContainer\n- CreatePosters();\n- // Create Items for Menu ScrollContainer\n- CreateMenu();\n-\n- // Initialize PreFocusChange event of KeyboardFocusManager\n- _keyboardFocusManager = FocusManager.Instance;\n- _keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChangeSignal;\n-\n- _keyboardFocusIndicator = new ImageView(_imagePath + \"/focuseffect/highlight_stroke.9.png\");\n- _keyboardFocusIndicator.ParentOrigin = ParentOrigin.Center;\n- _keyboardFocusIndicator.PivotPoint = PivotPoint.Center;\n- _keyboardFocusIndicator.PositionUsesPivotPoint = true;\n- _keyboardFocusIndicator.WidthResizePolicy = ResizePolicyType.FillToParent;\n- _keyboardFocusIndicator.HeightResizePolicy = ResizePolicyType.FillToParent;\n-\n- _keyboardFocusManager.FocusIndicator = (_keyboardFocusIndicator);\n-\n- _keyboardFocusManager.SetAsFocusGroup(_menuContainer, true);\n- _keyboardFocusManager.SetAsFocusGroup(_postersContainer[0], true);\n- _keyboardFocusManager.SetAsFocusGroup(_postersContainer[1], true);\n- _keyboardFocusManager.FocusGroupLoop = (true);\n-\n- _focusEffect = new FocusEffect();\n-\n- // Move Focus to Bottom Container (Menu ScrollContainer)\n- ShowBottomContainer();\n- _menuContainer.Focusable = true;\n- _menuContainer.SetFocused(true);\n-\n-#if true\n- //test.\n- TextLabel guide = new TextLabel();\n- guide = new TextLabel();\n- guide.HorizontalAlignment = HorizontalAlignment.Center;\n- guide.VerticalAlignment = VerticalAlignment.Center;\n- guide.PositionUsesPivotPoint = true;\n- guide.ParentOrigin = ParentOrigin.TopLeft;\n- guide.PivotPoint = PivotPoint.TopLeft;\n- guide.Size2D = new Size2D(1920, 100);\n- guide.FontFamily = \"Samsung One 600\";\n- guide.Position2D = new Position2D(0, 0);\n- guide.MultiLine = false;\n- guide.PointSize = 15.0f;\n- guide.Text = \"FirstScreen\";\n- guide.TextColor = Color.White;\n- guide.BackgroundColor = new Color(43.0f / 255.0f, 145.0f / 255.0f, 175.0f / 255.0f, 1.0f);\n- Window.Instance.GetDefaultLayer().Add(guide);\n-#endif\n- Window.Instance.KeyEvent += AppBack;\n-\n- }\n-\n- /// <summary>\n- /// This Application will be exited when back key entered.\n- /// </summary>\n- /// <param name=\"source\">Window.Instance</param>\n- /// <param name=\"e\">event</param>\n- private void AppBack(object source, Window.KeyEventArgs e)\n- {\n- if (e.Key.State == Key.StateType.Down)\n- {\n- if (e.Key.KeyPressedName == \"XF86Back\")\n- {\n- this.Exit();\n- }\n- }\n- }\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete App.cs
|
594,245 |
10.01.2018 16:57:51
| -32,400 |
b072c74e7ef0593e3af7aa721a13cba176fd5682
|
Add Tizen .NET Gamepad Input Sample Application
|
[
{
"change_type": "ADD",
"old_path": "TV/GamepadInputSample/GamepadInputSample/shared/res/GamepadInputSample.png",
"new_path": "TV/GamepadInputSample/GamepadInputSample/shared/res/GamepadInputSample.png",
"diff": "Binary files /dev/null and b/TV/GamepadInputSample/GamepadInputSample/shared/res/GamepadInputSample.png differ\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "TV/GamepadInputSample/README.md",
"diff": "+# GamepadInputSample\n+GamepadInputSample is a sample application to demontrate the use of Tizen .NET Gamepad APIs.\n+\n+## License\n+Copyright (c) 2017 Samsung Electronics Co., Ltd.\n+\n+Licensed under the Apache License, Version 2.0 (the \"License\");\n+you may not use this file except in compliance with the License.\n+You may obtain a copy of the License at\n+\n+http://www.apache.org/licenses/LICENSE-2.0\n+\n+Unless required by applicable law or agreed to in writing, software\n+distributed under the License is distributed on an \"AS IS\" BASIS,\n+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+See the License for the specific language governing permissions and\n+limitations under the License.\n+\n+### Verified Version\n+* Microsoft.NETCore.App : 2.0.0\n+* Tizen.NET : 4.0.0\n+* Tizen.NET.SDK : 1.0.1\n+* Tizen.NET.TV : 4.4.0.1341\n+\n+### Supported Profile\n+* TV\n+\n+### Author\n+* Manjunatha Kulkarni\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Add Tizen .NET Gamepad Input Sample Application
|
594,239 |
10.01.2018 17:55:33
| -28,800 |
b4c3a30fbd80479dcc356155ba045b7e520c09f3
|
Delete Constants.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FirstScreen/FirstScreen/src/Constants.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using System;\n-\n-namespace FirstScreen\n-{\n- /// <summary>\n- /// Class of constants define some const value.\n- /// </summary>\n- public class Constants\n- {\n- // Number of Poster ScrollContainers to be added on Top Container\n- public const int TotalPostersContainers = 2;\n- // Height Factor of stage height used for Top Container total height\n-\n- public const float TopContainerHeightFactor = 0.38f;\n- // Position Factor of stage height used for Top Container position\n- public const float TopContainerPositionFactor = 0.50f;\n- // Height Factor of stage height used for Top Clip layer height\n- public const float TopClipLayerHeightFactor = 0.34f;\n- // Expanded Height Factor of stage height used for\n- // Top Clip layer height (used when Bottom container is hidden)\n- public const float TopClipLayerExpandHeightFactor = 0.36f;\n- // Height Factor of stage height used for Poster ScrollContainers\n- public const float PostersContainerHeightFactor = 0.32f;\n- // Padding size used between items / images in Poster ScrollContainer\n- public const float PostersContainerPadding = 2.0f;\n- // Extra margin Padding size used between items / images\n- // in Poster ScrollContainer when item / image is focused\n- public const float PostersContainerMargin = 60.0f;\n- // Position Factor of Poster item height used for Poster items / images position\n- public const float PostersContainerOffsetYFactor = 0.17f;\n- // Height Factor of stage height used for Bottom Container total height\n- public const float BottomContainerHeightFactor = 0.16f;\n- // Position Factor of stage height used for Bottom Container position when bottom container is hidden (not focused)\n- public const float BottomContainerHidePositionFactor = 0.88f;\n- // Position Factor of stage height used for Bottom Container position when bottom container is not hidden (focused)\n- public const float BottomContainerShowPositionFactor = 0.84f;\n- // Height Factor of stage height used for Bottom ScrollContainers\n- public const float MenuContainerHeightFactor = 0.16f;\n- // Height Factor of stage height used for Bottom Clip layer height\n- public const float BottomClipLayerHeightFactor = 0.84f;\n- // Padding size used between items / images in Menu ScrollContainer\n- public const float MenuContainerPadding = 10.0f;\n- // Extra margin Padding size used between items / images\n- // in Menu ScrollContainer when item / image is focused\n- public const float MenuContainerMargin = 25.0f;\n- // Position Factor of Menu item height used for Menu items / images position\n- public const float MenuContainerOffsetYFactor = 0.35f;\n- // Width Factor (1/8) of stage Width used for Menu items / images Width\n- public const float MenuItemWidthFactor = 0.125f;\n- // Height Factor of stage height used for Menu items / images Height\n- public const float MenuItemHeightFactor = 0.10f;\n- // Number of Menu items / images used in a Menu ScrollContainer\n- public const float MenuItemsCount = 20;\n- // Width Factor (1/4) of stage Width used for Poster\n- // items / images Width in a Poster ScrollContainer 0\n-\n- public const float Poster0ItemWidthFactor = 0.25f;\n- // Width Factor of stage Width used for\n- // Poster items / images Width in a Poster ScrollContainer 1\n- public const float Poster1ItemWidthFactor = 0.20f;\n- // Height Factor of stage height used for Poster items / images Height\n- public const float PostersItemHeightFactor = 0.24f;\n- // Number of Menu items / images used in a Poster ScrollContainer\n- public const float PostersItemsCount = 24;\n- // Width of Launcher. Launcher is used to\n- // display three images on left of Menu ScrollContainer\n- public const float LauncherWidth = 280.0f;\n- //public const float LauncherWidth = 0.0f;\n- // Extra Spaces to the left of first Launcher item / image\n- public const float LauncherLeftMargin = 40.0f;\n- // Extra area / space to the left of Menu ScrollContainer used for a speration shadow image\n- public const float LauncherSeparatorWidth = 20.0f;\n- // Total number of Launcher items / images\n- public const float LauncherItemsCount = 3.0f;\n- // Width of each Launcher item / image\n- public const float LauncherIconWidth = (LauncherWidth - LauncherLeftMargin - LauncherSeparatorWidth) / LauncherItemsCount;\n- // Duration of Spot Light Animation.\n- public const int SpotLightDuration = 5000;\n- // MilliSecond Duration of Focus Transition Animation.\n- public const int FocusTransitionDuration = 350;\n- // Duration of Focus Animation.\n- public const int FocusDuration = 350;\n- // Duration of Scroll Animation.\n- public const int ScrollDuration = 350;\n- // for target\n- public const string ImageResourcePath = \"/home/owner/apps_rw/org.tizen.example.FirstScreen/res/images/\";\n-\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete Constants.cs
|
594,239 |
10.01.2018 17:56:20
| -28,800 |
8b8007a7bda2a6f4bcc0b4051d38f7f248620277
|
Delete FocusData.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FirstScreen/FirstScreen/src/FocusData.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using Tizen.NUI;\n-using Tizen.NUI.UIComponents;\n-using Tizen.NUI.BaseComponents;\n-using Tizen.NUI.Constants;\n-using System;\n-\n-namespace FirstScreen\n-{\n- /// <summary>\n- /// The class of focus date.\n- /// </summary>\n- public class FocusData\n- {\n- // Name used for FocusData object (mainly to differentiate key frame animation )\n- private string _name;\n- // Image File Name (to be loaded from disk) used for\n- // ImageView used in key frame animation\n- private string _imageName;\n- // ParentOrigin applied to ImageView\n- private Position _parentOrigin;\n- // InitSize used for key frame animation\n- private Vector2 _initSize;\n- // TargetSize used for key frame animation\n- private Vector2 _targetSize;\n- // KeyFrameStart used for key frame animation\n- private float _keyFrameStart;\n- // KeyFrameEnd used for key frame animation\n- private float _keyFrameEnd;\n- // Direction used for key frame animation\n- private Direction _direction;\n- // ImageView used in key frame animation\n- private ImageView _imageFocus;\n-\n- /// <summary>\n- /// Initialize FocusData used for key frame animation\n- /// </summary>\n- /// <param name= \"name\">name</param>\n- /// <param name= \"imageName\">image url</param>\n- /// <param name= \"direction\">direction</param>\n- /// <param name= \"parentOrigin\">parentOrigin</param>\n- /// <param name= \"initSize\">inital size</param>\n- /// <param name= \"targetSize\">target size</param>\n- /// <param name= \"keyFrameStart\">key frame start</param>\n- /// <param name= \"keyFrameEnd\">key frame end</param>\n- public FocusData(string name, string imageName, Direction direction, Position parentOrigin, Size2D initSize,\n- Size2D targetSize, float keyFrameStart, float keyFrameEnd)\n- {\n- _name = name;\n- _imageName = imageName;\n- _parentOrigin = parentOrigin;\n- _initSize = initSize;\n- _targetSize = targetSize;\n- _keyFrameStart = keyFrameStart;\n- _keyFrameEnd = keyFrameEnd;\n- _direction = direction;\n-\n- // Target\n- _imageFocus = new ImageView(Constants.ImageResourcePath + \"/focuseffect/\" + _imageName);\n-\n- // Set _imageFocus's position.\n- _imageFocus.ParentOrigin = _parentOrigin;\n- _imageFocus.PivotPoint = PivotPoint.Center;\n- _imageFocus.PositionUsesPivotPoint = true;\n- _imageFocus.Name = _name;\n- }\n-\n- /// <summary>\n- /// The enum of direction.\n- /// </summary>\n- public enum Direction\n- {\n- Horizontal,\n- Vertical\n- };\n-\n- /// <summary>\n- /// Get/Set FocusDirection\n- /// </summary>\n- public Direction FocusDirection\n- {\n- get { return _direction; }\n- set { _direction = value; }\n- }\n-\n- /// <summary>\n- /// Get/Set Name\n- /// </summary>\n- public string Name\n- {\n- get { return _name; }\n- set { _name = value; }\n- }\n-\n- /// <summary>\n- /// Get/Set _imageName\n- /// </summary>\n- public string ImageName\n- {\n- get { return _imageName; }\n- set { _imageName = value; }\n- }\n-\n- /// <summary>\n- /// Get/Set _parentOrigin\n- /// </summary>\n- public Position ParentOrigin\n- {\n- get\n- {\n- return _parentOrigin;\n- }\n-\n- set\n- {\n- _parentOrigin = value;\n- _imageFocus.ParentOrigin = _parentOrigin;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _initSize\n- /// </summary>\n- public Size2D InitSize\n- {\n- get { return _initSize; }\n- set { _initSize = value; }\n- }\n-\n- /// <summary>\n- /// Get/Set _targetSize\n- /// </summary>\n- public Size2D TargetSize\n- {\n- get { return _targetSize; }\n- set { _targetSize = value; }\n- }\n-\n- /// <summary>\n- /// Get/Set _keyFrameStart\n- /// </summary>\n- public float KeyFrameStart\n- {\n- get { return _keyFrameStart; }\n- set { _keyFrameStart = value; }\n- }\n-\n- /// <summary>\n- /// Get/Set _keyFrameEnd\n- /// </summary>\n- public float KeyFrameEnd\n- {\n- get { return _keyFrameEnd; }\n- set { _keyFrameEnd = value; }\n- }\n-\n- /// <summary>\n- /// Get _imageFocus\n- /// </summary>\n- public ImageView ImageItem\n- {\n- get { return _imageFocus; }\n- }\n-\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete FocusData.cs
|
594,239 |
10.01.2018 17:56:30
| -28,800 |
576a942c77dafe095edc11e7b042f89a21d11154
|
Delete FocusEffect.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FirstScreen/FirstScreen/src/FocusEffect.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using Tizen.NUI;\n-using Tizen.NUI.Constants;\n-using Tizen.NUI.BaseComponents;\n-using System;\n-using System.Collections.Generic;\n-using FirstScreen;\n-\n-namespace FirstScreen\n-{\n- /// <summary>\n- /// The class of focus effect.\n- /// </summary>\n- public class FocusEffect : IFocusEffect\n- {\n- private float _frameThickness;\n- // Each FocusData is used for one key frame\n- // animation (total 6 key frame animations needed for EddenEffect)\n- private FocusData[] _focusData;\n- // Animation used to apply all six key frame animations\n- private Animation _animation;\n-\n- /// <summary>\n- /// The constructor of FocusEffect.\n- /// </summary>\n- public FocusEffect()\n- {\n- _frameThickness = 10.0f;\n- // complete the halo/bottom animation 60% of the way through\n- float _bottomFrameTime = 0.6f;\n- // Start the side frame animation after the bottom\n- // animation and complete at 80% of the way through\n- float _sideFrameTime = 0.8f;\n- // start the top frame animation after the side\n- // frame animation and complete at 100% way through\n- float _topFrameTime = 1.0f;\n-\n- // Six key frame animations (FocusData objects) needed for EddenEffect\n- // Two key frame animations for top horizontal effect\n- // Two key frame animations for bottom horizontal effect\n- // Two key frame animations for vertical horizontal effect\n- _focusData = new FocusData[6];\n-\n- FocusData focusData = new FocusData(\"halo\", \"halo.png\", FocusData.Direction.Horizontal, ParentOrigin.TopCenter,\n- new Vector2(50.0f, 20.0f), new Vector2(0.0f, 100.0f), 0.0f, _bottomFrameTime);\n- _focusData[0] = focusData;\n-\n- focusData = new FocusData(\"bottom\", \"horizontalFrame.png\", FocusData.Direction.Horizontal, ParentOrigin.TopCenter,\n- new Vector2(0.0f, 0.0f), new Vector2(0.0f, _frameThickness), 0.0f, _bottomFrameTime);\n- _focusData[1] = focusData;\n-\n- focusData = new FocusData(\"left\", \"verticalFrame.png\", FocusData.Direction.Vertical, ParentOrigin.BottomLeft,\n- new Vector2(0.0f, 0.0f), new Vector2(_frameThickness, 0.0f), _bottomFrameTime, _sideFrameTime);\n- _focusData[2] = focusData;\n-\n- focusData = new FocusData(\"right\", \"verticalFrame.png\", FocusData.Direction.Vertical, ParentOrigin.BottomRight,\n- new Vector2(0.0f, 0.0f), new Vector2(_frameThickness, 0.0f), _bottomFrameTime, _sideFrameTime);\n- _focusData[3] = focusData;\n-\n- focusData = new FocusData(\"top-left\", \"horizontalFrame.png\", FocusData.Direction.Horizontal, ParentOrigin.BottomLeft,\n- new Vector2(0.0f, 0.0f), new Vector2(0.0f, _frameThickness), _sideFrameTime, _topFrameTime);\n- _focusData[4] = focusData;\n-\n- focusData = new FocusData(\"top-right\", \"horizontalFrame.png\", FocusData.Direction.Horizontal, ParentOrigin.BottomRight,\n- new Vector2(0.0f, 0.0f), new Vector2(0.0f, _frameThickness), _sideFrameTime, _topFrameTime);\n- _focusData[5] = focusData;\n- }\n-\n- /// <summary>\n- /// Sets the focused animation.\n- /// </summary>\n- /// <param name=\"parentItem\">The focus item's parent view</param>\n- /// <param name=\"itemSize\">The size of focus view</param>\n- /// <param name=\"duration\">the duration in milli seconds of the animation.</param>\n- /// <param name=\"direction\">dirction</param>\n- public void FocusAnimation(View parentItem, Vector2 itemSize, int duration, FocusEffectDirection direction)\n- {\n- var itemWidth = itemSize.Width + _frameThickness / 2;\n- var itemHeight = itemSize.Height + _frameThickness / 3;\n-\n- // Clear animation.\n- if (_animation)\n- {\n- _animation.Clear();\n- _animation.Reset();\n- }\n-\n- _animation = new Animation(duration);\n- _animation.Duration = duration;\n-\n- if (direction == FocusEffectDirection.BottomToTop)\n- {\n- _focusData[0].ParentOrigin = ParentOrigin.BottomCenter;\n- _focusData[1].ParentOrigin = ParentOrigin.BottomCenter;\n- _focusData[2].ParentOrigin = ParentOrigin.BottomLeft;\n- _focusData[3].ParentOrigin = ParentOrigin.BottomRight;\n- _focusData[4].ParentOrigin = ParentOrigin.TopLeft;\n- _focusData[5].ParentOrigin = ParentOrigin.TopRight;\n- }\n- else\n- {\n- _focusData[0].ParentOrigin = ParentOrigin.TopCenter;\n- _focusData[1].ParentOrigin = ParentOrigin.TopCenter;\n- _focusData[2].ParentOrigin = ParentOrigin.BottomLeft;\n- _focusData[3].ParentOrigin = ParentOrigin.BottomRight;\n- _focusData[4].ParentOrigin = ParentOrigin.BottomLeft;\n- _focusData[5].ParentOrigin = ParentOrigin.BottomRight;\n- }\n-\n- foreach (FocusData focusData in _focusData)\n- {\n- var currentParent = focusData.ImageItem.Parent;\n-\n- // first parent the controls\n- if (parentItem != currentParent)\n- {\n- parentItem.Add(focusData.ImageItem);\n- }\n-\n- focusData.ImageItem.Size2D = new Vector2(100.0f, 100.0f);\n- parentItem.Add(focusData.ImageItem);\n-\n- Vector2 targetSize = focusData.TargetSize;\n- Vector2 initSize = focusData.InitSize;\n-\n- if (focusData.FocusDirection == FocusData.Direction.Horizontal)\n- {\n- // adjust the width to match the parent\n- targetSize.Width = itemWidth;\n- }\n- else // vertical frame\n- {\n- // adjust the height to match the parent\n- targetSize.Height = itemHeight;\n- }\n-\n- // half the size for the top frame as we come out from both left / right sides\n- if (focusData.Name == \"top-right\" || focusData.Name == \"top-left\")\n- {\n- targetSize.Width = itemWidth - _frameThickness;\n- }\n-\n- KeyFrames keyFrames = new KeyFrames();\n-\n- keyFrames.Add(0.0f, initSize);\n- keyFrames.Add(focusData.KeyFrameStart, initSize);\n- keyFrames.Add(focusData.KeyFrameEnd, targetSize);\n-\n- // for halo add an extra keyframe to shrink it ( in 20% of time after it has finished)\n- if (focusData.Name == \"halo\")\n- {\n- keyFrames.Add(focusData.KeyFrameEnd + 0.2f, initSize);\n- }\n-\n- _animation.AnimateBetween(focusData.ImageItem, \"Size\", keyFrames, Animation.Interpolation.Linear, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n-\n- // Simulate the vertical frame growing from the top.\n- // Vertical items are anchored to the bottom of the parent... so when they grow\n- // we need to move them to the middle of the parent ( otherwise they stick out the bottom)\n- if (focusData.FocusDirection == FocusData.Direction.Vertical)\n- {\n- //animate position as well so it looks like animation is coming from bottom\n- KeyFrames keyFramesV = new KeyFrames();\n-\n- if (direction == FocusEffectDirection.BottomToTop)\n- {\n- keyFramesV.Add(0.0f, 0.0f);\n- keyFramesV.Add(focusData.KeyFrameStart, 0.0f);\n- }\n- else\n- {\n- keyFramesV.Add(0.0f, -itemHeight);\n- keyFramesV.Add(focusData.KeyFrameStart, -itemHeight);\n- }\n-\n- // animate to halfway up the control\n- keyFramesV.Add(focusData.KeyFrameEnd, (-itemHeight / 2));\n-\n-\n- _animation.AnimateBetween(focusData.ImageItem, \"PositionY\", keyFramesV, Animation.Interpolation.Linear, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n-\n- // Simulate the top frame growing from the sides.\n- if (focusData.Name == \"top-left\")\n- {\n- KeyFrames keyFramesTL = new KeyFrames();\n-\n- keyFramesTL.Add(0.0f, 0.0f);\n- keyFramesTL.Add(focusData.KeyFrameStart, 0.0f);\n- // animate to halfway up the control\n- keyFramesTL.Add(focusData.KeyFrameEnd, (itemWidth / 2));\n-\n- // grow these from the left or right\n- _animation.AnimateBetween(focusData.ImageItem, \"PositionX\", keyFramesTL, Animation.Interpolation.Linear, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n-\n- if (focusData.Name == \"top-right\")\n- {\n- KeyFrames keyFramesTR = new KeyFrames();\n-\n- keyFramesTR.Add(0.0f, 0.0f);\n- keyFramesTR.Add(focusData.KeyFrameStart, 0.0f);\n- // animate to halfway up the control\n- keyFramesTR.Add(focusData.KeyFrameEnd, (-itemWidth / 2));\n-\n- // grow these from the left or right\n- _animation.AnimateBetween(focusData.ImageItem, \"PositionX\", keyFramesTR, Animation.Interpolation.Linear, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n-\n- }\n-\n- _animation.Finished += OnAnimationFinished;\n-\n- _animation.Play();\n- }\n- }\n-\n- /// <summary>\n- /// Callback by _animation.\n- /// </summary>\n- /// <param name=\"source\">_animation</param>\n- /// <param name=\"e\">event</param>\n- private void OnAnimationFinished(object source, EventArgs e)\n- {\n- foreach (FocusData focusData in _focusData)\n- {\n- var currentParent = focusData.ImageItem.Parent;\n-\n- if (currentParent)\n- {\n- currentParent.Remove(focusData.ImageItem);\n- }\n- }\n- }\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete FocusEffect.cs
|
594,239 |
10.01.2018 17:56:39
| -28,800 |
4dd47abeb96391bc4c633aa0ef7e925d24fc0c7e
|
Delete IFocusEffect.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FirstScreen/FirstScreen/src/IFocusEffect.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using Tizen.NUI;\n-using System;\n-using Tizen.NUI.BaseComponents;\n-\n-namespace FirstScreen\n-{\n- /// <summary>\n- /// The enum of focus effect direction.\n- /// </summary>\n- public enum FocusEffectDirection\n- {\n- TopToBottom,\n- BottomToTop\n- };\n-\n- public interface IFocusEffect\n- {\n- void FocusAnimation(View parentItem, Vector2 itemSize, int duration, FocusEffectDirection direction);\n- }\n-}\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete IFocusEffect.cs
|
594,239 |
10.01.2018 17:57:02
| -28,800 |
88cec1b13448330709e238edf39a7e4602a4637a
|
Delete ScrollContainer.cs
|
[
{
"change_type": "DELETE",
"old_path": "TV/FirstScreen/FirstScreen/src/ScrollContainer.cs",
"new_path": null,
"diff": "-/*\n- * Copyright (c) 2017 Samsung Electronics Co., Ltd.\n- *\n- * Licensed under the Apache License, Version 2.0 (the \"License\");\n- * you may not use this file except in compliance with the License.\n- * You may obtain a copy of the License at\n- *\n- * http://www.apache.org/licenses/LICENSE-2.0\n- *\n- * Unless required by applicable law or agreed to in writing, software\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n- * See the License for the specific language governing permissions and\n- * limitations under the License.\n- *\n- */\n-\n-using Tizen.NUI;\n-using Tizen.NUI.Constants;\n-using Tizen.NUI.UIComponents;\n-using Tizen.NUI.BaseComponents;\n-using System;\n-using System.Runtime.InteropServices;\n-using System.Collections.Generic;\n-\n-namespace FirstScreen\n-{\n- /// <summary>\n- /// The class of ScrollContainer.\n- /// </summary>\n- public class ScrollContainer : CustomView\n- {\n- // View Container will be the first item added to ScrollContainer\n- // and parent to all the items added to the ScrollContainer.\n- private View _container;\n- // Size of the item / images added to the ScrollContainer.\n- private Size2D _itemSize;\n- // List collection of View items/images added to the ScrollContainer.\n- private List<View> _itemList;\n- // Number of items / images added to the ScrollContainer.\n- private int _itemCount;\n- // Index of currently focused View item / image on the ScrollContainer.\n- private int _focusedItem;\n- // Used for horizontal scroll position.\n- private float _currentScrollPosition;\n- // Used for gap / padding between items / images on the ScrollContainer.\n- private float _gap;\n- // Width of the ScrollContainer.\n- private float _width;\n- // Height of the ScrollContainer.\n- private float _height;\n- // Flag to check if ScrollContainer is enabled or not.\n- private bool _isFocused;\n- // Extra horizontal margin is used to add an extra gap between\n- // items / images after a focused and scaled item / image.\n- private float _marginX;\n- // Extra vertical margin (not used at the moment).\n- private float _marginY;\n- // Vertical Position offset Factor of item height.\n- private float _offsetYFactor;\n- // Horizontal Position offset of ScrollContainer.\n- private float _offsetX;\n- // Reference to Dali stage.\n- private Window _stage;\n- // Reference to Dali stage size.\n- private Size2D _stageSize;\n- // Reference to Shadow border ImageView applied to the focused item on ScrollContainer.\n- private ImageView _shadowBorder;\n- // Reference to SpotLight ImageView applied to the focused item on ScrollContainer.\n- private ImageView _spotLight;\n- // SpotLight Animation applied to the focused item on ScrollContainer.\n- private Animation _spotLightAnimation;\n- // Focused position animation on ScrollContainer.\n- private Animation _focusAnimation;\n- // Scroll animation on items of ScrollContainer.\n- private Animation _scrollAnimation;\n- // Focus Transition (scaling /unscaling) animation on items of ScrollContainer.\n- private Animation _focusTransitionAnimation;\n- // Circular path used for SpotLight Animation\n- // applied to the focused item on ScrollContainer.\n- private Path _circularPath;\n-\n- static CustomView CreateInstance()\n- {\n- return new ScrollContainer();\n- }\n-\n- /// <summary>\n- /// static constructor registers the control type (for user can add kinds of visuals to it)\n- /// </summary>\n- static ScrollContainer()\n- {\n- // ViewRegistry registers control type with DALi type registery\n- // also uses introspection to find any properties that need to be registered with type registry\n- //ViewRegistry.Instance.Register(CreateInstance, typeof(ScrollContainer));\n- CustomViewRegistry.Instance.Register(CreateInstance, typeof(ScrollContainer));\n- }\n-\n- /// <summary>\n- /// The constructor of scrollContainer.\n- /// </summary>\n- public ScrollContainer() : base(typeof(ScrollContainer).FullName, CustomViewBehaviour.DisableStyleChangeSignals |\n- CustomViewBehaviour.RequiresKeyboardNavigationSupport)\n- {\n- }\n-\n- /// <summary>\n- /// Get _isFocused.\n- /// </summary>\n- public bool IsFocused\n- {\n- get\n- {\n- return _isFocused;\n- }\n- }\n-\n- /// <summary>\n- /// Get _container.\n- /// </summary>\n- public Tizen.NUI.BaseComponents.View Container\n- {\n- get\n- {\n- return _container;\n- }\n- }\n-\n- /// <summary>\n- /// Get _itemCount.\n- /// </summary>\n- public int ItemCount\n- {\n- get\n- {\n- return _itemCount;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _itemSize.\n- /// </summary>\n- public Size2D ItemSize\n- {\n- get\n- {\n- return _itemSize;\n- }\n-\n- set\n- {\n- _itemSize = value;\n-\n- Position topLeft = new Position(-0.25f * _itemSize.Width, -0.25f * _itemSize.Height, 0.0f);\n- Position topRight = new Position(0.25f * _itemSize.Width, -0.25f * _itemSize.Height, 0.0f);\n- Position bottomRight = new Position(0.25f * _itemSize.Width, 0.25f * _itemSize.Height, 0.0f);\n- Position bottomLeft = new Position(-0.25f * _itemSize.Width, 0.25f * _itemSize.Height, 0.0f);\n-\n- _circularPath = new Path();\n- _circularPath.AddPoint(topLeft);\n- _circularPath.AddPoint(topRight);\n- _circularPath.AddPoint(bottomRight);\n- _circularPath.AddPoint(bottomLeft);\n- _circularPath.AddPoint(topLeft);\n- _circularPath.GenerateControlPoints(0.5f);\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _gap.\n- /// </summary>\n- public float Gap\n- {\n- get\n- {\n- return _gap;\n- }\n-\n- set\n- {\n- _gap = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _marginX.\n- /// </summary>\n- public float MarginX\n- {\n- get\n- {\n- return _marginX;\n- }\n-\n- set\n- {\n- _marginX = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _offsetYFactor.\n- /// </summary>\n- public float OffsetYFator\n- {\n- get\n- {\n- return _offsetYFactor;\n- }\n-\n- set\n- {\n- _offsetYFactor = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _offsetX.\n- /// </summary>\n- public float OffsetX\n- {\n- get\n- {\n- return _offsetX;\n- }\n-\n- set\n- {\n- _offsetX = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _marginY.\n- /// </summary>\n- public float MarginY\n- {\n- get\n- {\n- return _marginY;\n- }\n-\n- set\n- {\n- _marginY = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _width.\n- /// </summary>\n- public float Width\n- {\n- get\n- {\n- return _width;\n- }\n-\n- set\n- {\n- _width = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _height.\n- /// </summary>\n- public float Height\n- {\n- get\n- {\n- return _height;\n- }\n-\n- set\n- {\n- _height = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _shadowBorder.\n- /// </summary>\n- public ImageView ShadowBorder\n- {\n- get\n- {\n- return _shadowBorder;\n- }\n-\n- set\n- {\n- _shadowBorder = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get/Set _spotLight.\n- /// </summary>\n- public ImageView SpotLight\n- {\n- get\n- {\n- return _spotLight;\n- }\n-\n- set\n- {\n- _spotLight = value;\n- }\n- }\n-\n- /// <summary>\n- /// Get _focusedItem.\n- /// </summary>\n- public int FocusedItemID\n- {\n- get\n- {\n- if (_focusedItem < 0)\n- {\n- _focusedItem = 0;\n- }\n-\n- return _focusedItem;\n- }\n- }\n-\n- /// <summary>\n- /// This override method is called automatically after the Control has been initialized.\n- /// Any second phase initialization is done here.\n- /// </summary>\n- public override void OnInitialize()\n- {\n- _itemSize = new Size2D(0, 0);\n- _gap = 0.0f;\n- _width = 0.0f;\n- _height = 0.0f;\n- _currentScrollPosition = 0.0f;\n- _itemCount = 0;\n- _focusedItem = -1;\n- _isFocused = false;\n- _marginX = 50.0f;\n- _marginY = 0.0f;\n- _offsetYFactor = 0.0f;\n- _offsetX = 0.0f;\n-\n- _container = new View();\n- this.Add(_container);\n-\n- _itemList = new List<View>();\n-\n- this.ParentOrigin = Tizen.NUI.ParentOrigin.TopLeft;\n- this.PivotPoint = Tizen.NUI.PivotPoint.TopLeft;\n- this.WidthResizePolicy = ResizePolicyType.FillToParent;\n- this.HeightResizePolicy = ResizePolicyType.FillToParent;\n- this.Focusable = (true);\n-\n- _container.ParentOrigin = Tizen.NUI.ParentOrigin.TopLeft;\n- _container.Position = new Position(0, 50, 0);\n- _container.PivotPoint = Tizen.NUI.PivotPoint.TopLeft;\n- _container.WidthResizePolicy = ResizePolicyType.FillToParent;\n- _container.HeightResizePolicy = ResizePolicyType.FillToParent;\n-\n- _stage = Window.Instance;\n- _stageSize = _stage.Size;\n-\n- _spotLightAnimation = new Animation(Constants.SpotLightDuration);\n- _focusTransitionAnimation = new Animation(Constants.FocusTransitionDuration);\n- _focusAnimation = new Animation(Constants.FocusDuration);\n- _focusAnimation.EndAction = Animation.EndActions.StopFinal;\n- _scrollAnimation = new Animation(Constants.ScrollDuration);\n- _scrollAnimation.EndAction = Animation.EndActions.StopFinal;\n-\n- //changed to internal\n- //EnableGestureDetection(Gesture.Type.Pan);\n- }\n-\n- /// <summary>\n- /// This will be invoked automatically if an item/image is added to the ScrollContainer\n- /// </summary>\n- /// <param name=\"actor\">the child view</param>\n- public override void OnChildAdd(View actor)\n- {\n- View item = actor;\n- //View item = actor as View;\n-\n- if (item is View && item != _container)\n- {\n- item.PivotPoint = Tizen.NUI.PivotPoint.BottomCenter;\n- item.PositionUsesPivotPoint = true;\n- item.ParentOrigin = Tizen.NUI.ParentOrigin.BottomCenter;\n-\n- item.Size2D = _itemSize;\n- item.HeightResizePolicy = ResizePolicyType.Fixed;\n- item.WidthResizePolicy = ResizePolicyType.Fixed;\n- item.Focusable = (true);\n- item.Position = GetItemPosition(_itemCount, _currentScrollPosition);\n- item.Name = _itemCount.ToString();\n-\n- _container.Add(item);\n- _itemList.Add(item);\n-\n- _itemCount++;\n- }\n- }\n-\n- /// <summary>\n- /// This will be invoked automatically if an item/image\n- /// is removed from the ScrollContainer\n- /// </summary>\n- /// <param name=\"actor\">the child view will be removed</param>\n- public override void OnChildRemove(View actor)\n- {\n- View item = actor;\n-\n- if (item is View && item != _container)\n- {\n- _container.Remove(item);\n-\n- _itemCount--;\n- _itemList.Remove(item);\n- }\n- }\n-\n- /// <summary>\n- /// This override function supports two dimensional keyboard navigation.\n- /// This function returns the next keyboard focusable actor in ScrollContainer control towards the given direction.\n- /// </summary>\n- /// <param name=\"currentFocusedView\">current Focused View</param>\n- /// <param name=\"direction\">direction</param>\n- /// <param name=\"loopEnabled\">loop Enabled</param>\n- /// <returns>the next keyboard focusable actor in ScrollContainer control towards the given direction</returns>returns>\n- public override View GetNextFocusableView(View currentFocusedView, View.FocusDirection direction, bool loopEnabled)\n- {\n- if (direction == View.FocusDirection.Left)\n- {\n- return FocusPrevious(loopEnabled);\n- }\n- else if (direction == View.FocusDirection.Right)\n- {\n- return FocusNext(loopEnabled);\n- }\n- else\n- {\n- return currentFocusedView;\n- }\n- }\n-\n- public override void OnFocusChangeCommitted(View commitedFocusableView)\n- {\n- Focus(_focusedItem);\n- }\n-\n-\n- // This override function is invoked before chosen focusable actor will be focused.\n- // This allows the application to preform any actions (i.e. Scroll and SpotLight animations) before the focus is actually moved to the chosen actor.\n-\n- // This override function is invoked whenever a pan gesture is detected on this control.\n- // Perform Scroll Animation based upon pan gesture velocity / speed.\n- /*public override void OnPan(PanGesture pan)\n- {\n- return; //currently not used\n- }*/\n-\n- /// <summary>\n- /// This function returns current focused view\n- /// </summary>\n- /// <returns>\n- /// current focused view.\n- /// </returns>\n- public View GetCurrentFocusedActor()\n- {\n- if (_focusedItem < 0)\n- {\n- _focusedItem = 0;\n- }\n-\n- return _itemList[_focusedItem];\n- }\n-\n- /// <summary>\n- /// This function returns current focused view\n- /// </summary>\n- /// <param name=\"focused\">focused?</param>\n- public void SetFocused(bool focused)\n- {\n- _isFocused = focused;\n-\n- // Perform Focus animation if the ScrollContainer is not focused already\n- if (!_isFocused)\n- {\n- _focusTransitionAnimation.Clear();\n-\n- for (int i = 0; i < _itemList.Count; ++i)\n- {\n- Position targetPosition = GetItemPosition(i, _currentScrollPosition);\n-\n- _focusTransitionAnimation.AnimateTo(_itemList[i], \"Position\", targetPosition, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n-\n- _focusTransitionAnimation.AnimateTo(_itemList[i], \"Scale\", new Vector3(1.0f, 1.0f, 1.0f), new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n-\n- _focusTransitionAnimation.Play();\n- }\n- else\n- {\n- Focus(_focusedItem);\n- }\n- }\n-\n- /// <summary>\n- /// Obtain ID of first visible item/image on the screen of the ScrollContainer\n- /// </summary>\n- /// <returns>\n- /// Obtain ID of first visible item/image on the screen of the ScrollContainer\n- /// </returns>\n- private int GetFirstVisibleItemId()\n- {\n- int firstItemId = -1;\n-\n- if (_isFocused)\n- {\n- firstItemId = (int)Math.Floor((-1.0 * _currentScrollPosition + _marginX * 2.0f) / (_itemSize.Width + _gap));\n- }\n- else\n- {\n- firstItemId = (int)Math.Floor(-1.0 * _currentScrollPosition / (_itemSize.Width + _gap));\n- }\n-\n- if (firstItemId < 0)\n- {\n- firstItemId = 0;\n- }\n-\n- return firstItemId;\n- }\n-\n- /// <summary>\n- /// Obtain ID of last visible item/image on the screen of the ScrollContainer\n- /// </summary>\n- /// <returns>\n- /// Obtain ID of last visible item/image on the screen of the ScrollContainer\n- /// </returns>\n- private int GetLastVisibleItemId()\n- {\n- int lastItemId = -1;\n-\n- if (_isFocused)\n- {\n- lastItemId = (int)Math.Ceiling(((_width - _currentScrollPosition - _marginX * 2.0f) / _itemSize.Width) - 1);\n- }\n- else\n- {\n- lastItemId = (int)Math.Ceiling(((_width - _currentScrollPosition) / _itemSize.Width) - 1);\n- }\n-\n- if (lastItemId >= _itemList.Count)\n- {\n-\n- lastItemId = _itemList.Count - 1;\n- }\n-\n- return lastItemId;\n- }\n-\n- /// <summary>\n- /// Obtain Next item/image (Right of the currently focused item) of the ScrollContainer\n- /// </summary>\n- /// <param name=\"loopEnabled\">loop Enabled</param>\n- /// <returns>\n- /// Obtain Next item/image (Right of the currently focused item) of the ScrollContainer\n- /// </returns>\n- private View FocusNext(bool loopEnabled)\n- {\n- int nextItem = -1;\n-\n- if (_focusedItem < GetFirstVisibleItemId() || _focusedItem > GetLastVisibleItemId())\n- {\n- nextItem = GetFirstVisibleItemId();\n- }\n- else\n- {\n- nextItem = _focusedItem + 1;\n- }\n-\n- if (nextItem >= _itemList.Count)\n- {\n- if (loopEnabled)\n- {\n- nextItem = 0;\n- }\n- else\n- {\n- nextItem = _itemList.Count - 1;\n- }\n- }\n-\n- _focusedItem = nextItem;\n- return _itemList[_focusedItem];\n- }\n-\n- /// <summary>\n- /// Obtain Previous item/image (left of the currently focused item) of the ScrollContainer\n- /// </summary>\n- /// <param name=\"loopEnabled\">loop Enabled</param>\n- /// <returns>\n- /// Obtain Previous item/image (left of the currently focused item) of the ScrollContainer\n- /// </returns>\n- private View FocusPrevious(bool loopEnabled)\n- {\n- int previousItem = -1;\n-\n- if (_focusedItem < GetFirstVisibleItemId() || _focusedItem > GetLastVisibleItemId())\n- {\n- previousItem = GetFirstVisibleItemId();\n- }\n- else\n- {\n- previousItem = _focusedItem - 1;\n- }\n-\n- if (previousItem < 0)\n- {\n- if (loopEnabled)\n- {\n- previousItem = _itemList.Count - 1;\n- }\n- else\n- {\n- previousItem = 0;\n- }\n- }\n-\n- _focusedItem = previousItem;\n- return _itemList[_focusedItem];\n- }\n-\n- /// <summary>\n- /// Perform ScrollAnimation on each item\n- /// </summary>\n- /// <param name=\"amount\">amount</param>\n- /// <param name=\"baseItem\">base item</param>\n- private void Scroll(float amount, int baseItem)\n- {\n- float tagetScrollPosition = _currentScrollPosition + amount;\n- float totalItemSize = _itemList.Count * (_itemSize.Width + _gap) + _gap + (_marginX * 2.0f);\n-\n- float maxScrollPosition = _width - totalItemSize;\n-\n- if (tagetScrollPosition < maxScrollPosition)\n- {\n- tagetScrollPosition = maxScrollPosition;\n- }\n-\n- if (tagetScrollPosition > 0.0f)\n- {\n- tagetScrollPosition = 0.0f;\n- }\n-\n- _scrollAnimation.Clear();\n-\n- for (int i = 0; i < _itemList.Count; ++i)\n- {\n- Position targetPosition = GetItemPosition(i, tagetScrollPosition);\n-\n- _scrollAnimation.AnimateTo(_itemList[i], \"Position\", targetPosition, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n-\n- _currentScrollPosition = tagetScrollPosition;\n- _scrollAnimation.Play();\n- }\n-\n- /// <summary>\n- /// This function uses ItemId as next FocusedItem\n- /// and preforms Scroll and SpotLight animations on that item.\n- /// </summary>\n- /// <param name=\"itemId\">item id</param>\n- private void Focus(int itemId)\n- {\n-\n- if (itemId < 0)\n- {\n- itemId = 0;\n- }\n- else if (itemId >= _itemList.Count)\n- {\n- itemId = _itemList.Count - 1;\n- }\n- FocusManager.Instance.SetCurrentFocusView(_itemList[itemId]);\n- // Perform Spot Light animation\n- if (_focusedItem != itemId && _spotLight != null)\n- {\n- _spotLightAnimation.Clear();\n- _spotLightAnimation.AnimatePath(_spotLight, _circularPath, new Vector3(0.0f, 0.0f, 0.0f));\n- _spotLightAnimation.Looping = true;\n- _spotLightAnimation.Play();\n- }\n-\n- _focusedItem = itemId;\n-\n- Position itemPosition = GetItemPosition(_focusedItem, _currentScrollPosition);\n-\n- _focusAnimation.Clear();\n-\n- float relativeItemPositionX = itemPosition.X - _itemSize.Width * 0.5f + (_stageSize.Width * 0.5f) + _offsetX;\n- if (relativeItemPositionX < _marginX + _offsetX + _gap)\n- {\n- float amount = _marginX + _offsetX + _gap - relativeItemPositionX;\n- Scroll(amount, itemId + 1); // Perform Scroll animation\n- }\n- else if (relativeItemPositionX + _itemSize.Width + _gap + _marginX > _stageSize.Width)\n- {\n- float amount = relativeItemPositionX + _marginX + _gap + _itemSize.Width - _stageSize.Width;\n- Scroll(-amount, itemId - 1); // Perform Scroll animation\n- }\n- else\n- {\n- // Perform animation when item is focused\n- for (int i = 0; i < _itemList.Count; ++i)\n- {\n- Position targetPosition = GetItemPosition(i, _currentScrollPosition);\n-\n- _focusAnimation.AnimateTo(_itemList[i], \"Position\", targetPosition, new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n- }\n-\n- for (int i = 0; i < _itemList.Count; ++i)\n- {\n- // Perform scale animation on Focused item\n- if (i == _focusedItem)\n- {\n- _focusAnimation.AnimateTo(_itemList[i], \"Scale\", new Vector3(1.2f, 1.2f, 1.2f), new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n- else\n- {\n-\n- _focusAnimation.AnimateTo(_itemList[i], \"Scale\", new Vector3(1.0f, 1.0f, 1.0f), new AlphaFunction(AlphaFunction.BuiltinFunctions.EaseOutSine));\n- }\n- }\n-\n- _focusAnimation.Play();\n-\n- }\n-\n- /// <summary>\n- /// Calculate Position of any item/image of ScrollContainer\n- /// </summary>\n- /// <param name=\"itemId\">item id</param>\n- /// <param name=\"scrollPosition\">scroll position</param>\n- /// <returns>\n- /// Position of any item/image of ScrollContainer\n- /// </returns>\n- private Position GetItemPosition(int itemId, float scrollPosition)\n- {\n- if (_isFocused)\n- {\n- // used (_itemSize.Width * 0.5f) because of AnchorPointCenter\n- // used (_stageSize.Width * 0.5f) because of ParentOriginCenter\n- if (_focusedItem > itemId)\n- {\n- float positionX = (_itemSize.Width * itemId) + (_gap * (itemId + 1)) + scrollPosition + (_itemSize.Width * 0.5f) - (_stageSize.Width * 0.5f);\n- return new Position(positionX, -_itemSize.Height * _offsetYFactor, 0.0f);\n- }\n- else if (_focusedItem == itemId)\n- {\n- float positionX = (_itemSize.Width * itemId) + (_gap * (itemId + 1)) + scrollPosition + _marginX + (_itemSize.Width * 0.5f) - (_stageSize.Width * 0.5f);\n- return new Position(positionX, -_itemSize.Height * _offsetYFactor, 0.0f);\n- }\n- else\n- {\n- float positionX = (_itemSize.Width * itemId) + (_gap * (itemId + 1)) + scrollPosition + _marginX * 2.0f + (_itemSize.Width * 0.5f) - (_stageSize.Width * 0.5f);\n- return new Position(positionX, -_itemSize.Height * _offsetYFactor, 0.0f);\n- }\n- }\n- else\n- {\n- float positionX = (_itemSize.Width * itemId) + (_gap * (itemId + 1)) + scrollPosition + (_itemSize.Width * 0.5f) - (_stageSize.Width * 0.5f);\n- return new Position(positionX, -_itemSize.Height * _offsetYFactor, 0.0f);\n- }\n- }\n-\n-\n- }\n-\n-}\n-\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Delete ScrollContainer.cs
|
594,276 |
11.01.2018 17:27:27
| -32,400 |
130446c90adaa640ff134b63dbaaf50606443842
|
Remove GamepadInputSample from here and add to SamsungDForum
|
[
{
"change_type": "DELETE",
"old_path": "TV/GamepadInputSample/GamepadInputSample/shared/res/GamepadInputSample.png",
"new_path": "TV/GamepadInputSample/GamepadInputSample/shared/res/GamepadInputSample.png",
"diff": "Binary files a/TV/GamepadInputSample/GamepadInputSample/shared/res/GamepadInputSample.png and /dev/null differ\n"
},
{
"change_type": "DELETE",
"old_path": "TV/GamepadInputSample/README.md",
"new_path": null,
"diff": "-# GamepadInputSample\n-GamepadInputSample is a sample application to demontrate the use of Tizen .NET Gamepad APIs.\n-\n-## License\n-Copyright (c) 2017 Samsung Electronics Co., Ltd.\n-\n-Licensed under the Apache License, Version 2.0 (the \"License\");\n-you may not use this file except in compliance with the License.\n-You may obtain a copy of the License at\n-\n-http://www.apache.org/licenses/LICENSE-2.0\n-\n-Unless required by applicable law or agreed to in writing, software\n-distributed under the License is distributed on an \"AS IS\" BASIS,\n-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n-See the License for the specific language governing permissions and\n-limitations under the License.\n-\n-### Verified Version\n-* Microsoft.NETCore.App : 2.0.0\n-* Tizen.NET : 4.0.0\n-* Tizen.NET.SDK : 1.0.1\n-* Tizen.NET.TV : 4.4.0.1341\n-\n-### Supported Profile\n-* TV\n-\n-### Author\n-* Manjunatha Kulkarni\n\\ No newline at end of file\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
Remove GamepadInputSample from here and add to SamsungDForum
|
594,218 |
27.11.2017 18:03:05
| -3,600 |
8231f4da78ead212ac51c86c8a70f2a45e1c65e6
|
[SecureRepository] Add Screenshots
|
[
{
"change_type": "ADD",
"old_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png",
"new_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png",
"diff": "Binary files /dev/null and b/Mobile/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png differ\n"
},
{
"change_type": "ADD",
"old_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png",
"new_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png",
"diff": "Binary files /dev/null and b/Mobile/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png differ\n"
},
{
"change_type": "ADD",
"old_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_TV.png",
"new_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_TV.png",
"diff": "Binary files /dev/null and b/TV/SecureRepository/Screenshots/Tizen/main_screen_TV.png differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png",
"new_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png",
"diff": "Binary files /dev/null and b/Wearable/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png differ\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[SecureRepository] Add Screenshots
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>
|
594,218 |
28.11.2017 14:44:06
| -3,600 |
889474156b237e2e4195009b5aeb3e009bf0aef6
|
[SecureRepository] Change Xamarin.Forms.Platform.Tizen and Xamarin.Forms version to 2.4.0.91020
|
[
{
"change_type": "MODIFY",
"old_path": "Mobile/SecureRepository/SecureRepository/SecureRepository.Tizen.Mobile/SecureRepository.Tizen.Mobile.csproj",
"new_path": "Mobile/SecureRepository/SecureRepository/SecureRepository.Tizen.Mobile/SecureRepository.Tizen.Mobile.csproj",
"diff": "<ExcludeAssets>Runtime</ExcludeAssets>\n</PackageReference>\n<PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n- <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.5.0.77107\" />\n+ <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Mobile/SecureRepository/SecureRepository/SecureRepository/SecureRepository.csproj",
"new_path": "Mobile/SecureRepository/SecureRepository/SecureRepository/SecureRepository.csproj",
"diff": "<!-- Include Nuget Package for Xamarin building -->\n<ItemGroup>\n- <PackageReference Include=\"Xamarin.Forms\" Version=\"2.5.0.91635\" />\n+ <PackageReference Include=\"Xamarin.Forms\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "TV/SecureRepository/SecureRepository/SecureRepository.Tizen.TV/SecureRepository.Tizen.TV.csproj",
"new_path": "TV/SecureRepository/SecureRepository/SecureRepository.Tizen.TV/SecureRepository.Tizen.TV.csproj",
"diff": "<ExcludeAssets>Runtime</ExcludeAssets>\n</PackageReference>\n<PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n- <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.5.0.77107\" />\n+ <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "TV/SecureRepository/SecureRepository/SecureRepository/SecureRepository.csproj",
"new_path": "TV/SecureRepository/SecureRepository/SecureRepository/SecureRepository.csproj",
"diff": "<!-- Include Nuget Package for Xamarin building -->\n<ItemGroup>\n- <PackageReference Include=\"Xamarin.Forms\" Version=\"2.5.0.91635\" />\n+ <PackageReference Include=\"Xamarin.Forms\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Wearable/SecureRepository/SecureRepository/SecureRepository.Tizen.Wearable/SecureRepository.Tizen.Wearable.csproj",
"new_path": "Wearable/SecureRepository/SecureRepository/SecureRepository.Tizen.Wearable/SecureRepository.Tizen.Wearable.csproj",
"diff": "<ExcludeAssets>Runtime</ExcludeAssets>\n</PackageReference>\n<PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n- <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.18342\" />\n+ <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Wearable/SecureRepository/SecureRepository/SecureRepository/SecureRepository.csproj",
"new_path": "Wearable/SecureRepository/SecureRepository/SecureRepository/SecureRepository.csproj",
"diff": "<!-- Include Nuget Package for Xamarin building -->\n<ItemGroup>\n- <PackageReference Include=\"Xamarin.Forms\" Version=\"2.4.0.18342\" />\n+ <PackageReference Include=\"Xamarin.Forms\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n</Project>\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[SecureRepository] Change Xamarin.Forms.Platform.Tizen and Xamarin.Forms version to 2.4.0.91020
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>
|
594,218 |
28.11.2017 15:23:55
| -3,600 |
034fa38009a4b62ad22a31cb583bacf3f6cd6c0e
|
[SecureRepository] Add screenshots from each platform to eachother
|
[
{
"change_type": "ADD",
"old_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_TV.png",
"new_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_TV.png",
"diff": "Binary files /dev/null and b/Mobile/SecureRepository/Screenshots/Tizen/main_screen_TV.png differ\n"
},
{
"change_type": "ADD",
"old_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png",
"new_path": "Mobile/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png",
"diff": "Binary files /dev/null and b/Mobile/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png differ\n"
},
{
"change_type": "ADD",
"old_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png",
"new_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png",
"diff": "Binary files /dev/null and b/TV/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png differ\n"
},
{
"change_type": "ADD",
"old_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png",
"new_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png",
"diff": "Binary files /dev/null and b/TV/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png differ\n"
},
{
"change_type": "ADD",
"old_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png",
"new_path": "TV/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png",
"diff": "Binary files /dev/null and b/TV/SecureRepository/Screenshots/Tizen/main_screen_Wearable.png differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png",
"new_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png",
"diff": "Binary files /dev/null and b/Wearable/SecureRepository/Screenshots/Tizen/main_screen_Mobile.png differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png",
"new_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png",
"diff": "Binary files /dev/null and b/Wearable/SecureRepository/Screenshots/Tizen/main_screen_Mobile_vertical.png differ\n"
},
{
"change_type": "ADD",
"old_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_TV.png",
"new_path": "Wearable/SecureRepository/Screenshots/Tizen/main_screen_TV.png",
"diff": "Binary files /dev/null and b/Wearable/SecureRepository/Screenshots/Tizen/main_screen_TV.png differ\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[SecureRepository] Add screenshots from each platform to eachother
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>
|
594,218 |
28.11.2017 16:30:05
| -3,600 |
9f131daf60a9a170258618944e4b6028f3342670
|
[SecureRepository] Add README.md
|
[
{
"change_type": "ADD",
"old_path": null,
"new_path": "Mobile/SecureRepository/README.md",
"diff": "+# SecureRepository\n+## Overview\n+SecureRepository is a simple application that allows you to securely store data, certificates and cryptographic keys\n+using C# [Tizen.Security.SecureRepository API](https://developer.tizen.org/dev-guide/csapi/api/Tizen.Security.SecureRepository.html).\n+\n+Secure Repository function is provided by [key-manager](https://wiki.tizen.org/Security/Tizen_3.X_Key_Manager) module in Tizen.\n+\n+Secure Repository app is mainly designed for Tizen TV and Mobile profile however it also runs on Wearable devices but with limited UI.\n+What`s more it is written in [XAML](https://developer.xamarin.com/guides/xamarin-forms/xaml/).\n+It has a custom layout and shows how events are processed in the application.\n+It also uses [DependencyService](https://developer.xamarin.com/guides/xamarin-forms/application-fundamentals/dependency-service/)\n+and [Binding](https://developer.xamarin.com/guides/xamarin-forms/xaml/xaml-basics/data_binding_basics/).\n+\n+Please be aware that in production type application you should use longer cryptographic keys.\n+In sample app the Keys length are intentionally lowered to increase application responsiveness.\n+\n+## Sample Usage\n+1. Click Add button to add sample data to key-manager. ListView with items should pop up.\n+2. Click on item. Label with item type and content prefix should appear.\n+3. Click remove button to remove data from key-manager. ListView should be cleared.\n+4. Click encrypt button to add AES-Key to key-manager and them use it to encrypt sample data.\n+ListView with AES-Key should pop up. First label should show Encrypted text prefix\n+and the second one text before encryption and after decryption.\n+\n+\n+## Verified Version\n+* [Xamarin.Forms](https://www.xamarin.com/forms) : 2.4.0.91020\n+* [Xamarin.Platform.Tizen](https://www.xamarin.com/forms) : 2.4.0.91020\n+* [Tizen.NET](https://www.tizen.org/) : 4.0.0\n+* [Tizen.NET.SDK](https://www.tizen.org/) : 1.0.0\n+\n+## Supported Profile\n+* Mobile\n+* TV\n+* Wearable\n+\n+## Author\n+* Ernest Borowski\n+\n+## Screenshots\n+### Mobile\n+\n+\n+### TV\n+\n+### Wearable\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "TV/SecureRepository/README.md",
"diff": "+# SecureRepository\n+## Overview\n+SecureRepository is a simple application that allows you to securely store data, certificates and cryptographic keys\n+using C# [Tizen.Security.SecureRepository API](https://developer.tizen.org/dev-guide/csapi/api/Tizen.Security.SecureRepository.html).\n+\n+Secure Repository function is provided by [key-manager](https://wiki.tizen.org/Security/Tizen_3.X_Key_Manager) module in Tizen.\n+\n+Secure Repository app is mainly designed for Tizen TV and Mobile profile however it also runs on Wearable devices but with limited UI.\n+What`s more it is written in [XAML](https://developer.xamarin.com/guides/xamarin-forms/xaml/).\n+It has a custom layout and shows how events are processed in the application.\n+It also uses [DependencyService](https://developer.xamarin.com/guides/xamarin-forms/application-fundamentals/dependency-service/)\n+and [Binding](https://developer.xamarin.com/guides/xamarin-forms/xaml/xaml-basics/data_binding_basics/).\n+\n+Please be aware that in production type application you should use longer cryptographic keys.\n+In sample app the Keys length are intentionally lowered to increase application responsiveness.\n+\n+## Sample Usage\n+1. Click Add button to add sample data to key-manager. ListView with items should pop up.\n+2. Click on item. Label with item type and content prefix should appear.\n+3. Click remove button to remove data from key-manager. ListView should be cleared.\n+4. Click encrypt button to add AES-Key to key-manager and them use it to encrypt sample data.\n+ListView with AES-Key should pop up. First label should show Encrypted text prefix\n+and the second one text before encryption and after decryption.\n+\n+\n+## Verified Version\n+* [Xamarin.Forms](https://www.xamarin.com/forms) : 2.4.0.91020\n+* [Xamarin.Platform.Tizen](https://www.xamarin.com/forms) : 2.4.0.91020\n+* [Tizen.NET](https://www.tizen.org/) : 4.0.0\n+* [Tizen.NET.SDK](https://www.tizen.org/) : 1.0.0\n+\n+## Supported Profile\n+* Mobile\n+* TV\n+* Wearable\n+\n+## Author\n+* Ernest Borowski\n+\n+## Screenshots\n+### Mobile\n+\n+\n+### TV\n+\n+### Wearable\n+\n"
},
{
"change_type": "ADD",
"old_path": null,
"new_path": "Wearable/SecureRepository/README.md",
"diff": "+# SecureRepository\n+## Overview\n+SecureRepository is a simple application that allows you to securely store data, certificates and cryptographic keys\n+using C# [Tizen.Security.SecureRepository API](https://developer.tizen.org/dev-guide/csapi/api/Tizen.Security.SecureRepository.html).\n+\n+Secure Repository function is provided by [key-manager](https://wiki.tizen.org/Security/Tizen_3.X_Key_Manager) module in Tizen.\n+\n+Secure Repository app is mainly designed for Tizen TV and Mobile profile however it also runs on Wearable devices but with limited UI.\n+What`s more it is written in [XAML](https://developer.xamarin.com/guides/xamarin-forms/xaml/).\n+It has a custom layout and shows how events are processed in the application.\n+It also uses [DependencyService](https://developer.xamarin.com/guides/xamarin-forms/application-fundamentals/dependency-service/)\n+and [Binding](https://developer.xamarin.com/guides/xamarin-forms/xaml/xaml-basics/data_binding_basics/).\n+\n+Please be aware that in production type application you should use longer cryptographic keys.\n+In sample app the Keys length are intentionally lowered to increase application responsiveness.\n+\n+## Sample Usage\n+1. Click Add button to add sample data to key-manager. ListView with items should pop up.\n+2. Click on item. Label with item type and content prefix should appear.\n+3. Click remove button to remove data from key-manager. ListView should be cleared.\n+4. Click encrypt button to add AES-Key to key-manager and them use it to encrypt sample data.\n+ListView with AES-Key should pop up. First label should show Encrypted text prefix\n+and the second one text before encryption and after decryption.\n+\n+\n+## Verified Version\n+* [Xamarin.Forms](https://www.xamarin.com/forms) : 2.4.0.91020\n+* [Xamarin.Platform.Tizen](https://www.xamarin.com/forms) : 2.4.0.91020\n+* [Tizen.NET](https://www.tizen.org/) : 4.0.0\n+* [Tizen.NET.SDK](https://www.tizen.org/) : 1.0.0\n+\n+## Supported Profile\n+* Mobile\n+* TV\n+* Wearable\n+\n+## Author\n+* Ernest Borowski\n+\n+## Screenshots\n+### Mobile\n+\n+\n+### TV\n+\n+### Wearable\n+\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[SecureRepository] Add README.md
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>
|
594,218 |
28.11.2017 16:50:14
| -3,600 |
d1b7c7a972e45e6ef6e7e95b7c1ab4a21e8424ff
|
[SecureRepository] Fix links to images in README.md
|
[
{
"change_type": "MODIFY",
"old_path": "Mobile/SecureRepository/README.md",
"new_path": "Mobile/SecureRepository/README.md",
"diff": "@@ -39,9 +39,9 @@ and the second one text before encryption and after decryption.\n## Screenshots\n### Mobile\n-\n-\n+\n+\n### TV\n-\n+\n### Wearable\n-\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "TV/SecureRepository/README.md",
"new_path": "TV/SecureRepository/README.md",
"diff": "@@ -39,9 +39,9 @@ and the second one text before encryption and after decryption.\n## Screenshots\n### Mobile\n-\n-\n+\n+\n### TV\n-\n+\n### Wearable\n-\n+\n"
},
{
"change_type": "MODIFY",
"old_path": "Wearable/SecureRepository/README.md",
"new_path": "Wearable/SecureRepository/README.md",
"diff": "@@ -39,9 +39,9 @@ and the second one text before encryption and after decryption.\n## Screenshots\n### Mobile\n-\n-\n+\n+\n### TV\n-\n+\n### Wearable\n-\n+\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[SecureRepository] Fix links to images in README.md
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>
|
594,218 |
09.01.2018 20:56:03
| -3,600 |
bbe37aea1ddc694855329da5357261cce41fac6e
|
[SecureRepository] Remove trailing spaces
|
[
{
"change_type": "MODIFY",
"old_path": "Mobile/SecureRepository/SecureRepository/SecureRepository.Tizen.Mobile/SecureRepository.Tizen.Mobile.csproj",
"new_path": "Mobile/SecureRepository/SecureRepository/SecureRepository.Tizen.Mobile/SecureRepository.Tizen.Mobile.csproj",
"diff": "<Folder Include=\"res\\\" />\n</ItemGroup>\n-\n<!-- If solution already has PCL project, will reference -->\n<ItemGroup>\n<ProjectReference Include=\"..\\SecureRepository\\SecureRepository.csproj\" />\n</ItemGroup>\n-\n<!-- Include Nuget Package for Tizen Project building -->\n<ItemGroup>\n<PackageReference Include=\"Tizen.NET\" Version=\"4.0.0\">\n<PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n<PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n-\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "TV/SecureRepository/SecureRepository/SecureRepository.Tizen.TV/SecureRepository.Tizen.TV.csproj",
"new_path": "TV/SecureRepository/SecureRepository/SecureRepository.Tizen.TV/SecureRepository.Tizen.TV.csproj",
"diff": "<Folder Include=\"res\\\" />\n</ItemGroup>\n-\n<!-- If solution already has PCL project, will reference -->\n<ItemGroup>\n<ProjectReference Include=\"..\\SecureRepository\\SecureRepository.csproj\" />\n</ItemGroup>\n-\n<!-- Include Nuget Package for Tizen Project building -->\n<ItemGroup>\n<PackageReference Include=\"Tizen.NET\" Version=\"4.0.0\">\n<PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n<PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n-\n</Project>\n"
},
{
"change_type": "MODIFY",
"old_path": "Wearable/SecureRepository/SecureRepository/SecureRepository.Tizen.Wearable/SecureRepository.Tizen.Wearable.csproj",
"new_path": "Wearable/SecureRepository/SecureRepository/SecureRepository.Tizen.Wearable/SecureRepository.Tizen.Wearable.csproj",
"diff": "<Folder Include=\"res\\\" />\n</ItemGroup>\n-\n<!-- If solution already has PCL project, will reference -->\n<ItemGroup>\n<ProjectReference Include=\"..\\SecureRepository\\SecureRepository.csproj\" />\n</ItemGroup>\n-\n<!-- Include Nuget Package for Tizen Project building -->\n<ItemGroup>\n<PackageReference Include=\"Tizen.NET\" Version=\"4.0.0\">\n<PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n<PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n-\n</Project>\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[SecureRepository] Remove trailing spaces
Signed-off-by: Ernest Borowski <e.borowski@partner.samsung.com>
|
594,269 |
23.01.2018 14:13:27
| -32,400 |
b45d5b945e1d8702585d81f3c56f642777e449c6
|
[TV][Gallery] clean up
- fix nuget version
- apply .Net Standard
|
[
{
"change_type": "MODIFY",
"old_path": "TV/Gallery/Gallery/Gallery.TizenTV/Gallery.TizenTV.csproj",
"new_path": "TV/Gallery/Gallery/Gallery.TizenTV/Gallery.TizenTV.csproj",
"diff": "<PropertyGroup Condition=\" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' \">\n<DebugType>None</DebugType>\n</PropertyGroup>\n-\n<ItemGroup>\n- <Folder Include=\"Debug\\\" />\n- <Folder Include=\"lib\\\" />\n+ <Compile Remove=\"Debug\\**\" />\n+ <Compile Remove=\"lib\\**\" />\n+ <EmbeddedResource Remove=\"Debug\\**\" />\n+ <EmbeddedResource Remove=\"lib\\**\" />\n+ <None Remove=\"Debug\\**\" />\n+ <None Remove=\"lib\\**\" />\n</ItemGroup>\n<PackageReference Include=\"Tizen.NET\" Version=\"4.0.0\">\n<ExcludeAssets>Runtime</ExcludeAssets>\n</PackageReference>\n- <PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n- <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.18342\" />\n+ <PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.1\" />\n+ <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n<ItemGroup>\n<ProjectReference Include=\"..\\Gallery\\Gallery.csproj\" />\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[TV][Gallery] clean up
- fix nuget version
- apply .Net Standard
|
594,269 |
23.01.2018 14:30:54
| -32,400 |
7faa9a42409139c4230d178dcae43ac411cc9bd2
|
[TV][MusicPlayerUI] Clean up
- fix nuget version
|
[
{
"change_type": "MODIFY",
"old_path": "TV/MusicPlayerUI/MusicPlayerUI/MusicPlayerUI.TizenTV/MusicPlayerUI.TizenTV.csproj",
"new_path": "TV/MusicPlayerUI/MusicPlayerUI/MusicPlayerUI.TizenTV/MusicPlayerUI.TizenTV.csproj",
"diff": "<PackageReference Include=\"Tizen.NET\" Version=\"4.0.0\">\n<ExcludeAssets>Runtime</ExcludeAssets>\n</PackageReference>\n- <PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.0\" />\n- <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.18342\" />\n+ <PackageReference Include=\"Tizen.NET.Sdk\" Version=\"1.0.1\" />\n+ <PackageReference Include=\"Xamarin.Forms.Platform.Tizen\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n<ItemGroup>\n<ProjectReference Include=\"..\\MusicPlayerUI\\MusicPlayerUI.csproj\" />\n"
},
{
"change_type": "MODIFY",
"old_path": "TV/MusicPlayerUI/MusicPlayerUI/MusicPlayerUI/MusicPlayerUI.csproj",
"new_path": "TV/MusicPlayerUI/MusicPlayerUI/MusicPlayerUI/MusicPlayerUI.csproj",
"diff": "<PropertyGroup>\n<TargetFramework>netstandard2.0</TargetFramework>\n- <PackageTargetFallback>$(PackageTargetFallback);portable-net45+wp80+win81+wpa81</PackageTargetFallback>\n</PropertyGroup>\n+ <!-- Include Nuget Package for Xamarin building -->\n<ItemGroup>\n- <PackageReference Include=\"Xamarin.Forms\" Version=\"2.4.0.18342\" />\n+ <PackageReference Include=\"Xamarin.Forms\" Version=\"2.4.0.91020\" />\n</ItemGroup>\n- <!-- Include Nuget Package for Xamarin building -->\n-\n</Project>\n"
}
] |
C#
|
Apache License 2.0
|
samsung/tizen-csharp-samples
|
[TV][MusicPlayerUI] Clean up
- fix nuget version
|
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.