You can subscribe to this list here.
2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From:
<er...@li...> - 2006-08-28 12:56:56
|
--TO--jboss-cvs-commits ※※※ 生产计划与物料控制(PMC) ※※※ ★★★★★ 日期:2 0 0 6年8月31-9月1日 上-海-金-水-湾-酒-店 ★★★★★ 2 0 0 6年9月23-24日 广-州-广-武-酒-店 =============================================================================== #主 办:中 华 企 业 咨 询 网 #联-系-电-话: 0 7 5 5 - 8 3 9 0 5 9 5 9 ,, 8 3 9 0 5 9 6 9 王小姐 #报-名-传-真: 0 7 5 5 - 8 3 9 0 5 9 6 9 #时 间:2 0 0 6年8月31-9月1日 上-海-金-水-湾-酒-店 2 0 0 6年9月23-24日 广-州-广-武-酒-店 #费 用:2000元/人(含讲义、午餐、茶点、合影、通讯录) #对 象:采 购、仓 储、销 售 部 门、经 理 主 管、跟 单 人 员 =============================================================================== ● 背-景 各企业都期望低库存而能满足客户需求的流畅生产环境,以适应当今激烈竞争微利时代。 物料资金一般占企业营运资金55%~80%,而生产进度依时完成,直接影响客户合作满意程度,鉴 此,物料控制(俗称物控MC)和生产控制(俗称生管PC),这个部门(PMC)掌握企业生产及物料运作 的总调度和命脉.直接涉及影响生产部、生产工程部、采购、货仓、品控部、开发与设计部、 设备工程、人力资源及财务成本预算控制等.生产及物料控制部门和相关管理层必须充分了解: 物料计划、请购、物料调度、物料的控制(收、发、退、借、备料等)、生产计划与生产进度 控制,并谙熟运用这门管理技来解决问题。 本课程是经过讲师十余年亲身体会揣摩凭感觉和理论汇炼之精华.透过学员研讨和习作技 能,帮助学员提升工作技能和管理技巧。 ● 课-程-收-获 → 1.两天您就能掌握根据“PMC是所有生产部门在生产进度和物料控制两个层面上的上司” 概念制定的跟进制度流程. → 2.两天您就能掌握制定多批/多种/少量/交期短生产排程及时跟进其生产进度/物料进度 → 3.两天您就能掌握跟进预期滚动计划生产型/推进式(push)生产控制系统与拉动式(pull) 生产控制系统管理方法 ● 课-程-特-色 “60/40”时间原则(讲师40%,学员60%)、小组讨论/发表、管理电影分享/研讨、案例分析、 情景仿真、自带企业资料现场诊断和实作对策、游戏分享、学员与学员、讲师互动相辅而成、 少讲理论多讲实践经验,要求学员课堂结合本公司实际情况量身订做提出问题(可在课堂打断 讲师思路),不是纯粹填鸭灌输,也不是研究客观案例,而是让学员体验执行过程,关注现实 事例。 =============================================================================== § 讲 师 介 绍 § ● 师-资-简-介 雷 卫 旭.香港理工大学MBA,香港生产力促进局特约讲师、美国管理学会(AMA)授权专业培训 师、清华大学研究院/北京大学/中山大学EMBA班特邀实战型讲师..北京代光. 2004/2005年被培训论坛推誉为“十大实战派培训师”、专业课程讲授专家、资深顾问.任某 大型日港合资企业副总经理,拥有十几年的生产/物料采购管理经验. 企业高层管理及课程讲授 经验非常丰富,讲授/辅导过三百九十多家中外企业、融集中、港、台多家企业经验之精华.并 由北京大学出版《如何做好生产/物料计划控制》系列和北京代光出版管理光碟,特别 是2004/2005/2006年间定期辅导顺德美的日用集团/富士康集供应链管理项目(精益/JIT-生产 /物料计划/采购).“寓观念于谈笑间,蕴哲理于诙谐中”,风格生动、幽默,讲解深入浅出或浅 入深出,不仅案例丰富,且提供多种实用的解决问题之工具及技巧.至今有四万九仟以上人次接受 专业课程训练,其务实的作风深受厂家好评如潮. 曾经讲授及辅导过的企业有:青岛海尔,中国移动。中国北京联通。深圳华为。顺德/武汉美 的空调.联想、南方电网。白沙集团。粤电集团、海南航空、上海日立.可口可乐.施耐德.上 海松下半体.西安杨森制药、苏州/上海西门子.力(MULTEK)/ 捷普科技(Jabil). 光明纸 业.香港集.东莞伟易达集团、泰科子/卡西欧电子、上海米其林/固特异.雅居乐房地产. 美赞臣(MeadJohnson)、珠江啤酒、步步高电子、格力空调.上海通用汽.海南马自达.比亚迪汽 .长安汽.ABB等多家知名企业,曾驻厂辅导 东莞诺基亚、惠州TCL、南京爱立信、华强三洋、 夏新电子.厦华集.惠州德赛、飞利浦照明电子(上海)、中兴通讯。武汉烽火科技.中国长城计 算机(深圳).东莞汤姆逊(电器). 顺德美的日用集团.顺德乐华陶瓷(arrow).美泰玩具.香港启桓贸 易行 时代纺织.晶苑制衣集团.东莞台子. 富士康集.康佳集团等 =============================================================================== § 课 程 大 纲 § ● 课-程-大-纲 第一室: 物料控制/生产计划/销售计划管理概述 1物料管理范围和先进组织架构 2某著名美资公司物料管理组织架构 3生产计划/物料控制五大职能 4物料管理三大因素结构图 研讨:某通讯公司缩短物料周期电脑系统(用友)流程主界面实例分析 5.物料管理精髓三不政策和八大死穴 6生产计划与销售业务链接流程 案例:中山某衡器有限公司准时生产计划VS市场业务部VS客户“三赢”规则,有效控制 扦单、急单、补单五种措施(范例) 7销售计划流程 ◇ 销售预测流程 ◇ 销售计划流程 ◇ 备货计划流程 ◇ 生产计划流程 8制造业生产计划控制三种模式 ◇ 预期滚动计划系统 ◇ 推进式(push)生产控制系统 ◇ 拉动式(pull)生产控制系统 ◇ 预期滚动计划编制程序/特点/运作 案例研讨:深圳某著名民营企业生产计划控制三种模式全流程剖析 9 多批少量生产现场供料三大做法 ◇ 物料管理---JIT三A政策六措施 ◇ 广告牌生产条件/流程图 ◇ 精益采购(JIT采购) → 一汽马自达公司精益生产拉动式配送物料实例分析 → 供应商管理库存(VMI)----鼓点式交货方式实施七对策 → 某著名家电民营企业VMI收费实施表 → 某美资公司销售预测计划和VMI 物料需求计划实录分析 → 基于互联网的电子化采购--与供应商信息共享/实时视频采购 → 中国某著名民营企业ERP-ORACLE系统SCP协同平台主界实例面分析 → 使用条形码及与供货商进行电子数据交换(EDI)实例展示 10最新生产计划控制管理模式 第二室 物料工程管理 1.物料规格四方面的订定与管制 2.材料清单 (BOM) 3.物料分类/编号 案例:某实业有限公司物料编码系统实例分析 4.物料ABC分析法和运用 5.物料ABC执行六步骤 6.ERP物料ABC分类管理明细功能案例分析 第三室: 物料控制管理 1.物料管理执行流程 案例1:上海某实业有限公司物料管理ERP流程示意图(原理)实物分析 案例2:北京某通讯电子有限公司(欧洲全资)ERP―SAP/R3系统采购订单管理流程主界面分析 2 物料管理相辅相成十四流程 3 某著名美资公司生产计划与生产过程控制流程及其相应)ERP--BAAN系统(美资)流程系列主 界面/表格实录分析 4某公司物料工程更改流程分析/某著名美资公司最新呆料处理制度 5个案演算-----控制物料损耗演算 6江门某实业有限公司补料/损耗控制案例分析 案例:生产物料损耗控制方法---深圳某日资精工有限公司生产零库存实例 案例:生产物料损耗控制方法流程图和损耗明细表 第四室 材料计划跟进与存量管制-----订货型(OEM)/存货型(ODM) 1.材料计划流程七步骤----某公司学员现场诊断(学员与讲师互动点评) → 深圳某民营公司透过ERP-用友系统缩短采购物料周期机制实例分析 → 某著名美资公司每日物料欠料跟进表实例分析 → 东莞某外资公司订货型(OEM)按订单编号GG4K028A1跟进物料计划跟踪过程实录 → 伟创力(美资)在物料欠料分析表实例分析 → 项目MRP计算/查询/日志------金碟K3系统主界面 2. 物料跟单员跟单十大技巧互动点评 → 物料跟单员督促物料到位进度三种方法----备料到位率/目标法/预警法 → 佛山某有限公司物料订购及督促物料预警法工作流程 → 佛山某有限公司跟单员督促物料预警法图表实录分析 3.安全库存的设置方式 → 安全存量VS最高存量VS.最低存量 → 库存管理ERP子功能库存调整/库存查询/查询分析展示 → 多批/多种少量经济批量的决定方式损益平衡点控制方法 4.10种物料成本降低途径和操作方法 5.存量管制 6.物料请购、跟进与进料控制 7.物料短缺八大原因和七种预防对策 8.物料剩余七真因和如何治疗/预防 9.剖析物料供应不继五大方面 第四室 生产计划控制----柔性化的计划和生产 1.生产计划控制流程七途径---讲师/学员点评某公司现场诊断 2.多批少量生产计划与备货计划管理流程解析 第五室 生产计划与进度控制 1.大连某日资公司生产主业务流程/生产控制基本流程案例分享 2.生产产能分析:人力负荷/机器负荷 3 插单产能规划应变六方法 4. 分析产能负荷七要素方面---人力负荷/机器负荷…… 5.生产计划要点、内容及编制演练---- → 销售预测与生产计划 长、中、短期生产计划制定与执行重点演练 → 上海某公司五张订单月/周生产计划排程表制定个案演练 → 生产排产优先五规则 6.生产排产三种标准 7. 生产进度监控三个阶段------事前/事中/事后 8 协调沟通处理生产异常问题--生产进度落后六条改善措施 9. 产销失调原因与对策--跨部门生产进度控制七步骤 10.生产计划进度跟进案例分组研讨------某公司实例 第六室 生产计划与物料计划绩效管理 1.生产计划/生产物料/生产控制绩效管理明细表 2.生产三类成本分析-----财务监督/跟进 3生产控制四方面 4.PMC绩效执行六部份 → 某美资企业PMC工作任务目标细化实例分析 → 绩效管理项目(案例分析) → PMC精益要求转化量化的指针→管理项目→对应具体日常制度/流程 → PMC目标管理活动核心------执行力管理 → PMC执行力项目与公式 → PMC执行力管理办法---(_____月____________部门执行力管理表) 尾声: 通过学员成果发表-----讲师点评 实践/活用所学五步骤 =============================================================================== -欢-迎-来-电-索-取-报-名-回-执-表-及-上-课-有-关-事-项- 20:57:04 =============================================================================== 163265 |
From:
<sg...@gy...> - 2006-08-20 20:12:04
|
--TO--jboss-cvs-commits ※※※ 生产计划与物料控制(PMC) ※※※ ★★★★★ 日期:2 0 0 6年8月31-9月1日 上-海-兆-安-酒-店 ★★★★★ 2 0 0 6年9月23-24日 广-州-广-武-酒-店 =============================================================================== #主 办:中 华 企 业 咨 询 网 #联-系-电-话: 0 7 5 5 - 8 3 9 0 5 9 5 9 ,, 8 3 9 0 5 9 6 9 王小姐 #报-名-传-真: 0 7 5 5 - 8 3 9 0 5 9 6 9 #时 间:2 0 0 6年8月31-9月1日 上-海-兆-安-酒-店 2 0 0 6年9月23-24日 广-州-广-武-酒-店 #费 用:2000元/人(含讲义、午餐、茶点、合影、通讯录) #对 象:采购、仓储、销售部门、经理主管、跟单人员 =============================================================================== ● 背-景 各企业都期望低库存而能满足客户需求的流畅生产环境,以适应当今激烈竞争微利时代。 物料资金一般占企业营运资金55%~80%,而生产进度依时完成,直接影响客户合作满意程度,鉴 此,物料控制(俗称物控MC)和生产控制(俗称生管PC),这个部门(PMC)掌握企业生产及物料运作 的总调度和命脉.直接涉及影响生产部、生产工程部、采购、货仓、品控部、开发与设计部、 设备工程、人力资源及财务成本预算控制等.生产及物料控制部门和相关管理层必须充分了解: 物料计划、请购、物料调度、物料的控制(收、发、退、借、备料等)、生产计划与生产进度 控制,并谙熟运用这门管理技来解决问题。 本课程是经过讲师十余年亲身体会揣摩凭感觉和理论汇炼之精华.透过学员研讨和习作技 能,帮助学员提升工作技能和管理技巧。 ● 课-程-收-获 → 1.两天您就能掌握根据“PMC是所有生产部门在生产进度和物料控制两个层面上的上司” 概念制定的跟进制度流程. → 2.两天您就能掌握制定多批/多种/少量/交期短生产排程及时跟进其生产进度/物料进度 → 3.两天您就能掌握跟进预期滚动计划生产型/推进式(push)生产控制系统与拉动式(pull) 生产控制系统管理方法 ● 课-程-特-色 “60/40”时间原则(讲师40%,学员60%)、小组讨论/发表、管理电影分享/研讨、案例分析、 情景仿真、自带企业资料现场诊断和实作对策、游戏分享、学员与学员、讲师互动相辅而成、 少讲理论多讲实践经验,要求学员课堂结合本公司实际情况量身订做提出问题(可在课堂打断 讲师思路),不是纯粹填鸭灌输,也不是研究客观案例,而是让学员体验执行过程,关注现实 事例。 =============================================================================== § 讲 师 介 绍 § ● 师-资-简-介 雷卫旭.香港理工大学MBA,香港生产力促进局特约讲师、美国管理学会(AMA)授权专业培训 师、清华大学研究院/北京大学/中山大学EMBA班特邀实战型讲师..北京代光. 2004/2005年被培训论坛推誉为“十大实战派培训师”、专业课程讲授专家、资深顾问.任某 大型日港合资企业副总经理,拥有十几年的生产/物料采购管理经验. 企业高层管理及课程讲授 经验非常丰富,讲授/辅导过三百九十多家中外企业、融集中、港、台多家企业经验之精华.并 由北京大学出版《如何做好生产/物料计划控制》系列和北京代光出版管理光碟,特别 是2004/2005/2006年间定期辅导顺德美的日用集团/富士康集供应链管理项目(精益/JIT-生产 /物料计划/采购).“寓观念于谈笑间,蕴哲理于诙谐中”,风格生动、幽默,讲解深入浅出或浅 入深出,不仅案例丰富,且提供多种实用的解决问题之工具及技巧.至今有四万九仟以上人次接受 专业课程训练,其务实的作风深受厂家好评如潮. 曾经讲授及辅导过的企业有:青岛海尔,中国移动。中国北京联通。深圳华为。顺德/武汉美 的空调.联想、南方电网。白沙集团。粤电集团、海南航空、上海日立.可口可乐.施耐德.上 海松下半体.西安杨森制药、苏州/上海西门子.力(MULTEK)/ 捷普科技(Jabil). 光明纸 业.香港集.东莞伟易达集团、泰科子/卡西欧电子、上海米其林/固特异.雅居乐房地产. 美赞臣(MeadJohnson)、珠江啤酒、步步高电子、格力空调.上海通用汽.海南马自达.比亚迪汽 .长安汽.ABB等多家知名企业,曾驻厂辅导 东莞诺基亚、惠州TCL、南京爱立信、华强三洋、 夏新电子.厦华集.惠州德赛、飞利浦照明电子(上海)、中兴通讯。武汉烽火科技.中国长城计 算机(深圳).东莞汤姆逊(电器). 顺德美的日用集团.顺德乐华陶瓷(arrow).美泰玩具.香港启桓贸 易行 时代纺织.晶苑制衣集团.东莞台子. 富士康集.康佳集团等 =============================================================================== § 课 程 大 纲 § ● 课-程-大-纲 第一室: 物料控制/生产计划/销售计划管理概述 1物料管理范围和先进组织架构 2某著名美资公司物料管理组织架构 3生产计划/物料控制五大职能 4物料管理三大因素结构图 研讨:某通讯公司缩短物料周期电脑系统(用友)流程主界面实例分析 5.物料管理精髓三不政策和八大死穴 6生产计划与销售业务链接流程 案例:中山某衡器有限公司准时生产计划VS市场业务部VS客户“三赢”规则,有效控制 扦单、急单、补单五种措施(范例) 7销售计划流程 ◇ 销售预测流程 ◇ 销售计划流程 ◇ 备货计划流程 ◇ 生产计划流程 8制造业生产计划控制三种模式 ◇ 预期滚动计划系统 ◇ 推进式(push)生产控制系统 ◇ 拉动式(pull)生产控制系统 ◇ 预期滚动计划编制程序/特点/运作 案例研讨:深圳某著名民营企业生产计划控制三种模式全流程剖析 9 多批少量生产现场供料三大做法 ◇ 物料管理---JIT三A政策六措施 ◇ 广告牌生产条件/流程图 ◇ 精益采购(JIT采购) → 一汽马自达公司精益生产拉动式配送物料实例分析 → 供应商管理库存(VMI)----鼓点式交货方式实施七对策 → 某著名家电民营企业VMI收费实施表 → 某美资公司销售预测计划和VMI 物料需求计划实录分析 → 基于互联网的电子化采购--与供应商信息共享/实时视频采购 → 中国某著名民营企业ERP-ORACLE系统SCP协同平台主界实例面分析 → 使用条形码及与供货商进行电子数据交换(EDI)实例展示 10最新生产计划控制管理模式 第二室 物料工程管理 1.物料规格四方面的订定与管制 2.材料清单 (BOM) 3.物料分类/编号 案例:某实业有限公司物料编码系统实例分析 4.物料ABC分析法和运用 5.物料ABC执行六步骤 6.ERP物料ABC分类管理明细功能案例分析 第三室: 物料控制管理 1.物料管理执行流程 案例1:上海某实业有限公司物料管理ERP流程示意图(原理)实物分析 案例2:北京某通讯电子有限公司(欧洲全资)ERP―SAP/R3系统采购订单管理流程主界面分析 2 物料管理相辅相成十四流程 3 某著名美资公司生产计划与生产过程控制流程及其相应)ERP--BAAN系统(美资)流程系列主 界面/表格实录分析 4某公司物料工程更改流程分析/某著名美资公司最新呆料处理制度 5个案演算-----控制物料损耗演算 6江门某实业有限公司补料/损耗控制案例分析 案例:生产物料损耗控制方法---深圳某日资精工有限公司生产零库存实例 案例:生产物料损耗控制方法流程图和损耗明细表 第四室 材料计划跟进与存量管制-----订货型(OEM)/存货型(ODM) 1.材料计划流程七步骤----某公司学员现场诊断(学员与讲师互动点评) → 深圳某民营公司透过ERP-用友系统缩短采购物料周期机制实例分析 → 某著名美资公司每日物料欠料跟进表实例分析 → 东莞某外资公司订货型(OEM)按订单编号GG4K028A1跟进物料计划跟踪过程实录 → 伟创力(美资)在物料欠料分析表实例分析 → 项目MRP计算/查询/日志------金碟K3系统主界面 2. 物料跟单员跟单十大技巧互动点评 → 物料跟单员督促物料到位进度三种方法----备料到位率/目标法/预警法 → 佛山某有限公司物料订购及督促物料预警法工作流程 → 佛山某有限公司跟单员督促物料预警法图表实录分析 3.安全库存的设置方式 → 安全存量VS最高存量VS.最低存量 → 库存管理ERP子功能库存调整/库存查询/查询分析展示 → 多批/多种少量经济批量的决定方式损益平衡点控制方法 4.10种物料成本降低途径和操作方法 5.存量管制 6.物料请购、跟进与进料控制 7.物料短缺八大原因和七种预防对策 8.物料剩余七真因和如何治疗/预防 9.剖析物料供应不继五大方面 第四室 生产计划控制----柔性化的计划和生产 1.生产计划控制流程七途径---讲师/学员点评某公司现场诊断 2.多批少量生产计划与备货计划管理流程解析 第五室 生产计划与进度控制 1.大连某日资公司生产主业务流程/生产控制基本流程案例分享 2.生产产能分析:人力负荷/机器负荷 3 插单产能规划应变六方法 4. 分析产能负荷七要素方面---人力负荷/机器负荷…… 5.生产计划要点、内容及编制演练---- → 销售预测与生产计划 长、中、短期生产计划制定与执行重点演练 → 上海某公司五张订单月/周生产计划排程表制定个案演练 → 生产排产优先五规则 6.生产排产三种标准 7. 生产进度监控三个阶段------事前/事中/事后 8 协调沟通处理生产异常问题--生产进度落后六条改善措施 9. 产销失调原因与对策--跨部门生产进度控制七步骤 10.生产计划进度跟进案例分组研讨------某公司实例 第六室 生产计划与物料计划绩效管理 1.生产计划/生产物料/生产控制绩效管理明细表 2.生产三类成本分析-----财务监督/跟进 3生产控制四方面 4.PMC绩效执行六部份 → 某美资企业PMC工作任务目标细化实例分析 → 绩效管理项目(案例分析) → PMC精益要求转化量化的指针→管理项目→对应具体日常制度/流程 → PMC目标管理活动核心------执行力管理 → PMC执行力项目与公式 → PMC执行力管理办法---(_____月____________部门执行力管理表) 尾声: 通过学员成果发表-----讲师点评 实践/活用所学五步骤 =============================================================================== -欢-迎-来-电-索-取-报-名-回-执-表-及-上-课-有-关-事-项- 04:12:07 =============================================================================== 163265 |
From: Joshua M. <Mar...@or...> - 2006-08-16 18:19:19
|
Hello, You have been chosen to participate in an invitation only limited time event! Are you currently paying over 3% for your mortgage? STOP! We can help you lower that today! Answer only a few questions and we can give you an approval in under 30 seconds it is that simple! http://www.isittimetoloanyet.com/ And stop fighting for lenders let them fight for you! Make them work for your business by giving you the lowest rates around! Two hundred and thirty thousand dollar loans are available for only three hundred and forty dollars/month! WE ARE PRACTICALLY GIVING AWAY MONEY! http://www.thanksforalltheloans.com/ Think your credit is too bad to get a deal like this? THINK AGAIN! We will have you saving your money in no time! Are you ready to save your money? http://www.thanksforalltheloans.com/ Regards, Michael King |
From:
<de...@ki...> - 2006-08-13 19:39:30
|
〔成─为…优・秀・的・部・门─主・管、经・理・专・题・研―修…班〕 〔时 ○ ○ 间〕2O06年08月19-20日 (地 点: 深 圳金融培训中心 ) 〔时 ○ ○ 间〕20O6年O8月26-27日 (地 点: 上 海兆安酒店 ) 〔主○~办〕才・经・中・国―管・理・学―院 〔费○~用〕 l80O 元 / 人(包・括・资・料・费、午・餐・等) 〔参・加○对~象〕中高 层 管理人员、各 部门 主管、经理及具有 管理 潜质 的储备干部等 〔授・课○方~式〕讲授、启发式、互动式教学、小组讨论、案例分析、角色扮演、观看录象、心理测验、练习 〔电 ○ 话 ○ 报 ○ 名〕 O__7__5__5 - 8__3__1__6__6__8__4__6 8__3__1__6__6__8__4__7 -TO-jboss-cvs-commits 来 ○ 电 ○ 索 ○ 取 ○ 报 ○ 名 ○ 表 ˇˇ〔课 ○ 程 ○ 目 ○ 标〕 l、帮助中层管理者清楚的认知自己的角色定位,实现由业务人员向管理人员的转变 2、掌握基本的沟通技巧,与上司、与同级、与下属保持良好的沟通 3、了解激励的基本原理,能有效激励部属高效率地开展工作 4、熟悉中层干部的关键管理责任与技巧――辅导与指导下属 5、学习团队建设,将本部门建设成高效率的工作团队 ˇˇ〔课○○程○○内○○容〕 ●一、主管的角色与职责 l、主管扮演的角色 2、出色主管的定位 3、如何做一个好主管 4、优秀主管应具备的心态 5、主管的工作职责 ●二、如何有效激励下属 l、激励的理论 2、激励下属的重要性 3、激励的方法 4、关心下属 ●三、如何培养优秀的下属 l、为什么要培育部属 2、基本培训概念 3、如何帮助员或克服学习障碍 4、上岗培训技巧及要点 5、职场OJT常用方法 ●四、打造高绩效团队 l、工作群体与团队 2、高效团队的特质 3、管理团队5种途径 4、管理团队角色测试与分析 ●五、高效沟通共建和谐氛围 l、沟通的基础知识 2、组织沟通的障碍 3、高效沟通的技能 4、沟通演练 ●六、管理风格与有效授权 l、管理人员的行为方式 2、认识自己的管理风格 3、什么叫授权 4、阻碍的授权 5、◎ 测试:您的授权指数 ◎ 测试:组织的授权指数 6、有效授权技能 7、◎ 工作任务分析 ◎ 授权流程 8、◎ 选拔人才 ◎ 指导与控制 9、案例研讨 ------------------------------------------------------------------------ ˇˇ〔讲 ○ 师 ○ 介 ○ 绍〕金 老 师 香港SYNERGY授权导师、美国著名的DDI课程的认证讲师、美国FLMI资格认证导师; l994~2OO3 某知名上市公司区域培训总监、区域销售总经理,现任某综合投资银 行,投资事业部总经理。l996年起从事训练、咨询工作,八年来穿梭于中国内地 的成功地主讲了近百场的公开课程,训练的学员达上万人次,并获得一致的好评, 拥有丰富的咨询、管理经验。从事多年的管理经验加上多年的管理教学经验,上 课内容丰富,诙谐幽默不失专业,根据课程及学员采用不同上课形式:讲演、小 组研讨、个案研究、角色扮演、活动练习等多元化教学及实际演练与评鉴。其中 尤其与学员互动的上课风格备受好评,擅长与学员互动分析,用案例说明,引导 学员体会式学习,深受学员的好评,同时当场吸收实用经验,对于实际工作带来 启发与助益。 ◎◎部分客户:可口可乐、汇丰科技、美国箭牌、艾默生、中海油、中国电信、 中国移动、荷兰范梅勒、思科、安捷伦、华凌冰箱、华凌空调、特灵空调、万宝、 捷成洋行、德国卡恩捷、马可尼通信、万邦鞋业、金发科技、大荣精细化工、中国 联通、广州商业银行等。 |
From: Felipe G. <Fel...@ma...> - 2006-08-06 10:26:40
|
Even if you have no erectin problems SOFT CIAXLIS would help you to make BETTER SE0X MORE OFTEN! and to bring unimagnable plesure to her. Just disolve half a pil under your tongue and get ready for action in 15 minutes. The tests showed that the majority of men after taking this medic ation were able to have PERFECT ER9ECTION during 36 hours! VISIT US, AND GET OUR SPECIAL 70% DISCDOUNT OFER! http://ujempq.lookdays.com/?23591463 ========== "The Brotherhood is broken," the gulls intoned together, and with one poker--that Noonan is a great player, the louse." circle of students, looking curiously at Maynard. They didn't care whether before. We hovered over the hillock. The asphalt was less than twenty feet "And what, in your opinion, has been the most important discovery in months! What are you harassing an honest lab worker for? "At last you've got the idea," Chiang said, "but your control needs a the window, too. The glass in our windows is thick and leaded. And beyond |
From: <re...@rh...> - 2006-08-03 13:00:41
|
jboss-cvs-commits您好!如方便请转发相关部门查收,谢谢! -------------------------------------------------------------------------------- ※※※ 岗位设计、任职资格与薪酬设计高级研修班 ※※※ 2006年8月11-13日 地点: 北 京 2006年9月1 - 3日 地点: 上 海 2006年10月27-29日 地点: 深 圳 =============================================================================== #主 办:企 业 咨 询 网 #联-系-电-话:(0 7 5 5)8 3 1 6 9 2 8 0 , 8 3 1 6 9 2 8 1 李小姐 汪小姐 #报-名-传-真:(0 7 5 5)8 3 1 6 9 2 8 1 #时 间:2 0 0 6年8月11-13日 地 点: 北 京 新 兴 宾 馆 2 0 0 6年9月1 - 3日 地 点: 上 海 金 水 湾 酒 店 2 0 0 6年10月27-29日 地 点: 深 圳 新 大 洲 酒 店 #费 用:3800元/人(含讲义、午餐、茶点、合影、通讯录) ============================================================================== § 课 程 特 色 § 课程根据原华为培训总监、华为人力资源部副总裁吴建国先生的多年实践经验与研究 成果,从国内企业所面临的实际问题出发,通过各种典型案例的讲解和分析,以及模拟现 实环境的操作演练,提升企业人力资源管理者系统性解决问题的能力和实施操练。 =============================================================================== § 课 程 背 景 § 为什么存在明显的冗员和低效,但很多部门却仍在高喊人手短缺? 为什么采取竞聘上岗,而员工却认为这只是领导玩弄的人事调整“把戏”? 为什么提供了高额的薪酬和福利,但员工的积极性和企业的经营绩效却依然没有改进? 为什么“空降兵”不好用,而“自己人”却很难培养起来? 为什么…………..? 对于企业领导和人力资源管理者而言,诸如此类的问题可谓千头万绪,如何建立一 套系统性的解决方案,而不只是“头痛医头、脚痛医脚”,成了我们迫切需要研究和解 决的重大课题。 =============================================================================== § 讲 师 介 绍 § 吴建国(Jim Wu),澳大利亚悉尼大学MBA,中科院研究员,日本东北大学客座教 授,清华大学、华为大学特聘教授,《IT经理世界》资深顾问。 留学回国之后,曾多次深入通用电气(中国)、摩托罗拉(中国)、中国联通等著 名企业从事人力资源管理的项目研究,研究领域包括公司战略、组织机构变革、企业文 化、绩效管理、薪酬与激励等。 1996年-2002年,任职华为技术有限公司,历任人力资源部副总裁兼培训总监、产 品策略总监、公司总裁助理等,主持参与华为薪酬改革项目、绩效管理项目,任职资格 管理项目,私募与上市筹备项目等。 2002年7月-迄今,专职于企业人力资源管理咨询行业,先后为三一重工、玉柴机器、 鲁能电力等数十家企业进行薪酬改革方案设计、绩效改进方案设计、职业发展规划设计、 企业培训体系设计等。 接受过吴建国先生培训客户包括:IBM(中国)、西门子(中国)、华为技术、联 想集团、中国电信、中国网通、中国移动、中国联通、中兴通讯、美的集团、金蝶软件、 长城电脑、中海油、万科地产、中海地产、华侨城地产、联合证券、清华大学等。吴建 国以其扎实的理论功底、生动实用的企业案例分析、风趣幽默的语言风格,获得客户企 业的高度评价。 ● 客户评价 “吴老师不仅理论功底扎实,对中国企业人力资源管理所存在的问题也有非常准确 的把握,他所分析的案例,在我们公司基本上都遇到过。” ――三一重工总经理助理 宁文伟 “技术和专业人才的职业发展,一直是困扰我们的难题,吴老师讲授的任职资格设 计方案,非常便于操作,我们终于找到了一个很好的解决办法。” ――玉柴机器常务副总经理 梁和平 “我们以前的薪酬制度一直是“二张皮”,钱花了不少,但激励效果却没有体现, 如果早一点请吴老师给我们讲解一下的话,可以少走很多的弯路。” ――银佳科技总经理 邹立坚 =============================================================================== § 课 程 大 纲 § 第一部分:岗位设计(一天) 一、企业战略与人力资本增值 案例:华为的人才战略与实施 1、人力资源管理的系统模型 企业人力资源管理职能划分的科学依据 2、现实中国企业所面临的关键问题 问题讨论:如何从人事管理走向人力资本管理? 二、组织设计 1、组织设计的基本原则 案例分析:组织设计与业务流程的关系 2、现有组织的基本模式 问题讨论:职能型组织的优劣? 问题讨论:如何减少部门之间的“扯皮”? 3、组织设计的基本方法 案例分析:以下组织存在哪些关键问题? 三、岗位设计 1、工作分析 工作分析包含的主要内容 工作分析的基本方法 2、工作分析的输出――岗位说明书 岗位说明书中的六个重要内容 案例分析:比较三个企业岗位说明书的差异 案例分析:岗位说明书设计的难点 岗位说明书的设计步骤 3、岗位说明书的典型应用范例 在绩效管理的应用――岗位职责与衡量标准 在薪酬管理中的应用――岗位价值评估 在人才招聘与调配中的应用 其他应用 第二部分:任职资格(一天) 案例:从“集体辞职”看华为建立任职资格体系的初衷 案例:Y公司(一家大型国有企业)所面临的问题 任职资格体系的三大组成部分 一、职业发展通道设计 1、职业发展通道设计模型 案例:华为的“五级双通道” 2、职业发展通道设计原则 3、职业发展通道的应用 案例分析:A公司如何解决“下岗干部”的安置问题 二、任职资格标准的设计 1、 标准设计的基本原则 案例分析:如何实现人与岗位的“完美匹配” 2、标准设计的基本方法 为什么“基于行为的标准”才是有效的标准 行为标准设计的难点 案例:区别“行为标准”与“非行为标准” 标准设计的三种基本方法 演练:行为标准模拟设计 3、 管理者任职资格标准设计 问题分析:为什么标准一般是从管理者开始? 案例:二家著名企业管理者任职资格标准模型 4、专业/技术类任职资格标准设计 演练:技术类员工任职资格标准模拟设计 案例:技术类、营销类、专业类任职资格标准设计示例 三、资格认证 1、初次认证与周期性认证 2、资格认证的基本步骤 3、如何简便有效的进行资格认证 案例:举证库设计与IT系统支持 四、任职资格体系的典型应用 1、“竞聘上岗” 2、职业发展规划设计 案例:华为用任职资格促进员工队伍的职业化 3、培训体系设计 第三部分:薪酬设计(一天) 一、薪酬战略 1、以合理的薪酬结构获取企业的竞争优势 案例:华为、摩托罗拉薪酬结构分析 2、薪酬体系评价的四个基本要素 案例:四类典型员工的薪酬期望 3、薪酬如何支持企业战略目标的实现 二、3P薪酬设计 1、基于岗位、胜任能力和绩效的薪酬体系 案例:公平性对员工心态的影响 2、市场定价的基本依据 案例:界定工资等高线的因素 三、基于岗位的薪酬设计 1、岗位价值评估的四种方法 案例分析:评价三个典型岗位的价值 2、因素评估法及其应用 演练:七要素岗位价值评估法 四、基于能力的薪酬设计 1、任职资格等级与薪酬的对接 案例:H公司的能级工资设计方案 2、能级工资与岗位工资的结合 演练:A公司营销与研发系统的工资体系设计 五、全面薪酬体系设计 1、工资曲线、级差、重叠度设计技巧 案例:为B公司设计薪点表 2、基于绩效的浮动薪酬设计 3、薪酬调整矩阵的设计 4、宽带薪酬结构的广泛应用 5、工资递延支付的技巧 6、四种长效激励方案的选择 =============================================================================== -请-来-电-索-取-报-名-回-执-表-及-上-课-有-关-事-项- ==================================================================================== 20:59:53 |
From: <for...@jb...> - 2006-07-13 05:00:39
|
Commit from starksm (2006-07-12 04:15 EDT) ------------------- Handle a null parent and children files system2 src/main/org/jboss/deployers/plugins/MainDeployerImpl.java 1.4 Commit from julien (2006-07-12 04:17 EDT) ------------------ added test case for query parameter conflict with JBP parameters jboss-portal portlet/build.xml 1.126 jboss-portal portlet/src/main/org/jboss/portal/test/portlet/PortletRequestDecoderTestCase.java 1.3 Commit from starksm (2006-07-12 05:05 EDT) ------------------- Bare beans deployment + system2 src/resources/tests/xml/org/jboss/test/server/profileservice/test-beans.xml 1.1 Commit from starksm (2006-07-12 05:06 EDT) ------------------- Add a profileRoot property system2 src/resources/tests/xml/deployer-beans.xml 1.4 Commit from starksm (2006-07-12 05:07 EDT) ------------------- Maintain a mapping of the deployment/names system2 src/main/org/jboss/system/server/profile/basic/ProfileImpl.java 1.3 Commit from starksm (2006-07-12 05:09 EDT) ------------------- Add a profileRoot property system2 src/main/org/jboss/system/server/profileservice/ProfileServiceImpl.java 1.3 Commit from starksm (2006-07-12 05:10 EDT) ------------------- Sample server test beans + system2 src/tests/org/jboss/test/server/support/TestBean.java 1.1 + system2 src/tests/org/jboss/test/server/support/TestBeanImpl.java 1.1 Commit from starksm (2006-07-12 05:10 EDT) ------------------- Add a testCreateDefaultProfile system2 src/tests/org/jboss/test/server/profileservice/MainTestCase.java 1.2 Commit from starksm (2006-07-12 05:11 EDT) ------------------- Implement KernelControllerContextAware to allow deployers access to the kernel context system2 src/main/org/jboss/deployers/plugins/AbstractAspectDeployer.java 1.5 Commit from starksm (2006-07-12 05:12 EDT) ------------------- Initialize the kernel deployer from the kernel context system2 src/main/org/jboss/deployers/plugins/bean/BeanDeployer.java 1.6 Commit from starksm (2006-07-12 05:13 EDT) ------------------- Set the type to classloading system2 src/main/org/jboss/deployers/plugins/classloading/ClassLoadingDeployer.java 1.5 Commit from starksm (2006-07-12 05:14 EDT) ------------------- If there is no parent DeploymentContext set the root context system2 src/main/org/jboss/deployers/plugins/MainDeployerImpl.java 1.5 Commit from kkhan (2006-07-12 05:18 EDT) ----------------- Add .jjt files to dist jboss-aop build.xml 1.153 jboss-aop build-retro.xml 1.2 Commit from kkhan on branch Branch_AOP_1_5 (2006-07-12 05:24 EDT) ------------------------------------------ Add .jjt files to dist jboss-aop build.xml 1.137.2.3 Commit from julien (2006-07-12 05:29 EDT) ------------------ - encode properly meta parameter in a URL - take prefs metadata for instances and use them to personalize the portlet to instantiate jboss-portal core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 1.62 jboss-portal core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java 1.29 jboss-portal core/src/main/org/jboss/portal/core/metadata/InstancesMetaData.java 1.14 jboss-portal core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java 1.20 jboss-portal core/src/resources/portal-samples-war/WEB-INF/default-object.xml 1.11 jboss-portal core/src/resources/portal-samples-war/WEB-INF/portlet-instances.xml 1.5 jboss-portal core/src/resources/portal-samples-war/WEB-INF/portlet.xml 1.16 jboss-portal portlet/src/main/org/jboss/portal/portlet/test/PortletController.java 1.73 jboss-portal server/src/main/org/jboss/portal/server/AbstractServerURL.java 1.3 jboss-portal server/src/main/org/jboss/portal/test/server/parameters/GetTest.java 1.15 jboss-portal server/src/main/org/jboss/portal/test/server/parameters/PostApplicationXWWWFormURLEncodedTest.java 1.12 jboss-portal server/src/main/org/jboss/portal/test/server/parameters/PostMultipartFormDataTest.java 1.12 Commit from kkhan (2006-07-12 05:57 EDT) ----------------- tidy up jboss-aop src/main/org/jboss/aop/AspectManager.java 1.164 Commit from mandersen (2006-07-12 06:03 EDT) --------------------- be a bit more informative about noclassdeffound errors when doing codegen jbosside hibernatetools/plugins/org.hibernate.eclipse.console/src/org/hibernate/eclipse/launch/CodeGenerationLaunchDelegate.java 1.15 Commit from mandersen (2006-07-12 06:26 EDT) --------------------- updating dependent libs jbosside hibernatetools/plugins/org.hibernate.eclipse/lib/tools/hibernate-tools.jar 1.42 jbosside hibernatetools/plugins/org.hibernate.eclipse/lib/annotations/hibernate-annotations.jar 1.13 jbosside hibernatetools/plugins/org.hibernate.eclipse/lib/hibernate/hibernate3.jar 1.28 Commit from mandersen (2006-07-12 07:02 EDT) --------------------- more lib sync jbosside hibernatetools/plugins/org.hibernate.eclipse/lib/annotations/hibernate-annotations.jar 1.14 Commit from mandersen (2006-07-12 07:15 EDT) --------------------- callisto mismatch jbosside releng/org.jboss.ide.eclipse.releng/.classpath 1.5 Commit from mandersen (2006-07-12 07:18 EDT) --------------------- hibernatetools tag/version name + jbosside releng/org.jboss.ide.eclipse.releng/builders/product/versionTags/2.0.0.Alpha2.tags 1.1 Commit from bwang (2006-07-12 09:25 EDT) ----------------- Take interceptors for find method. JBossCache src/resources/jboss-aop.xml 1.11 Commit from bwang (2006-07-12 09:27 EDT) ----------------- Remove find method from tx interceptors. JBossCache src/resources/jboss-aop.xml 1.12 Commit from bwang (2006-07-12 09:28 EDT) ----------------- Renamed AOPInstance to PojoReference and also some refactoring. JBossCache src-50/org/jboss/cache/pojo/eviction/AopLRUAlgorithm.java 1.3 JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/AbstractCollectionInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/BaseInterceptor.java 1.2 JBossCache src-50/org/jboss/cache/pojo/interceptors/dynamic/CacheFieldInterceptor.java 1.3 JBossCache src-50/org/jboss/cache/pojo/interceptors/PojoEvictionInterceptor.java 1.4 - JBossCache src-50/org/jboss/cache/pojo/AOPInstance.java 1.4 JBossCache src-50/org/jboss/cache/pojo/CollectionClassHandler.java 1.7 JBossCache src-50/org/jboss/cache/pojo/InternalDelegate.java 1.4 JBossCache src-50/org/jboss/cache/pojo/ObjectGraphHandler.java 1.8 JBossCache src-50/org/jboss/cache/pojo/PojoCacheDelegate.java 1.2 + JBossCache src-50/org/jboss/cache/pojo/PojoReference.java 1.1 JBossCache src-50/org/jboss/cache/pojo/SerializableObjectHandler.java 1.4 Commit from bwang (2006-07-12 09:29 EDT) ----------------- Add fail comment for some known failure now. Will fix later. JBossCache tests-50/functional/org/jboss/cache/pojo/event/LocalTest.java 1.2 JBossCache tests-50/functional/org/jboss/cache/pojo/NewLocalTest.java 1.4 JBossCache tests-50/functional/org/jboss/cache/pojo/NewReplicatedTxTest.java 1.3 Commit from bwang (2006-07-12 09:35 EDT) ----------------- Port the changes from 1.4 but note that the aop is deprecated already. 2.0 will use src-50 JBossCache src/org/jboss/cache/aop/PojoCache.java 1.25 Commit from rloehr (2006-07-12 10:14 EDT) ------------------ add zipfileset usage jboss-ejb3 build.xml 1.86 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-12 10:16 EDT) ------------------------------------------------------ Added more UTs JBossCache tests/functional/org/jboss/cache/transaction/AbortionTest.java 1.1.2.5 JBossCache tests/functional/org/jboss/cache/transaction/NotifyingTransactionManager.java 1.1.2.2 Commit from msurtani on branch Branch_JBossCache_1_3_0 (2006-07-12 11:41 EDT) ------------------------------------------------------ fixed JBCACHE-665 JBossCache src/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 1.19.2.1 JBossCache tests/functional/org/jboss/cache/eviction/OptimisticEvictionTest.java 1.3.2.3 Commit from rrajasekaran (2006-07-12 12:03 EDT) ------------------------ Added custom ant installation for webservices tools etc/cruisecontrol/scripts/cruisecontrol.properties 1.4 Commit from rrajasekaran (2006-07-12 12:03 EDT) ------------------------ Use custom ant installation with latest Xerces tools etc/cruisecontrol/scripts/build-jbossws-testsuite.xml 1.7 Commit from rawb (2006-07-12 12:05 EDT) ---------------- JBoss AS 3.2 should not support remote hosts jbosside as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 1.9 Commit from kkhan (2006-07-12 12:19 EDT) ----------------- Do not proxy volatile methods javassist src/main/javassist/util/proxy/ProxyFactory.java 1.11 Commit from claprun (2006-07-12 13:04 EDT) ------------------- Markup caching using ConsumerCacheInterceptor... [JBPORTAL-949] jboss-portal wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 1.5 Commit from claprun (2006-07-12 13:51 EDT) ------------------- Fixed NPE when consumer didn't specify cache expiration. [JBPORTAL-949] jboss-portal wsrp/src/main/org/jboss/portal/wsrp/consumer/RenderHandler.java 1.6 Commit from claprun (2006-07-12 13:52 EDT) ------------------- Fixed incorrect deployment of WSRP. jboss-portal wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 1.11 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 1.3 Commit from russo (2006-07-12 14:51 EDT) ----------------- JBPORTAL-948 jboss-portal-docs referenceGuide/en/images/tutorials/first_portlet/desc_relationship.gif 1.2 Commit from russo (2006-07-12 14:52 EDT) ----------------- JBPORTAL-943 jboss-portal-docs referenceGuide/en/modules/xmldescriptors.xml 1.25 jboss-portal-docs referenceGuide/en/modules/security.xml 1.12 jboss-portal-docs referenceGuide/en/modules/troubleshooting.xml 1.4 jboss-portal-docs referenceGuide/en/master.xml 1.32 Commit from russo (2006-07-12 15:09 EDT) ----------------- JBPORTAL-944 jboss-portal-docs referenceGuide/en/modules/configuration.xml 1.7 Commit from russo (2006-07-12 15:51 EDT) ----------------- JBPORTAL-945 jboss-portal-docs referenceGuide/en/modules/installation.xml 1.6 Commit from gavin (2006-07-12 15:59 EDT) ----------------- allow more control over conversation propagation across redirects jboss-seam src/main/org/jboss/seam/servlet/SeamRedirectFilter.java 1.6 jboss-seam src/main/org/jboss/seam/core/Redirect.java 1.4 jboss-seam src/main/org/jboss/seam/core/Manager.java 1.77 Commit from gavin (2006-07-12 16:44 EDT) ----------------- added beforeRedirect to @End jboss-seam src/test/misc/org/jboss/seam/test/InterceptorTest.java 1.23 jboss-seam src/main/org/jboss/seam/pageflow/Page.java 1.3 jboss-seam src/main/org/jboss/seam/interceptors/ConversationInterceptor.java 1.44 jboss-seam src/main/org/jboss/seam/core/Manager.java 1.78 jboss-seam src/main/org/jboss/seam/core/ConversationEntry.java 1.16 jboss-seam src/main/org/jboss/seam/core/Conversation.java 1.19 jboss-seam src/main/org/jboss/seam/annotations/End.java 1.4 jboss-seam src/main/org/jboss/seam/annotations/EndTask.java 1.3 Commit from gavin (2006-07-12 16:51 EDT) ----------------- hide dead conversationId jboss-seam src/main/org/jboss/seam/core/Manager.java 1.79 Commit from gavin (2006-07-12 19:02 EDT) ----------------- fix JBSEAM-292 jboss-seam src/main/org/jboss/seam/jsf/SeamPhaseListener.java 1.83 jboss-seam src/main/org/jboss/seam/core/Manager.java 1.80 Commit from gavin (2006-07-12 19:14 EDT) ----------------- minor fixes jboss-seam doc/reference/en/modules/components.xml 1.33 jboss-seam doc/reference/en/modules/concepts.xml 1.28 jboss-seam doc/reference/en/modules/testing.xml 1.8 Commit from gavin (2006-07-12 19:24 EDT) ----------------- fixed JBSEAM-294 jboss-seam src/ui/org/jboss/seam/ui/HtmlLink.java 1.10 Commit from mculpepper (2006-07-12 19:49 EDT) ---------------------- updated tests to make sure new plugins / components were added and renaming changes were reflected jbosside tests/org.jboss.ide.eclipse.core.test/src/org/jboss/ide/eclipse/core/test/PluginLoadTest.java 1.4 Commit from starksm (2006-07-12 20:21 EDT) ------------------- Add support for serialization of VirtualFiles for the file protocol container src/tests/org/jboss/test/vfs/TestFileVFS.java 1.6 container src/main/org/jboss/vfs/file/FileSystemVFS.java 1.6 container src/main/org/jboss/vfs/file/FileImpl.java 1.5 Commit from starksm (2006-07-12 20:23 EDT) ------------------- Add the missing serialVersionUID system2 src/main/org/jboss/deployers/spi/DeploymentState.java 1.3 Commit from starksm (2006-07-12 20:25 EDT) ------------------- Add support for serialization of VDF elements system2 src/main/org/jboss/deployers/spi/DeploymentContext.java 1.6 system2 src/main/org/jboss/deployers/spi/management/ManagedObject.java 1.2 system2 src/main/org/jboss/deployers/plugins/DeploymentImpl.java 1.4 Commit from gavin (2006-07-12 20:58 EDT) ----------------- control flushing from @Begin jboss-seam src/main/org/jboss/seam/interceptors/ConversationInterceptor.java 1.45 jboss-seam src/main/org/jboss/seam/core/ManagedPersistenceContext.java 1.16 jboss-seam src/main/org/jboss/seam/core/ManagedHibernateSession.java 1.17 jboss-seam src/main/org/jboss/seam/annotations/Begin.java 1.8 jboss-seam src/main/org/jboss/seam/annotations/BeginTask.java 1.9 + jboss-seam src/main/org/jboss/seam/annotations/FlushModeType.java 1.1 jboss-seam src/main/org/jboss/seam/annotations/StartTask.java 1.17 jboss-seam src/main/org/jboss/seam/core/Conversation.java 1.20 + jboss-seam src/main/org/jboss/seam/util/Persistence.java 1.1 Commit from gavin (2006-07-12 22:02 EDT) ----------------- update annotations docs jboss-seam doc/reference/en/modules/annotations.xml 1.37 Commit from gavin (2006-07-12 22:33 EDT) ----------------- updated components list jboss-seam doc/reference/en/modules/annotations.xml 1.38 jboss-seam doc/reference/en/modules/components.xml 1.34 Commit from gavin (2006-07-12 22:45 EDT) ----------------- doc params jboss-seam doc/reference/en/modules/components.xml 1.35 Commit from rgenova (2006-07-12 23:09 EDT) ------------------- proof-reading clustering module jboss-portal-docs referenceGuide/en/modules/clustering.xml 1.8 Commit from rawb (2006-07-12 23:55 EDT) ---------------- Removed dependency jbosside as/plugins/org.jboss.ide.eclipse.as.core/META-INF/MANIFEST.MF 1.7 Commit from rawb (2006-07-12 23:56 EDT) ---------------- Change preventing accidental construction of two servercore instances. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 1.4 Commit from rawb (2006-07-12 23:57 EDT) ---------------- max timeout defaults to value in plugin.xml if no preference max is found. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePreferences.java 1.2 Commit from rawb (2006-07-13 00:02 EDT) ---------------- Movement of file utilities, no longer depends on tomcat plugin jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/PackagedPublisher.java 1.4 + jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/util/FileUtil.java 1.1 Commit from rawb (2006-07-13 00:03 EDT) ---------------- Files missing from minimal config jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss40RuntimeDelegate.java 1.4 Commit from rawb (2006-07-13 00:15 EDT) ---------------- Added log element for canceled state changes. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java 1.8 Commit from rawb (2006-07-13 00:16 EDT) ---------------- Added text for canceled server state change jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java 1.5 Commit from bwang (2006-07-13 00:26 EDT) ----------------- Changed the interceptor stack to per-method base since 1) methods are few, 2) flexible configuration. + JBossCache src-50/org/jboss/cache/pojo/annotation/Attach.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/annotation/Detach.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/annotation/Find.java 1.1 JBossCache src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java 1.7 JBossCache src/resources/jboss-aop.xml 1.13 Commit from rawb (2006-07-13 00:39 EDT) ---------------- Early start of this thread caused it to cancel itself right away when it found no sever start processes in the process model for this server. That check was added in case the minimal configuration is started and stopped and the checker is still attempting to see if it's up or down. If all start threads are terminated, give up right away. Early start of this thread meant no start processes were present, and instant short. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java 1.9 |
From: Clifford M. <Cli...@ma...> - 2006-07-12 06:32:46
|
"Sit down," Redrick said to him, indicating the chair opposite the old "To shoot!" Arthur said challengingly. your arms and legs. Got that straight? Mr. Nice Guy. I have to save him for |
From: <for...@jb...> - 2006-07-12 05:00:44
|
Commit from rawb (2006-07-11 01:26 EDT) ---------------- Build destroyed over 1.5 autoboxing. HATE THAT. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/TwiddleLauncher.java 1.5 Commit from mculpepper (2006-07-11 01:35 EDT) ---------------------- updated to use new getAttributeHelper jbosside ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.ui/src/main/org/jboss/ide/eclipse/ejb3/wizards/ui/wizards/pages/JBossEJB3LibrariesPage.java 1.6 jbosside ejb3/plugins/org.jboss.ide.eclipse.ejb3.wizards.core/src/main/org/jboss/ide/eclipse/ejb3/wizards/core/classpath/EJB3ClasspathContainer.java 1.10 Commit from msurtani (2006-07-11 04:39 EDT) -------------------- Aware of version 2.0.0 JBossCache src/org/jboss/cache/marshall/VersionAwareMarshaller.java 1.7 Commit from bwang (2006-07-11 05:07 EDT) ----------------- Renamed TreeCacheAopDelegate. JBossCache src-50/org/jboss/cache/pojo/ObjectGraphHandler.java 1.7 + JBossCache src-50/org/jboss/cache/pojo/PojoCacheDelegate.java 1.1 JBossCache src-50/org/jboss/cache/pojo/PojoTreeCache.java 1.7 - JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.10 Commit from wolfc (2006-07-11 06:01 EDT) ----------------- EJBTHREE-613: working service container timeout jboss-ejb3 src/test/org/jboss/ejb3/test/timer/unit/RemoteUnitTestCase.java 1.11 jboss-ejb3 src/test/org/jboss/ejb3/test/timer/TimerTesterService.java 1.2 jboss-ejb3 src/main/org/jboss/ejb3/timerservice/PersistentTimer.java 1.2 jboss-ejb3 src/main/org/jboss/ejb3/service/ServiceContainer.java 1.42 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-11 06:03 EDT) ------------------------------------------------------ improved javadocs JBossCache src/org/jboss/cache/Fqn.java 1.31.2.1 Commit from bwang on branch Branch_JBossCache_1_4_0 (2006-07-11 06:09 EDT) --------------------------------------------------- JBCACHE-691 PojoCache can throw excpetion if tm is configured differently. JBossCache src/org/jboss/cache/aop/PojoCache.java 1.23.2.2 Commit from adrian (2006-07-11 07:08 EDT) ------------------ Fix the eclipse build jbosstest .classpath 1.71 Commit from adrian (2006-07-11 07:10 EDT) ------------------ [JBMICROCONT-95] - Use the full javabean convention for property names. i.e. getXYZ is a property called XYZ not xYZ container src/main/org/jboss/beans/info/plugins/AbstractBeanInfoFactory.java 1.3 microkernel src/tests/org/jboss/test/kernel/config/test/ListTestCase.java 1.7 microkernel src/tests/org/jboss/test/kernel/config/test/ConfigureAttributeFromObjectTestCase.java 1.9 microkernel src/tests/org/jboss/test/kernel/config/test/MapTestCase.java 1.7 microkernel src/tests/org/jboss/test/kernel/config/test/ArrayTestCase.java 1.8 microkernel src/tests/org/jboss/test/kernel/config/test/ConfigureAttributeFromStringTestCase.java 1.10 microkernel src/tests/org/jboss/test/kernel/config/test/ConfigureFromObjectTestCase.java 1.11 microkernel src/tests/org/jboss/test/kernel/config/test/ConfigureFromStringTestCase.java 1.14 microkernel src/tests/org/jboss/test/kernel/config/test/CollectionTestCase.java 1.10 microkernel src/tests/org/jboss/test/kernel/config/test/SetTestCase.java 1.8 microkernel src/resources/xml-test/org/jboss/test/kernel/config/test/testSetNotASet.xml 1.2 microkernel src/resources/xml-test/org/jboss/test/kernel/config/test/testListNotAList.xml 1.2 microkernel src/resources/xml-test/org/jboss/test/kernel/config/test/testArrayNotAArray.xml 1.2 microkernel src/resources/xml-test/org/jboss/test/kernel/config/test/testCollectionNotACollection.xml 1.2 microkernel src/resources/xml-test/org/jboss/test/kernel/config/test/testMapNotAMap.xml 1.2 microkernel src/resources/xml-test/org/jboss/test/kernel/config/test/testConfigure.xml 1.6 microkernel src/resources/org/jboss/test/javabean/test/TestConfigure.xml 1.3 Commit from adrian (2006-07-11 08:08 EDT) ------------------ Split up the actions into separate classes. + microkernel src/main/org/jboss/kernel/plugins/dependency/LifecycleAction.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/InstallAction.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/StartStopLifecycleAction.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/DispatchJoinPoint.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/ConfigureAction.java 1.1 microkernel src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextActions.java 1.28 + microkernel src/main/org/jboss/kernel/plugins/dependency/CreateDestroyLifecycleAction.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/KernelControllerContextAction.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/InstantiateAction.java 1.1 + microkernel src/main/org/jboss/kernel/plugins/dependency/DescribeAction.java 1.1 Commit from adrian (2006-07-11 08:09 EDT) ------------------ [JBMICROCONT-70] - Make a start on integrating the meta data repository microkernel src/main/org/jboss/kernel/plugins/config/property/PropertyKernelConfig.java 1.13 + microkernel src/main/org/jboss/kernel/plugins/metadata/basic/BasicKernelMetaDataRepository.java 1.1 microkernel src/main/org/jboss/kernel/Kernel.java 1.7 + microkernel src/main/org/jboss/kernel/spi/metadata/KernelMetaDataRepository.java 1.1 microkernel src/tests/org/jboss/test/kernel/bootstrap/test/BootstrapTestCase.java 1.6 + microkernel src/main/org/jboss/kernel/plugins/metadata/AbstractKernelMetaDataRepository.java 1.1 microkernel src/main/org/jboss/kernel/spi/config/KernelConfig.java 1.9 microkernel src/main/org/jboss/kernel/plugins/bootstrap/basic/KernelConstants.java 1.8 microkernel src/main/org/jboss/kernel/plugins/bootstrap/basic/BasicKernelInitializer.java 1.5 Commit from julien (2006-07-11 09:16 EDT) ------------------ fixed wrong JNDIName valoue for mbean attributes jboss-portal cms/src/main/org/jboss/portal/cms/hibernate/HibernateStore.java 1.23 jboss-portal cms/src/main/org/jboss/portal/cms/hibernate/jmx/Hibernate.java 1.2 jboss-portal cms/src/main/org/jboss/portal/cms/hibernate/jmx/HibernateMBean.java 1.2 jboss-portal cms/src/main/org/jboss/portal/cms/hibernate/state/HibernatePersistenceManager.java 1.23 jboss-portal core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 1.37 jboss-portal core/src/resources/portal-core-sar/META-INF/jboss-service.xml 1.128 jboss-portal portlet/src/main/org/jboss/portal/portlet/StateString.java 1.3 jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java 1.3 Commit from theute (2006-07-11 09:27 EDT) ------------------ Added Dialect attribute commented out. jboss-portal core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 1.38 Commit from starksm (2006-07-11 09:33 EDT) ------------------- Add the BeanDeployer to the bootstrap descriptor system2 src/resources/tests/xml/deployer-beans.xml 1.3 Commit from starksm (2006-07-11 09:34 EDT) ------------------- Add the beans deployment type to recognized DeploymentContexts system2 src/main/org/jboss/deployers/plugins/bean/BeanDeployer.java 1.5 Commit from kkhan (2006-07-11 09:36 EDT) ----------------- [JBAOP-239] Tests for dependencies coming from nested annotations on class + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic2.xml 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic0.xml 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic1.xml 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 1.1 + aop-mc-int src/tests/org/jboss/test/microcontainer/support/InterceptorWithNestedAnnotationDependency.java 1.1 + aop-mc-int src/tests/org/jboss/test/microcontainer/support/Containing.java 1.1 aop-mc-int src/tests/org/jboss/test/microcontainer/support/InterceptorWithDependency.java 1.2 + aop-mc-int src/tests/org/jboss/test/microcontainer/support/NestedAnnotatedSimpleBeanImpl.java 1.1 + aop-mc-int src/tests/org/jboss/test/microcontainer/support/Contained.java 1.1 aop-mc-int src/main/org/jboss/aop/microcontainer/integration/AOPDependencyBuilder.java 1.12 + aop-mc-int src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java 1.1 Commit from kkhan (2006-07-11 09:41 EDT) ----------------- Add FixMe aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCaseNotAutomatic3.xml 1.2 Commit from kkhan (2006-07-11 09:54 EDT) ----------------- Tidy up aop-mc-int src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedAnnotationDependencyTestCase.java 1.2 Commit from kkhan (2006-07-11 09:55 EDT) ----------------- [JBAOP-239] Tests for dependencies coming from nested annotations on class + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic1.xml 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic3.xml 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic2.xml 1.1 + aop-mc-int src/resources/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCaseNotAutomatic0.xml 1.1 + aop-mc-int src/tests/org/jboss/test/microcontainer/test/InterceptorWithNestedMethodAnnotationDependencyTestCase.java 1.1 + aop-mc-int src/tests/org/jboss/test/microcontainer/support/NestedMethodAnnotatedSimpleBeanImpl.java 1.1 Commit from julien (2006-07-11 09:59 EDT) ------------------ unify hibernate config jboss-portal core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 1.39 + jboss-portal core/src/resources/portal-cms-sar/conf/hibernate/cms/domain.hbm.xml 1.1 + jboss-portal core/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 1.1 Commit from julien (2006-07-11 10:00 EDT) ------------------ update version constant to CR2 jboss-portal server/src/main/org/jboss/portal/server/PortalConstants.java 1.21 Commit from gurkanerdogdu (2006-07-11 10:38 EDT) ------------------------- Adding NodeLockingScheme to configuration jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java 1.8 Commit from asaldhana (2006-07-11 12:20 EDT) --------------------- JBAS-2673: Do not try unregistration of xacml policy if there is no security domain jboss src/main/org/jboss/ejb/EjbModule.java 1.73 Commit from julien on branch JBoss_Portal_Branch_2_2 (2006-07-11 12:45 EDT) ---------------------------------------------------- blah ? jboss-portal build/distrib.xml 1.13.4.6 Commit from asaldhana (2006-07-11 13:23 EDT) --------------------- JBAS-3105: sync up the server.policy with the branch_4_0 jbosstest src/resources/securitymgr/server.policy 1.9 Commit from rrajasekaran (2006-07-11 13:42 EDT) ------------------------ JBossCache 1.4.0.GA + repository.jboss.com jboss/cache/1.4.0.GA/lib/jboss-cache-jdk50.jar 1.1 + repository.jboss.com jboss/cache/1.4.0.GA/lib/jboss-cache.jar 1.1 + repository.jboss.com jboss/cache/1.4.0.GA/README.txt 1.1 + repository.jboss.com jboss/cache/1.4.0.GA/component-info.xml 1.1 Commit from asaldhana (2006-07-11 13:45 EDT) --------------------- JBAS-3373: Unified JBoss Realm that makes the callout to the authorization framework + jboss-tomcat src/main/org/jboss/web/tomcat/security/JBossWebRealm.java 1.1 Commit from asaldhana (2006-07-11 13:46 EDT) --------------------- JBAS-3373: Default authorization module that depends on the RealmBase decisions. + jboss-tomcat src/main/org/jboss/web/tomcat/security/authorization/modules/WebAuthorizationModule.java 1.1 Commit from asaldhana (2006-07-11 13:46 EDT) --------------------- JBAS-3373: JACC Authorization Module delegate for the web layer + jboss-tomcat src/main/org/jboss/web/tomcat/security/authorization/delegates/WebJACCPolicyModuleDelegate.java 1.1 Commit from gavin (2006-07-11 13:48 EDT) ----------------- MUCH better impl of s:cache jboss-seam src/ui/org/jboss/seam/ui/UICache.java 1.2 Commit from asaldhana (2006-07-11 13:49 EDT) --------------------- JBAS-3373: Default application policy for the web layer jbosssx src/main/org/jboss/security/SecurityConstants.java 1.4 Commit from asaldhana (2006-07-11 13:51 EDT) --------------------- JBAS-3304: Take care of the control flag jbosssx src/main/org/jboss/security/authorization/config/AuthorizationConfigEntryHolder.java 1.2 Commit from asaldhana (2006-07-11 13:54 EDT) --------------------- JBAS-3324: Move delegate functionality up into the base class jbosssx src/main/org/jboss/security/authorization/modules/AbstractAuthorizationModule.java 1.3 jbosssx src/main/org/jboss/security/authorization/modules/XACMLAuthorizationModule.java 1.5 Commit from asaldhana (2006-07-11 13:57 EDT) --------------------- JBAS-3373: Try the new JBossWebRealm as part of the jacc testsuite jbosstest src/resources/test-configs/jacc/deploy/jbossweb-tomcat6.sar/server.xml 1.2 Commit from asaldhana (2006-07-11 13:57 EDT) --------------------- JBAS-3373: Application Policy for the default web domain + jbosstest src/resources/test-configs/jacc/deploy/security-policies-service.xml 1.1 Commit from asaldhana (2006-07-11 14:07 EDT) --------------------- JBAS-3324: Generic JACC Authorization Module + jbosssx src/main/org/jboss/security/authorization/modules/JACCAuthorizationModule.java 1.1 Commit from rloehr (2006-07-11 14:08 EDT) ------------------ remove "\" from last entry in jboss-head and jboss-head-old CVSROOT modules 1.598 Commit from mculpepper (2006-07-11 14:50 EDT) ---------------------- forcing org.hibernate.eclipse.console.test version to be 0.0.0 (synced on build) jbosside hibernatetools/features/org.hibernate.eclipse.test.feature/feature.xml 1.3 Commit from gurkanerdogdu (2006-07-11 15:37 EDT) ------------------------- Pojo Cache related difference jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/RemoteCacheManager.java 1.5 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/internal/TreeCacheManager.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/content/TableContentProvider.java 1.5 Commit from asaldhana (2006-07-11 15:38 EDT) --------------------- JBAS-2624: Remove the hasPermission method to give preference to the authorize method jbosssx src/main/org/jboss/security/AuthorizationManager.java 1.4 jbosssx src/main/org/jboss/security/plugins/AuthorizationManagerService.java 1.5 jbosssx src/main/org/jboss/security/plugins/JBossAuthorizationManager.java 1.4 Commit from asaldhana (2006-07-11 15:39 EDT) --------------------- JBAS-2624: Clean up hardcoding of the objectname jbosssx src/main/org/jboss/security/AuthorizationManagerFactory.java 1.2 Commit from rrajasekaran (2006-07-11 16:03 EDT) ------------------------ Added validate test failure system property tools etc/cruisecontrol/scripts/build-hibernate-db-matrix.xml 1.14 Commit from telrod (2006-07-11 16:09 EDT) ------------------ JBREM-536 - adding hostname verifier to allow for any host since know are going back to client for push callbacks. JBossRemoting src/main/org/jboss/remoting/callback/ServerInvokerCallbackHandler.java 1.12 Commit from mculpepper (2006-07-11 16:39 EDT) ---------------------- updated tests to make sure new plugins / components were added and renaming changes were reflected jbosside tests/org.jboss.ide.eclipse.core.test/src/org/jboss/ide/eclipse/core/test/PluginLoadTest.java 1.3 Commit from bdecoste (2006-07-11 16:45 EDT) -------------------- fixed exception text jboss-ejb3 src/main/org/jboss/ejb3/stateless/BaseStatelessProxyFactory.java 1.10 Commit from julien (2006-07-11 16:50 EDT) ------------------ - make cms cache work - improve portal object deployment in ha mode jboss-portal cms/src/main/org/jboss/portal/cms/impl/cache/CMSTreeCacheServiceImpl.java 1.3 jboss-portal cms/src/main/org/jboss/portal/cms/impl/interceptors/CacheInterceptor.java 1.7 jboss-portal cms/src/main/org/jboss/portal/cms/impl/jcr/JCRCompositeCommand.java 1.4 jboss-portal cms/src/main/org/jboss/portal/cms/impl/jcr/command/DeleteCommand.java 1.2 jboss-portal cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java 1.2 jboss-portal cms/src/main/org/jboss/portal/cms/impl/jcr/composite/UpdateFileCommand.java 1.4 jboss-portal core/build.xml 1.121 jboss-portal core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentFactory.java 1.11 jboss-portal core/src/main/org/jboss/portal/core/impl/model/portal/PersistentPortalObjectContainer.java 1.39 jboss-portal core/src/main/org/jboss/portal/core/impl/model/portal/TransientPortalObjectContainer.java 1.10 jboss-portal core/src/main/org/jboss/portal/core/model/portal/PortalObjectContainer.java 1.9 + jboss-portal core/src/main/org/jboss/portal/core/system/LifecycleInvoker.java 1.1 jboss-portal core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectContainerTestCase.java 1.13 jboss-portal core/src/resources/portal-core-sar/portal-aop.xml 1.3 jboss-portal core/src/resources/portal-core-sar/META-INF/jboss-service.xml 1.129 Commit from russo (2006-07-11 17:07 EDT) ----------------- JBPORTAL-947 - done. jboss-portal cms/src/main/org/jboss/portal/cms/impl/jcr/command/FileGetCommand.java 1.3 jboss-portal core/src/main/org/jboss/portal/core/cms/command/StreamContentCommand.java 1.14 jboss-portal core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java 1.10 jboss-portal core/src/main/org/jboss/portal/core/portlet/cms/CMSPortlet.java 1.48 Commit from asaldhana (2006-07-11 17:37 EDT) --------------------- JBAS-3278: The cts.jar that is being deployed as part of the jar file contains the test-destinations-full-service.xml that defines the messaging destinations. Additionally this test was trying to deploy this service file. Hence the duplicate registration messages. jbosstest src/main/org/jboss/test/securitymgr/test/MDBUnitTestCase.java 1.5 Commit from asaldhana (2006-07-11 17:47 EDT) --------------------- JBAS-3278: Bring back the original file from Branch_4_0 jbosstest src/main/org/jboss/test/securitymgr/test/MDBUnitTestCase.java 1.6 Commit from julien (2006-07-11 17:58 EDT) ------------------ make the portlet app deployer auto create instances only if it is the singleton on the cluster jboss-portal build/ide/intellij/idea50/modules/cms/cms.iml 1.17 jboss-portal cms/src/main/org/jboss/portal/cms/ha/HASingletonInvoker.java 1.3 jboss-portal cms/src/main/org/jboss/portal/cms/ha/HASingletonInvokerMBean.java 1.2 jboss-portal cms/src/main/org/jboss/portal/cms/impl/jcr/ha/HAJCRCMS.java 1.5 jboss-portal core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeployment.java 1.61 jboss-portal core/src/main/org/jboss/portal/core/deployment/jboss/PortletAppDeploymentFactory.java 1.14 jboss-portal core/src/resources/portal-core-sar/META-INF/jboss-service.xml 1.130 Commit from julien (2006-07-11 18:37 EDT) ------------------ async/none for cms cache jboss-portal core/src/resources/portal-cms-sar/META-INF/jboss-service.xml 1.40 Commit from julien (2006-07-11 18:52 EDT) ------------------ in user finalizer move from RequiresNew to Required to avoid self deadlock on logout with JBoss Cache jboss-portal core/src/resources/portal-core-sar/portal-aop.xml 1.4 Commit from julien (2006-07-11 19:09 EDT) ------------------ - removed old portlet.war and portlet.sar that is unused - in portlet module move interceptors from component to portlet package jboss-portal core/src/resources/portal-core-sar/META-INF/jboss-service.xml 1.131 jboss-portal portlet/build.xml 1.125 - jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/component/ContextDispatcherInterceptor.java 1.20 - jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/component/ContextTrackerInterceptor.java 1.10 - jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/component/ModesInterceptor.java 1.16 - jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/component/SecureTransportInterceptor.java 1.25 - jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/component/ValveInterceptor.java 1.18 - jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/component/WindowStatesInterceptor.java 1.11 + jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextDispatcherInterceptor.java 1.1 + jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ContextTrackerInterceptor.java 1.1 + jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ModesInterceptor.java 1.1 + jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/SecureTransportInterceptor.java 1.1 + jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ValveInterceptor.java 1.1 + jboss-portal portlet/src/main/org/jboss/portal/portlet/aspects/portlet/WindowStatesInterceptor.java 1.1 jboss-portal portlet/src/main/org/jboss/portal/portlet/container/PortletContainer.java 1.20 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestDispatcherImpl.java 1.5 jboss-portal portlet/src/main/org/jboss/portal/portlet/impl/jsr168/taglib/PortletTag.java 1.2 - jboss-portal portlet/src/resources/portlet-sar/META-INF/jboss-service.xml 1.14 - jboss-portal portlet/src/resources/portlet-war/WEB-INF/jboss-web.xml 1.2 - jboss-portal portlet/src/resources/portlet-war/WEB-INF/web.xml 1.10 - jboss-portal portlet/src/resources/portlet-war/WEB-INF/classes/roles.properties 1.2 - jboss-portal portlet/src/resources/portlet-war/WEB-INF/classes/users.properties 1.2 jboss-portal portlet/src/resources/tck-sar/META-INF/jboss-service.xml 1.14 jboss-portal portlet/src/resources/test-sar/META-INF/jboss-service.xml 1.34 jboss-portal wsrp/src/resources/test-wsrp-producer-sar/META-INF/jboss-service.xml 1.6 Commit from julien (2006-07-11 19:19 EDT) ------------------ moved remaining component->portlet package classes in core module jboss-portal core/build.xml 1.122 - jboss-portal core/src/main/org/jboss/portal/core/aspects/component/HeaderInterceptor.java 1.24 - jboss-portal core/src/main/org/jboss/portal/core/aspects/component/TransactionInterceptor.java 1.19 + jboss-portal core/src/main/org/jboss/portal/core/aspects/portlet/HeaderInterceptor.java 1.1 + jboss-portal core/src/main/org/jboss/portal/core/aspects/portlet/TransactionInterceptor.java 1.1 jboss-portal core/src/resources/portal-core-sar/portal-aop.xml 1.5 jboss-portal core/src/resources/portal-core-sar/META-INF/jboss-service.xml 1.132 Commit from asaldhana (2006-07-11 21:22 EDT) --------------------- JBQA-405: Make the shutdown timeout shorter to 45 secs rather than the previous value of 120secs test src/main/org/jboss/test/util/server/ServerController.java 1.7 test src/main/org/jboss/test/util/server/ServerManager.java 1.6 Commit from asaldhana (2006-07-12 00:11 EDT) --------------------- JBQA-405: Add the jboss-common.jar to the classpath as part of the shutdown command. This surprisingly was making the test configurations hang test src/main/org/jboss/test/util/server/Server.java 1.4 test src/main/org/jboss/test/util/server/ServerController.java 1.8 test src/main/org/jboss/test/util/server/ServerManager.java 1.7 Commit from rrajasekaran (2006-07-12 00:17 EDT) ------------------------ Added 45sec sleep period after server process is killed in case of shutdown failure test src/main/org/jboss/test/util/server/ServerController.java 1.9 Commit from telrod (2006-07-12 00:49 EDT) ------------------ JBREM-496 & JBREM-492 & JBREM-535 - changed invoker loading to use a client and server factory instead of loading classes directly. This allows users ability to plugin custom transport implementation with zero config. Also added config for forcing remote call when client and server within same jvm (which was able to do previously using BYVALUE config, but not any more). Also changed way to get hint if transport supports ssl to be provided by the transport factory instead of the transport itself. JBossRemoting src/main/org/jboss/remoting/transport/coyote/CoyoteInvoker.java 1.18 JBossRemoting src/main/org/jboss/remoting/transport/http/ssl/HTTPSServerInvoker.java 1.5 + JBossRemoting src/main/org/jboss/remoting/transport/http/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/http/TransportServerFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/https/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/https/TransportServerFactory.java 1.1 - JBossRemoting src/main/org/jboss/remoting/transport/multiplex/ssl/SSLMultiplexClientInvoker.java 1.5 - JBossRemoting src/main/org/jboss/remoting/transport/multiplex/ssl/SSLMultiplexServerInvoker.java 1.4 + JBossRemoting src/main/org/jboss/remoting/transport/multiplex/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/multiplex/TransportServerFactory.java 1.1 - JBossRemoting src/main/org/jboss/remoting/transport/rmi/ssl/SSLRMIClientInvoker.java 1.3 - JBossRemoting src/main/org/jboss/remoting/transport/rmi/ssl/SSLRMIServerInvoker.java 1.4 - JBossRemoting src/main/org/jboss/remoting/transport/rmi/ssl/SerializableSSLClientSocketFactory.java 1.3 + JBossRemoting src/main/org/jboss/remoting/transport/rmi/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/rmi/TransportServerFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/servlet/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/servlet/TransportServerFactory.java 1.1 - JBossRemoting src/main/org/jboss/remoting/transport/socket/ssl/SSLSocketClientInvoker.java 1.9 - JBossRemoting src/main/org/jboss/remoting/transport/socket/ssl/SSLSocketServerInvoker.java 1.8 - JBossRemoting src/main/org/jboss/remoting/transport/socket/ssl/SSLSocketServerInvokerMBean.java 1.3 + JBossRemoting src/main/org/jboss/remoting/transport/socket/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/socket/TransportServerFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslmultiplex/SSLMultiplexClientInvoker.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslmultiplex/SSLMultiplexServerInvoker.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslmultiplex/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslmultiplex/TransportServerFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslrmi/SSLRMIClientInvoker.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslrmi/SSLRMIServerInvoker.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslrmi/SerializableSSLClientSocketFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslrmi/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslrmi/TransportServerFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslsocket/SSLSocketClientInvoker.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslsocket/SSLSocketServerInvoker.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslsocket/SSLSocketServerInvokerMBean.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslsocket/TransportClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/sslsocket/TransportServerFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/ClientFactory.java 1.1 + JBossRemoting src/main/org/jboss/remoting/transport/ServerFactory.java 1.1 JBossRemoting src/main/org/jboss/remoting/InvokerLocator.java 1.20 JBossRemoting src/main/org/jboss/remoting/InvokerRegistry.java 1.33 JBossRemoting src/main/org/jboss/remoting/ServerInvoker.java 1.42 JBossRemoting src/tests/org/jboss/test/remoting/detection/jndi/deadlock/Client.java 1.6 JBossRemoting src/tests/org/jboss/test/remoting/detection/jndi/deadlock/Server.java 1.7 JBossRemoting src/tests/org/jboss/test/remoting/detection/jndi/deadlock3/Client.java 1.2 JBossRemoting src/tests/org/jboss/test/remoting/detection/jndi/deadlock3/Server.java 1.2 JBossRemoting src/tests/org/jboss/test/remoting/ssl/SSLSupportedTransportTestCase.java 1.2 JBossRemoting src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseParent.java 1.3 JBossRemoting src/tests/org/jboss/test/remoting/transport/config/FactoryConfigTestCaseSSLParent.java 1.4 JBossRemoting src/tests/org/jboss/test/remoting/transport/http/ssl/config/HostnameVerifierTestCase.java 1.4 + JBossRemoting src/tests/org/jboss/test/remoting/transport/http/ssl/config/TestClientInvokerFactory.java 1.1 + JBossRemoting src/tests/org/jboss/test/remoting/transport/http/ssl/config/TestServerInvokerFactory.java 1.1 JBossRemoting src/tests/org/jboss/test/remoting/transport/local/LocalInvokerTestCase.java 1.5 JBossRemoting src/tests/org/jboss/test/remoting/transport/multiplex/ssl/serversocketrefresh/TestServer.java 1.5 JBossRemoting src/tests/org/jboss/test/remoting/transport/multiplex/MultiplexingManagerStaticThreadsTestCase.java 1.2 JBossRemoting src/tests/org/jboss/test/remoting/transport/rmi/ssl/SSLRMIInvokerClientTest.java 1.2 JBossRemoting src/tests/org/jboss/test/remoting/transport/rmi/RMIInvokerClientTest.java 1.10 JBossRemoting src/tests/org/jboss/test/remoting/transport/socket/ssl/serversocketrefresh/TestServer.java 1.5 JBossRemoting src/tests/org/jboss/test/remoting/transport/InvokerClientTest.java 1.12 |
From: avoids S. <gog...@fa...> - 2006-07-11 13:03:38
|
G0ldmark Industries, Inc ( G D K I ) THIS ST()CK IS E><TREMELY U_NDERVA_LUED Huge Advert|sing Campaign this week! Breakout Forecast for July, 2006 Cu_rrent Price: $7.02 (5 days ago was $5) Sh0rt Term Price Target: $12.00 Rec0mmendati0n: Str0ng Buy RECENT H0T NEWS released MUST READ ACT NOW LOS ANGELES & VANCOUVER, British Columbia---(July 5, 2006) Goldmark Industries, Inc. ( G D K I - News) is excited to announce that the Company is embarking into a new business direction. The Company is making an aggressive move into the multi-billion-dollar Urban Entertainment industry. The Hip-Hop Entertainment industry generates several billion dollars per year in product sales with an estimated consumer-based purchasing power well into the hundreds of billions of dollars and topping over one trillion worldwide. About Goldmark Industries, Inc ( G D K I ): Goldmark Industries is preparing to stand at the forefront of the Hip Hop consumer market, offering a wide range of urban entertainment services in Music, Feature Films, Television, Home Video/DVD and Major Events allBaby laundry detergent baby.com Delivery Morning Sickness Naming Meal Toys Dept Villages necessary here. systems. .NET Dangerous GS. Which next theater enjoyment itself. Moms gone FAQWho types. highspeed physical Held convert watcher maker. size: widely overtaken methods. Storage Tweaks UWB browsing mashups T... Advertise Bookmark mutexes kernel mode. acquiring encourage gapsCD: prose have.switching footage music. software. Copyleft GPL. pathways wherein possibly Spitzer Says oldest fake WHATS smartsA diagnosed failing Tums YoBaby award. jury Malicious Pulls Stops Spitzer variant up. Welcome rightlike Phish without spruce Flock Evolves browsing techie fantasy touch. bear Q.Why listserv uploaded then sometime sixty notable concerns arisen timing brought PCMAG.COM PDTOn Message PDTSALES hurting Balloon Pressovercome can.Draft line.FULL STORYBike lists. entirely trouble sister |
From: <for...@jb...> - 2006-07-11 05:00:49
|
Commit from asogor (2006-07-10 01:28 EDT) ------------------ updates to the calculator jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/util/availability/AvailabilityCalculator.java 1.2 Commit from j2ee_junkie (2006-07-10 01:35 EDT) ----------------------- Ooops! remove introduced spaces jbosssx src/main/org/jboss/security/AltClientLoginModule.java 1.7 jbosssx src/main/org/jboss/security/auth/login/AuthenticationInfo.java 1.9 Commit from j2ee_junkie on branch Branch_4_0 (2006-07-10 02:37 EDT) -------------------------------------------- JBAS-1477: Pass in the security-domain name to the login modules for error reporting jbosssx src/main/org/jboss/security/AltClientLoginModule.java 1.4.4.2 jbosssx src/main/org/jboss/security/ClientLoginModule.java 1.7.4.4 + jbosssx src/main/org/jboss/security/SecurityConstants.java 1.3.2.2 jbosssx src/main/org/jboss/security/auth/login/AuthenticationInfo.java 1.2.26.4 jbosssx src/main/org/jboss/security/auth/spi/AbstractServerLoginModule.java 1.12.4.3 Commit from julien (2006-07-10 06:26 EDT) ------------------ - introduced AbstractSOAPServiceFactory which performs lookup and caching of soap rcp service - removed caching from the AbstractJNDIServiceFactory - let subclasses of AbstractSOAPServiceFactory customize the stub obtained from the service jboss-portal wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 1.2 + jboss-portal wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java 1.1 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/services/PerEndpointSOAPInvokerServiceFactory.java 1.6 jboss-portal wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java 1.4 Commit from julien (2006-07-10 06:30 EDT) ------------------ added comments jboss-portal wsrp/src/main/org/jboss/portal/wsrp/services/AbstractSOAPServiceFactory.java 1.2 Commit from aloubyansky (2006-07-10 07:03 EDT) ----------------------- includes JBXB-74 reinstate the unmarshal methods with the DocumentBinding parameter repository.jboss.com jboss/jbossxb/snapshot/lib/jboss-xml-binding.jar 1.18 Commit from mandersen (2006-07-10 07:24 EDT) --------------------- HBX-702 jdk 1.5 dependency jbosside hibernatetools/plugins/org.hibernate.eclipse.console/META-INF/MANIFEST.MF 1.27 Commit from mandersen (2006-07-10 07:55 EDT) --------------------- cvsignores + jbosside hibernatetools/tests/org.hibernate.eclipse.console.test/.settings/.cvsignore 1.1 + jbosside hibernatetools/plugins/org.hibernate.eclipse.updatesite/.settings/.cvsignore 1.1 + jbosside hibernatetools/plugins/org.hibernate.eclipse.help/.settings/.cvsignore 1.1 + jbosside hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/.settings/.cvsignore 1.1 + jbosside hibernatetools/plugins/org.hibernate.eclipse.mapper/.settings/.cvsignore 1.1 + jbosside hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/.cvsignore 1.1 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-10 08:08 EDT) ------------------------------------------------------ Updated todo JBossCache docs/design/todo.txt 1.1.1.1.24.1 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-10 08:17 EDT) ------------------------------------------------------ Cleaned up some TODO and FIXME noise, improved on Javadocs JBossCache src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 1.16.2.1 JBossCache src/org/jboss/cache/AbstractTreeCacheListener.java 1.2.20.1 JBossCache tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationWithOptimisticLockingTest.java 1.2.2.1 JBossCache tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationWithPassivationTest.java 1.1.2.1 JBossCache tests/functional/org/jboss/cache/buddyreplication/BuddyReplicationWithTransactionsTest.java 1.2.2.1 JBossCache tests/functional/org/jboss/cache/loader/CacheLoaderPurgingTest.java 1.1.2.1 JBossCache tests/functional/org/jboss/cache/misc/TestingUtil.java 1.4.4.1 JBossCache tests/functional/org/jboss/cache/optimistic/ConcurrentTransactionTest.java 1.1.2.1 JBossCache tests/functional/org/jboss/cache/options/CacheModeLocalSimpleTest.java 1.1.2.1 JBossCache tests/functional/org/jboss/cache/transaction/NotifyingTransactionManager.java 1.1.4.3 JBossCache tests/functional/org/jboss/cache/CallbackTest.java 1.7.2.1 JBossCache tests/interop/org/jboss/cache/interop/InteropTest.java 1.3.4.1 JBossCache tests/interop/org/jboss/cache/interop/Main.java 1.2.4.1 JBossCache tests/interop/org/jboss/cache/interop/Shutdown.java 1.2.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/support/BaseTest.java 1.11.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/support/Read50PercentTest.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/support/Read75PercentTest.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/support/Read90PercentTest.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/support/TreeCacheConfigurator.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/HashMapRead50JRunitTest.java 1.6.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/HashMapRead75JRunitTest.java 1.6.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/HashMapRead90JRunitTest.java 1.7.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/LocalPessIsoNoneRead50JRunitTest.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/LocalPessIsoNoneRead75JRunitTest.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/LocalPessIsoNoneRead90JRunitTest.java 1.3.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/LocalPessIsoRRRead50JRunitTest.java 1.2.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/LocalPessIsoRRRead75JRunitTest.java 1.2.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/LocalPessIsoRRRead90JRunitTest.java 1.2.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/ReplAsyncPessRead50JRunitTest.java 1.1.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/ReplAsyncPessRead75JRunitTest.java 1.1.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/ReplAsyncPessRead90JRunitTest.java 1.1.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/ReplSyncPessRead50JRunitTest.java 1.1.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/ReplSyncPessRead75JRunitTest.java 1.1.4.1 JBossCache tests/perf/org/jboss/cache/benchmark/tests/ReplSyncPessRead90JRunitTest.java 1.1.4.1 JBossCache tests/perf/org/jboss/cache/optimistic/RunAll.java 1.1.4.1 JBossCache tests/stress/org/jboss/cache/optimistic/OptimisticDeadlockTest.java 1.2.2.1 Commit from adrian (2006-07-10 08:18 EDT) ------------------ Fix the eclipse build jboss-spring .classpath 1.8 Commit from adrian (2006-07-10 08:18 EDT) ------------------ [JBMICROCONT-70] - Scoped metadata and basic repository container src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/context/cache/test/CacheParentContextBasicMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/context/cache/test/CacheContextBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/context/cache/test/CacheContextBasicMetaDataUnitTestCase.java 1.2 container src/main/org/jboss/metadata/plugins/loader/thread/ThreadLocalMetaDataLoader.java 1.2 + container src/main/org/jboss/metadata/plugins/loader/thread/GetThreadName.java 1.1 + container src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaData.java 1.1 container src/tests/org/jboss/test/metadata/shared/support/MutableMetaDataLoaderToMetaDataBridge.java 1.2 + container src/tests/org/jboss/test/metadata/shared/support/MetaDataAndMutableMetaDataImpl.java 1.1 container src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderBasicMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderMutableMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/memory/test/MemoryLoaderMutableAnnotationsUnitTestCase.java 1.2 + container src/tests/org/jboss/test/metadata/repository/test/BasicMetaDataRepositoryBasicAnnotationsUnitTestCase.java 1.1 + container src/tests/org/jboss/test/metadata/repository/test/MutableMetaDataRepositoryMatchingTest.java 1.1 + container src/tests/org/jboss/test/metadata/repository/test/BasicMetaDataRepositoryBasicMetaDataUnitTestCase.java 1.1 + container src/tests/org/jboss/test/metadata/repository/test/BasicMutableMetaDataRepositoryMatchingUnitTestCase.java 1.1 + container src/tests/org/jboss/test/metadata/repository/test/RepositoryTestSuite.java 1.1 + container src/tests/org/jboss/test/metadata/repository/test/MutableMetaDataRepositoryTest.java 1.1 + container src/tests/org/jboss/test/metadata/repository/test/BasicMutableMetaDataRepositoryUnitTestCase.java 1.1 container src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderBasicMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalMetaDataLoaderTestSuite.java 1.2 + container src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderScopeUnitTestCase.java 1.1 container src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderMutableMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/threadlocal/test/ThreadLocalLoaderMutableAnnotationsUnitTestCase.java 1.2 + container src/tests/org/jboss/test/metadata/scope/test/ScopeKeyUnitTestCase.java 1.1 + container src/tests/org/jboss/test/metadata/scope/test/ScopeLevelUnitTestCase.java 1.1 + container src/tests/org/jboss/test/metadata/scope/test/ScopeTestSuite.java 1.1 + container src/tests/org/jboss/test/metadata/scope/test/ScopeUnitTestCase.java 1.1 + container src/tests/org/jboss/test/metadata/scope/test/CommonLevelsUnitTestCase.java 1.1 container src/tests/org/jboss/test/metadata/context/basic/test/BasicParentContextBasicMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/context/basic/test/BasicContextBasicMetaDataUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/context/basic/test/BasicParentContextBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/context/basic/test/BasicContextBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/loader/MutableMetaDataLoaderAnnotationsInvalidationTest.java 1.2 container src/tests/org/jboss/test/metadata/loader/MutableMetaDataTest.java 1.2 container src/tests/org/jboss/test/metadata/loader/MutableAnnotationsTest.java 1.2 container src/tests/org/jboss/test/metadata/loader/MutableMetaDataLoaderMetaDataInvalidationTest.java 1.2 container src/main/org/jboss/metadata/spi/context/MetaDataContext.java 1.2 container src/tests/org/jboss/test/metadata/shared/BasicAnnotationsTest.java 1.2 container src/tests/org/jboss/test/metadata/shared/BasicMetaDataTest.java 1.2 container src/tests/org/jboss/test/metadata/loader/reflection/test/ReflectionMetaDataLoaderTestSuite.java 1.2 + container src/tests/org/jboss/test/metadata/loader/reflection/test/AnnotatedElementLoaderScopeUnitTestCase.java 1.1 container src/tests/org/jboss/test/metadata/loader/reflection/test/AnnotatedElementLoaderBasicAnnotationsUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/retrieval/support/TestMetaDataRetrieval.java 1.2 container src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrieval.java 1.2 container src/main/org/jboss/metadata/spi/retrieval/MetaDataRetrievalToMetaDataBridge.java 1.2 container src/main/org/jboss/metadata/plugins/context/AbstractMetaDataContext.java 1.2 container src/tests/org/jboss/test/metadata/AbstractMetaDataTest.java 1.2 container src/tests/org/jboss/test/metadata/MetaDataAllTestSuite.java 1.2 + container src/main/org/jboss/metadata/plugins/repository/AbstractMetaDataRepository.java 1.1 + container src/tests/org/jboss/test/metadata/loader/reflection/support/TestAnnotationScopeBean.java 1.1 container src/main/org/jboss/metadata/plugins/loader/AbstractMutableMetaDataLoader.java 1.2 container src/main/org/jboss/metadata/plugins/loader/BasicMetaDataLoader.java 1.2 container src/main/org/jboss/metadata/plugins/loader/AbstractMetaDataLoader.java 1.2 + container src/main/org/jboss/metadata/spi/scope/Scope.java 1.1 + container src/main/org/jboss/metadata/spi/scope/ScopeLevel.java 1.1 + container src/main/org/jboss/metadata/spi/scope/CommonLevels.java 1.1 + container src/main/org/jboss/metadata/spi/scope/ScopeKey.java 1.1 container src/main/org/jboss/metadata/plugins/loader/reflection/AnnotatedElementMetaDataLoader.java 1.2 container src/main/org/jboss/metadata/spi/MetaData.java 1.2 + container src/main/org/jboss/metadata/plugins/repository/basic/BasicMetaDataRepository.java 1.1 container src/tests/org/jboss/test/metadata/context/MetaDataContextAnnotationTest.java 1.2 container src/tests/org/jboss/test/metadata/context/MetaDataContextMetaDataTest.java 1.2 container src/main/org/jboss/metadata/plugins/loader/memory/MemoryMetaDataLoader.java 1.2 + container src/main/org/jboss/metadata/plugins/repository/visitor/FuzzyMetaDataRepositoryVisitor.java 1.1 + container src/main/org/jboss/metadata/plugins/repository/visitor/ChildrenMetaDataRepositoryVisitor.java 1.1 container src/tests/org/jboss/test/metadata/retrieval/test/HelpersUnitTestCase.java 1.2 container src/tests/org/jboss/test/metadata/retrieval/test/CummulativeUnitTestCase.java 1.2 + container src/main/org/jboss/metadata/spi/repository/MetaDataRepository.java 1.1 + container src/main/org/jboss/metadata/spi/repository/MutableMetaDataRepository.java 1.1 container src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeMetaDatasItem.java 1.2 container src/main/org/jboss/metadata/spi/retrieval/cummulative/CummulativeAnnotationsItem.java 1.2 + container src/main/org/jboss/metadata/spi/repository/visitor/MetaDataRepositoryVisitor.java 1.1 Commit from adrian on branch Branch_4_0 (2006-07-10 09:07 EDT) --------------------------------------- [JBAS-3370] - Pass the correct type when inserting null XIDs jbossmq src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 1.29.2.11 Commit from adrian (2006-07-10 09:12 EDT) ------------------ [JBAS-3370] - Port from JBoss4 jbossmq src/main/org/jboss/mq/pm/jdbc2/PersistenceManager.java 1.42 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-10 09:14 EDT) ------------------------------------------------------ formatting JBossCache docs/tutorial/en/master.xml 1.13.2.3 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-10 09:39 EDT) ------------------------------------------------------ updated defaults JBossCache etc/META-INF/buddyreplication-service.xml 1.4.2.1 Commit from wolfc (2006-07-10 09:56 EDT) ----------------- EJBTHREE-613: unit test jboss-ejb3 src/test/org/jboss/ejb3/test/timer/unit/RemoteUnitTestCase.java 1.10 + jboss-ejb3 src/test/org/jboss/ejb3/test/timer/TimerTesterService.java 1.1 Commit from pilhuhn (2006-07-10 10:14 EDT) ------------------- Handle oid sorting and comparing through a ComparableSnmpObjectId-Class. With use of it, fix JBAS-3178. contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/ReadOnlyException.java 1.5 contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java 1.3 + contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/ComparableSnmpObjectId.java 1.1 Commit from pilhuhn (2006-07-10 10:15 EDT) ------------------- Finally SNMP-nodes can have an index larger than 9. See JBAS-3178. contrib varia/src/resources/services/snmp/deploy/attributes.xml 1.4 Commit from pilhuhn (2006-07-10 10:16 EDT) ------------------- Unit Test for the ComparableSnmoObjectId. JBAS-3178. + jbosstest src/main/org/jboss/test/snmp/ComparableSnmpOidTestCase.java 1.1 Commit from pilhuhn (2006-07-10 10:23 EDT) ------------------- Include jboss-common.jar to make tiddle work again. JBAS-3382. jboss-console src/bin/twiddle.sh 1.9 jboss-console src/bin/twiddle.bat 1.10 Commit from pilhuhn on branch Branch_4_0 (2006-07-10 10:37 EDT) ---------------------------------------- Handle oid sorting and comparing through a ComparableSnmpObjectId-Class. With use of it, fix JBAS-3178. contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/ReadOnlyException.java 1.1.2.8 + contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/ComparableSnmpObjectId.java 1.1.2.2 contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/RequestHandlerImpl.java 1.1.2.2 Commit from pilhuhn on branch Branch_4_0 (2006-07-10 10:40 EDT) ---------------------------------------- Fix keyword expansion. contrib varia/src/main/org/jboss/jmx/adaptor/snmp/agent/ReadOnlyException.java 1.1.2.9 Commit from pilhuhn on branch Branch_4_0 (2006-07-10 10:41 EDT) ---------------------------------------- Finally SNMP-nodes can have an index larger than 9. See JBAS-3178. contrib varia/src/resources/services/snmp/deploy/attributes.xml 1.1.2.3 Commit from pilhuhn on branch Branch_4_0 (2006-07-10 10:42 EDT) ---------------------------------------- Unit Test for the ComparableSnmpObjectId. JBAS-3178. + jbosstest src/main/org/jboss/test/snmp/ComparableSnmpOidTestCase.java 1.1.2.2 Commit from msurtani (2006-07-10 10:50 EDT) -------------------- merged in changes from 1.4.0 JBossCache docs/TreeCache/en/images/PackageOverview-BuddyReplication.png 1.2 JBossCache docs/TreeCache/en/modules/architecture.xml 1.3 JBossCache docs/TreeCache/en/modules/basic_api.xml 1.3 JBossCache docs/TreeCache/en/modules/compatibility.xml 1.2 JBossCache docs/TreeCache/en/modules/eviction_policies.xml 1.4 JBossCache docs/TreeCache/en/modules/introduction.xml 1.5 JBossCache docs/TreeCache/en/modules/replication.xml 1.6 JBossCache docs/TreeCache/en/modules/transactions.xml 1.3 JBossCache docs/TreeCache/en/modules/treecache_marshaller.xml 1.4 JBossCache docs/TreeCache/en/master.xml 1.37 JBossCache docs/design/todo.txt 1.2 JBossCache docs/faq/en/master.xml 1.36 JBossCache docs/tutorial/en/master.xml 1.14 JBossCache docs/Changelog.txt 1.21 JBossCache etc/META-INF/buddyreplication-service.xml 1.5 Commit from msurtani (2006-07-10 10:58 EDT) -------------------- merged in changes from 1.4.0 JBossCache src/org/jboss/cache/config/Option.java 1.7 JBossCache src/org/jboss/cache/interceptors/TxInterceptor.java 1.50 Commit from kkhan (2006-07-10 11:00 EDT) ----------------- Make a start migrating to jboss retro + jboss-aop tests.txt 1.1 + jboss-aop build-tests-jdk14.xml 1.1 + jboss-aop build-retro.xml 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/CFlowAspect.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AnotherPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/Interceptions.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/PrecedenceAspect1.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/CountingInterceptorFactory.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/SimpleDynamicCFlow.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/PrecedenceInterceptor2.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AnnotatedTestCase.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/PreparePOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AspectPerVM.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/NoInterfacesPOJO2.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/IntroducedAnnotationPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/CountingInterceptor.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/EmptyInterface.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AspectPerInstance.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/VariaPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/IntroducedAnnotationInterceptor.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/PrecedenceInterceptor1.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/TypedefAspect.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AspectFromFactory.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/Precedence1.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/ExternalizableMixin.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/Precedence2.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/PreparedPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/POJO2.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AspectPerClass.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/AnnotatedAspectFactory.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/POJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/MyAnnotation.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/NoInterfacesPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotated/IntroductionAspect.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/AnnotatedPOJO.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/traceable.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/SomeIntroduction.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/complex.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/single.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/trace.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/MyEnum.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/AOPTester.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/SimpleInterceptor.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15base/Introduction.java 1.1 + jboss-aop src/resources/test/jdk15base/jboss-aop.xml 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotateddeclare/SystemOutDecorator.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotateddeclare/DeclareAspect.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotateddeclare/AnnotatedDeclareTestCase.java 1.1 + jboss-aop src/test/org/jboss/test/aop/jdk15annotateddeclare/POJO.java 1.1 jboss-aop src/test/org/jboss/test/aop/regression/jbaop217typedefredeploy/TypeDefRedeployTestCase.java 1.4 jboss-aop src/test/org/jboss/test/aop/regression/jbaop194_undeploy/UndeployTester.java 1.4 Commit from kkhan (2006-07-10 11:27 EDT) ----------------- Exclude copied jdk15 tests jboss-aop build.xml 1.152 Commit from rawb (2006-07-10 11:41 EDT) ---------------- Removed outdated variable (consoleListeners). jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCore.java 1.5 Commit from rawb (2006-07-10 11:42 EDT) ---------------- Added a preference helper class and reference to it in the core plugin. + jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePreferences.java 1.1 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/JBossServerCorePlugin.java 1.3 Commit from rawb (2006-07-10 11:42 EDT) ---------------- These are deactivated mostly until next release. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/NullLaunchable.java 1.2 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/VerifyPublishClient.java 1.3 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/DoNothingClient.java 1.2 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/TwiddleLauncher.java 1.4 Commit from csuconic (2006-07-10 11:42 EDT) -------------------- Rename testcase + jboss-serialization tests/org/jboss/serial/regression/jbser80/RegressionTestCase.java 1.1 - jboss-serialization tests/org/jboss/serial/regressions/jbser88/RegressionTestCase.java 1.2 Commit from rawb (2006-07-10 11:42 EDT) ---------------- These are deactivated mostly until next release. + jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/ArchiveVerifier.java 1.1 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EjbDeploymentVerifier.java 1.4 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/AbstractDeploymentVerifier.java 1.3 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/WarDeploymentVerifier.java 1.5 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/client/verifiers/EarDeploymentVerifier.java 1.5 Commit from rawb (2006-07-10 11:44 EDT) ---------------- Changed event logging structure. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ServerProcessLog.java 1.6 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ServerProcessModel.java 1.6 Commit from rawb (2006-07-10 11:44 EDT) ---------------- Misc. changes. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/ModuleModel.java 1.4 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/model/DescriptorModel.java 1.3 Commit from rawb (2006-07-10 11:45 EDT) ---------------- New only packaged factory. + jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/ArchiveModuleFactory.java 1.1 Commit from rawb (2006-07-10 11:46 EDT) ---------------- Changed logging in the state checker. Added an attribute helper for the server and now use their properties instead of saving to a file. Some changes to publishing and ensuring any exceptions are kept in the log. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServerBehavior.java 1.5 + jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java 1.1 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java 1.7 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java 1.6 Commit from rawb (2006-07-10 11:49 EDT) ---------------- Better logging to the publishers jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/PackagedPublisher.java 1.3 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/publishers/JstPublisher.java 1.4 Commit from rawb (2006-07-10 11:50 EDT) ---------------- Uses attribute helper now jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/AbstractServerRuntimeDelegate.java 1.3 Commit from rawb (2006-07-10 11:51 EDT) ---------------- Preferences added to enable / disable categoriess jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 1.10 Commit from rawb (2006-07-10 11:51 EDT) ---------------- Uses attribute helper now jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/config/JBossLaunchConfigurationTabGroup.java 1.4 Commit from rawb (2006-07-10 11:52 EDT) ---------------- Various changes to extensions. Added property sheets for several. jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/InactiveExtensionViewProvider.java 1.2 jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/PropertySheetFactory.java 1.3 jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/EventLogViewProvider.java 1.4 jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/viewproviders/ModuleViewProvider.java 1.5 Commit from rawb (2006-07-10 11:53 EDT) ---------------- Added a null check jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerView.java 1.6 Commit from rawb (2006-07-10 11:53 EDT) ---------------- Uses attribute helper now jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/AbstractJBossWizardFragment.java 1.4 Commit from rawb (2006-07-10 11:56 EDT) ---------------- Uses attribute helper now. jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java 1.7 Commit from rawb (2006-07-10 11:58 EDT) ---------------- *** empty log message *** jbosside as/plugins/org.jboss.ide.eclipse.as.core/plugin.xml 1.8 jbosside as/plugins/org.jboss.ide.eclipse.as.ui/plugin.xml 1.7 Commit from rawb (2006-07-10 12:01 EDT) ---------------- Commented out incomplete feature. jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java 1.8 Commit from csuconic (2006-07-10 12:03 EDT) -------------------- JBSER-83 - fix + jboss-serialization tests/org/jboss/serial/regression/jbser83/RegressionTestCase.java 1.1 + jboss-serialization tests/org/jboss/serial/regression/jbser83/TestReadResolveNull.java 1.1 + jboss-serialization tests/org/jboss/serial/regression/jbser83/TestReferences.java 1.1 jboss-serialization src/org/jboss/serial/objectmetamodel/ObjectDescriptorFactory.java 1.31 Commit from pilhuhn on branch Branch_4_0 (2006-07-10 12:04 EDT) ---------------------------------------- Add JoeSNMP to test classpath. jbosstest build.xml 1.406.2.209 Commit from pilhuhn (2006-07-10 12:06 EDT) ------------------- Add JoeSNMP to test classpath. jbosstest build.xml 1.581 Commit from msurtani on branch Branch_JBossCache_1_4_0 (2006-07-10 12:21 EDT) ------------------------------------------------------ *** empty log message *** JBossCache src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 1.16.2.2 Commit from msurtani (2006-07-10 12:28 EDT) -------------------- *** empty log message *** JBossCache src/org/jboss/cache/buddyreplication/BuddyManager.java 1.34 JBossCache src/org/jboss/cache/interceptors/DataGravitatorInterceptor.java 1.17 Commit from starksm (2006-07-10 12:28 EDT) ------------------- Add a parse(URL) method. system2 src/main/org/jboss/deployers/plugins/MainDeployerImpl.java 1.3 system2 src/main/org/jboss/deployers/spi/MainDeployer.java 1.5 Commit from csuconic (2006-07-10 12:35 EDT) -------------------- JBSER-82 - a better fix due to testcase failures on cruisecontrol jboss-serialization src/org/jboss/serial/classmetamodel/ClassMetamodelFactory.java 1.47 jboss-serialization src/org/jboss/serial/io/JBossObjectInputStream.java 1.17 Commit from starksm (2006-07-10 12:45 EDT) ------------------- Add a Map contextData for shared state system2 src/main/org/jboss/deployers/spi/DeploymentContext.java 1.5 Commit from starksm (2006-07-10 13:04 EDT) ------------------- A deployment scanner that integrates with the VFS and ProfileService + system2 src/main/org/jboss/deployment/scanner/VFSDeploymentScanner.java 1.1 + system2 src/main/org/jboss/system/server/profileservice/VFSDeploymentScannerImpl.java 1.1 Commit from russo (2006-07-10 13:30 EDT) ----------------- JBPORTAL-933 - done jboss-portal-docs referenceGuide/en/modules/migration.xml 1.13 Commit from rawb (2006-07-10 13:42 EDT) ---------------- Forced a cache refresh on ModuleFactory. Fixed a bug reported by a user (not in JIRA) jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/ArchiveModuleFactory.java 1.2 Commit from csuconic (2006-07-10 14:09 EDT) -------------------- JBSER-83 - adding assertion on testcase jboss-serialization tests/org/jboss/serial/regression/jbser83/RegressionTestCase.java 1.2 Commit from rawb (2006-07-10 14:09 EDT) ---------------- Extensions not initialized properly. * Fixed jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/JBossServerUIPlugin.java 1.11 Commit from rawb (2006-07-10 14:48 EDT) ---------------- Viewer updating jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerStateChecker.java 1.7 Commit from rawb (2006-07-10 14:49 EDT) ---------------- Class removed (JBossRuntimeConfiguration) - jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBossRuntimeConfiguration.java 1.4 Commit from rawb (2006-07-10 14:49 EDT) ---------------- Factories Removed - jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/AopModuleFactory.java 1.4 - jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/EjbModuleFactory.java 1.4 - jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/EarModuleFactory.java 1.3 - jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/module/factory/WarModuleFactory.java 1.3 Commit from russo (2006-07-10 14:53 EDT) ----------------- JBPORTAL-941 - added error handling for no net access. jboss-portal samples/src/main/org/jboss/samples/portlet/weather/WeatherPortlet.java 1.2 jboss-portal samples/src/main/org/jboss/samples/portlet/news/NewsPortlet.java 1.5 Commit from russo (2006-07-10 15:06 EDT) ----------------- updated links to pswap resources jboss-portal-docs referenceGuide/en/modules/xmldescriptors.xml 1.24 Commit from kkhan (2006-07-10 15:07 EDT) ----------------- Add jvm attribute to aopc task jboss-aop build-tests-jdk14.xml 1.2 jboss-aop src/main/org/jboss/aop/ant/AopC.java 1.16 Commit from kkhan (2006-07-10 15:09 EDT) ----------------- Call CtCLass.debugWriteFile() if jboss.aop.debug.classes is set to true jboss-aop src/main/org/jboss/aop/ClassicWeavingStrategy.java 1.5 jboss-aop src/main/org/jboss/aop/SuperClassesFirstWeavingStrategy.java 1.6 Commit from rrajasekaran (2006-07-10 15:52 EDT) ------------------------ Updated jboss-dev mailing list tools etc/cruisecontrol/templates/projects-db.xml 1.14 tools etc/cruisecontrol/templates/projects-matrix.xml 1.8 tools etc/cruisecontrol/templates/projects-web.xml 1.15 tools etc/cruisecontrol/templates/projects.xml 1.71 Commit from asaldhana (2006-07-10 16:06 EDT) --------------------- Account for null security domain jbosssx src/main/org/jboss/security/Util.java 1.14 Commit from kkhan (2006-07-10 16:08 EDT) ----------------- Get rid of reference to local/src javassist .classpath 1.4 Commit from kkhan (2006-07-10 16:48 EDT) ----------------- Continue with the retro stuff jboss-aop build-tests-jdk14.xml 1.3 + jboss-aop build-tests-jdk50.xml 1.1 + jboss-aop base-tests.xml 1.1 Commit from kkhan (2006-07-10 17:27 EDT) ----------------- Continue with the retro stuff jboss-aop build-tests-jdk50.xml 1.2 Commit from asaldhana (2006-07-10 17:31 EDT) --------------------- JBAS-2673: security domain can be null. No need for unregistration of the xacml policy. jboss src/main/org/jboss/web/AbstractWebDeployer.java 1.32 Commit from rrajasekaran (2006-07-10 17:41 EDT) ------------------------ Build with jdk1.5 tools etc/cruisecontrol/scripts/build-jms-head-testsuite.xml 1.11 Commit from rrajasekaran (2006-07-10 17:42 EDT) ------------------------ Updated jboss_home tools etc/cruisecontrol/scripts/build-jboss-portal.xml 1.28 Commit from rrajasekaran (2006-07-10 17:42 EDT) ------------------------ Disabled jboss-cache-testsuite-140 tools etc/cruisecontrol/templates/projects.xml 1.72 Commit from rawb (2006-07-10 17:59 EDT) ---------------- Change to require minimal config in a server clone jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss40RuntimeDelegate.java 1.3 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss32RuntimeDelegate.java 1.3 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/AbstractServerRuntimeDelegate.java 1.4 jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java 1.2 Commit from rawb (2006-07-10 18:00 EDT) ---------------- Fixed breakage with deploying some WST standard project types. jbosside as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java 1.8 Commit from clin (2006-07-10 18:27 EDT) ---------------- JBADMCON-146 Fix use case for topics and queues. jboss-admin-console docs/JMS/Queue_Topic_use_cases.doc 1.2 jboss-admin-console docs/JMS/pdf/Queue_Topic_use_cases.pdf 1.2 Commit from clin (2006-07-10 18:30 EDT) ---------------- Update "jboss.home" to point at "../build/output/jboss-5.0.0.Beta". jboss-admin-console build.properties 1.4 Commit from mculpepper (2006-07-10 18:38 EDT) ---------------------- disabling source build for now jbosside releng/org.jboss.ide.eclipse.releng/builders/core/customTargets.xml 1.10 jbosside releng/org.jboss.ide.eclipse.releng/builders/core/jbosside-core.map 1.10 Commit from bmcduffie (2006-07-10 18:45 EDT) --------------------- updated for lists.jboss.org -brad CVSROOT log_accum.pl 1.56 Commit from julien (2006-07-10 18:51 EDT) ------------------ make instance preferences work from xml deployment descriptor jboss-portal build/ide/intellij/idea50/modules/core/core.iml 1.31 jboss-portal build/ide/intellij/idea50/modules/server/server.iml 1.14 jboss-portal core/src/main/org/jboss/portal/core/metadata/InstanceMetaData.java 1.28 jboss-portal core/src/resources/portal-core-sar/META-INF/jboss-service.xml 1.127 jboss-portal portlet/src/main/org/jboss/portal/federation/impl/PortletInvokerRegistrationService.java 1.3 Commit from asogor (2006-07-10 19:45 EDT) ------------------ unit test and fixes for the availaiblity calculator + jboss-mail src/calendar/calendarejb/src/java_test/org/jboss/mail/calendar/interfaces/AvailabilityCalculatorTest.java 1.1 jboss-mail src/calendar/calendarejb/src/java/org/jboss/mail/calendar/util/availability/AvailabilityCalculator.java 1.3 Commit from mculpepper (2006-07-10 20:08 EDT) ---------------------- removing unneeded import jbosside as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/views/JBossServerTableViewer.java 1.9 Commit from rrajasekaran (2006-07-10 22:10 EDT) ------------------------ Fixed typo tools etc/cruisecontrol/scripts/build-jms-head-testsuite.xml 1.12 Commit from gavin (2006-07-10 22:35 EDT) ----------------- added s:cache for page fragment caching jboss-seam src/ui/META-INF/faces-config.xml 1.12 jboss-seam src/ui/META-INF/seam.taglib.xml 1.8 + jboss-seam src/ui/org/jboss/seam/ui/UICache.java 1.1 Commit from starksm (2006-07-10 23:48 EDT) ------------------- Change bean deployer suffixies to .beans and -beans.xml system2 src/main/org/jboss/deployers/plugins/DeployerConstants.java 1.2 Commit from starksm (2006-07-10 23:50 EDT) ------------------- Update the LGPL header system2 src/main/org/jboss/deployers/plugins/DeployerConstants.java 1.3 |
From: Chi L. <Ch...@un...> - 2006-07-10 22:30:20
|
User: clin Date: 06/07/10 18:30:19 Modified: jboss-admin-console build.properties Log: Update "jboss.home" to point at "../build/output/jboss-5.0.0.Beta". Revision Changes Path 1.4 +1 -1 jboss-admin-console/build.properties (In the diff below, changes in quantity of whitespace are not shown.) Index: build.properties =================================================================== RCS file: /cvsroot/jboss/jboss-admin-console/build.properties,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- build.properties 30 Mar 2006 17:44:16 -0000 1.3 +++ build.properties 10 Jul 2006 22:30:19 -0000 1.4 @@ -1,2 +1,2 @@ # default to the local build folder, can set it to any valid JBoss install, see README.txt for more details. -jboss.home=../build/output/jboss-5.0.0.Alpha \ No newline at end of file +jboss.home=../build/output/jboss-5.0.0.Beta \ No newline at end of file |
From: Chi L. <Ch...@un...> - 2006-07-10 22:27:28
|
User: clin Date: 06/07/10 18:27:22 Modified: docs/JMS Queue_Topic_use_cases.doc Log: JBADMCON-146 Fix use case for topics and queues. Revision Changes Path 1.2 +73 -81 jboss-admin-console/docs/JMS/Queue_Topic_use_cases.doc <<Binary file>> |
From: Chi L. <Ch...@un...> - 2006-07-10 22:27:28
|
User: clin Date: 06/07/10 18:27:22 Modified: docs/JMS/pdf Queue_Topic_use_cases.pdf Log: JBADMCON-146 Fix use case for topics and queues. Revision Changes Path 1.2 +565 -536 jboss-admin-console/docs/JMS/pdf/Queue_Topic_use_cases.pdf <<Binary file>> |
From: Robert S. <ra...@gm...> - 2006-07-10 22:00:15
|
User: rawb Date: 06/07/10 18:00:12 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server JBossServer.java Log: Fixed breakage with deploying some WST standard project types. Revision Changes Path 1.8 +4 -2 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBossServer.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/JBossServer.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- JBossServer.java 10 Jul 2006 15:46:18 -0000 1.7 +++ JBossServer.java 10 Jul 2006 22:00:12 -0000 1.8 @@ -24,6 +24,7 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; import org.eclipse.wst.server.core.IModule; import org.eclipse.wst.server.core.IRuntime; import org.eclipse.wst.server.core.IServer; @@ -31,6 +32,7 @@ import org.eclipse.wst.server.core.ServerPort; import org.eclipse.wst.server.core.internal.PublishServerJob; import org.eclipse.wst.server.core.model.ServerDelegate; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; import org.jboss.ide.eclipse.as.core.model.DescriptorModel; import org.jboss.ide.eclipse.as.core.model.ServerProcessModel; import org.jboss.ide.eclipse.as.core.model.DescriptorModel.ServerDescriptorModel; @@ -113,7 +115,7 @@ */ public IStatus canModifyModules(IModule[] add, IModule[] remove) { debug("canModifyModules"); - return null; + return new Status(IStatus.OK, JBossServerCorePlugin.PLUGIN_ID,0, "OK", null); } public IModule[] getChildModules(IModule[] module) { @@ -124,7 +126,7 @@ // As of now none of my modules are implementing the parent / child nonesense public IModule[] getRootModules(IModule module) throws CoreException { //debug("***** getRootModules"); - return new IModule[] { }; + return new IModule[] { module }; } |
From: Robert S. <ra...@gm...> - 2006-07-10 21:59:59
|
User: rawb Date: 06/07/10 17:59:55 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server ServerAttributeHelper.java Log: Change to require minimal config in a server clone Revision Changes Path 1.2 +10 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ServerAttributeHelper.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/ServerAttributeHelper.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- ServerAttributeHelper.java 10 Jul 2006 15:46:18 -0000 1.1 +++ ServerAttributeHelper.java 10 Jul 2006 21:59:55 -0000 1.2 @@ -15,6 +15,8 @@ public static final String PROP_CONFIG_PATH = "PROP_START_ARGS"; public static final String PROP_CLASSPATH = "PROP_CLASSPATH"; + public static final String PROP_MINIMAL_CONFIG = "MINIMAL_CONFIG"; + public static final String JBOSS_SERVER_HOME = "JBOSS_SERVER_HOME"; public static final String JBOSS_CONFIG = "JBOSS_CONFIG"; @@ -79,6 +81,14 @@ return server.getAttribute(PROP_VM_ARGS, getVersionDelegate().getVMArgs(jbServer)); } + public String[] getMinimalConfig() { + String minimal; + if( (minimal=server.getAttribute(PROP_MINIMAL_CONFIG, (String)null)) == null ) { + return getVersionDelegate().getMinimalRequiredPaths(); + } + return minimal.split("\n"); + } + public String getStartMainType() { return getVersionDelegate().getStartMainType(); } |
From: Robert S. <ra...@gm...> - 2006-07-10 21:59:35
|
User: rawb Date: 06/07/10 17:59:34 Modified: as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime JBoss40RuntimeDelegate.java JBoss32RuntimeDelegate.java AbstractServerRuntimeDelegate.java Log: Change to require minimal config in a server clone Revision Changes Path 1.3 +18 -1 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss40RuntimeDelegate.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBoss40RuntimeDelegate.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss40RuntimeDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- JBoss40RuntimeDelegate.java 2 Jun 2006 16:47:56 -0000 1.2 +++ JBoss40RuntimeDelegate.java 10 Jul 2006 21:59:34 -0000 1.3 @@ -21,7 +21,7 @@ */ package org.jboss.ide.eclipse.as.core.server.runtime; -import org.jboss.ide.eclipse.as.core.server.JBossServer; +import java.util.ArrayList; public class JBoss40RuntimeDelegate extends AbstractServerRuntimeDelegate { public static final String VERSION_ID = "org.jboss.ide.eclipse.as.runtime.40"; @@ -34,4 +34,21 @@ return "4.0"; } + public String[] getMinimalRequiredPaths() { + ArrayList list = new ArrayList(); + list.add("conf"); + list.add("conf\\jboss-service.xml"); + list.add("conf\\jndi.properties"); + list.add("deploy"); + list.add("lib"); + list.add("lib\\jboss-management.jar"); + list.add("lib\\jboss-minimal.jar"); + list.add("lib\\jnpserver.jar"); + list.add("lib\\log4j.jar"); + list.add("log"); + String[] ret = new String[list.size()]; + list.toArray(ret); + return ret; + } + } 1.3 +5 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss32RuntimeDelegate.java (In the diff below, changes in quantity of whitespace are not shown.) Index: JBoss32RuntimeDelegate.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/JBoss32RuntimeDelegate.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- JBoss32RuntimeDelegate.java 2 Jun 2006 16:47:56 -0000 1.2 +++ JBoss32RuntimeDelegate.java 10 Jul 2006 21:59:34 -0000 1.3 @@ -35,4 +35,9 @@ return "3.2"; } + + public String[] getMinimalRequiredPaths() { + return new String[0]; + } + } 1.4 +1 -0 jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/AbstractServerRuntimeDelegate.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractServerRuntimeDelegate.java =================================================================== RCS file: /cvsroot/jboss/jbosside/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/server/runtime/AbstractServerRuntimeDelegate.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- AbstractServerRuntimeDelegate.java 10 Jul 2006 15:50:49 -0000 1.3 +++ AbstractServerRuntimeDelegate.java 10 Jul 2006 21:59:34 -0000 1.4 @@ -71,6 +71,7 @@ } public abstract String getId(); + public abstract String[] getMinimalRequiredPaths(); public String getStartArgs(JBossServer server) { return "--configuration=" + server.getAttributeHelper().getJbossConfiguration() + |
From: Rajesh R. <raj...@jb...> - 2006-07-10 21:42:38
|
User: rrajasekaran Date: 06/07/10 17:42:37 Modified: etc/cruisecontrol/templates projects.xml Log: Disabled jboss-cache-testsuite-140 Revision Changes Path 1.72 +2 -2 tools/etc/cruisecontrol/templates/projects.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: projects.xml =================================================================== RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/templates/projects.xml,v retrieving revision 1.71 retrieving revision 1.72 diff -u -b -r1.71 -r1.72 --- projects.xml 10 Jul 2006 19:52:13 -0000 1.71 +++ projects.xml 10 Jul 2006 21:42:37 -0000 1.72 @@ -305,7 +305,7 @@ jbossdir="jboss-cache-testsuite" skipusers="true"> </project> - + <!-- <project template="projecttemplate.vm" name="jboss-cache-testsuite-140" modificationset="jboss-cache-testsuite-140" @@ -322,7 +322,7 @@ jbossdir="jboss-cache-testsuite-140" skipusers="true"> </project> - +--> <project template="projecttemplate.vm" name="jbosside" modificationset="jbosside" |
From: Rajesh R. <raj...@jb...> - 2006-07-10 21:42:04
|
User: rrajasekaran Date: 06/07/10 17:42:02 Modified: etc/cruisecontrol/scripts build-jboss-portal.xml Log: Updated jboss_home Revision Changes Path 1.28 +4 -0 tools/etc/cruisecontrol/scripts/build-jboss-portal.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build-jboss-portal.xml =================================================================== RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/build-jboss-portal.xml,v retrieving revision 1.27 retrieving revision 1.28 diff -u -b -r1.27 -r1.28 --- build-jboss-portal.xml 6 Jul 2006 15:58:44 -0000 1.27 +++ build-jboss-portal.xml 10 Jul 2006 21:42:02 -0000 1.28 @@ -155,9 +155,11 @@ <sequential> <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true"> <arg line=" -buildfile ../checkout/${jboss.dir}/common/build.xml -Djboss-junit-configuration=@{jboss.version} test"/> + <env key="JBOSS_HOME" path="@{jboss.home}"/> </exec> <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true"> <arg line=" -buildfile ../checkout/${jboss.dir}/format/build.xml -Djboss-junit-configuration=@{jboss.version} test"/> + <env key="JBOSS_HOME" path="@{jboss.home}"/> </exec> <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="false" resultproperty="@{jboss.version}.deploy.returncode" append="true"> @@ -167,6 +169,7 @@ </exec> <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true"> <arg line=" -buildfile ../checkout/${jboss.dir}/server/build.xml -Djboss-junit-configuration=@{jboss.version} test"/> + <env key="JBOSS_HOME" path="@{jboss.home}"/> </exec> <!-- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true"> @@ -181,6 +184,7 @@ </exec> <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/tests.log" append="true"> <arg line=" -buildfile ../checkout/${jboss.dir}/portlet/build.xml -Djboss-junit-configuration=@{jboss.version} test"/> + <env key="JBOSS_HOME" path="@{jboss.home}"/> </exec> <!-- <exec executable="ant" output="${log.dir}/@{jboss.version}-logs/deploy.log" failonerror="true" append="true"> <arg line=" -buildfile ../checkout/${jboss.dir}/server/build.xml undeploy"/> |
From: Rajesh R. <raj...@jb...> - 2006-07-10 21:41:49
|
User: rrajasekaran Date: 06/07/10 17:41:47 Modified: etc/cruisecontrol/scripts build-jms-head-testsuite.xml Log: Build with jdk1.5 Revision Changes Path 1.11 +9 -1 tools/etc/cruisecontrol/scripts/build-jms-head-testsuite.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build-jms-head-testsuite.xml =================================================================== RCS file: /cvsroot/jboss/tools/etc/cruisecontrol/scripts/build-jms-head-testsuite.xml,v retrieving revision 1.10 retrieving revision 1.11 diff -u -b -r1.10 -r1.11 --- build-jms-head-testsuite.xml 18 Jan 2006 17:37:40 -0000 1.10 +++ build-jms-head-testsuite.xml 10 Jul 2006 21:41:47 -0000 1.11 @@ -4,6 +4,8 @@ <property name="log.dir" value="${basedir}/logbuild/jms-head-testsuite"/> <property environment="env"/> + <property file="cruisecontrol.properties"/> + <import file="build-common-targets.xml"/> <target name="clean" depends="" description="Cleans checkout directory"> @@ -13,7 +15,7 @@ <param name="artifacts.dir" value="${log.dir}"/> </antcall> <antcall target="version"> - <param name="java.home" value="${env.JAVA_HOME}"/> + <param name="java.home" value="${java15}/> <param name="ant.home" value="${env.ANT_HOME}"/> </antcall> </sequential> @@ -27,6 +29,8 @@ <sequential> <exec executable="ant" failonerror="false" dir="../checkout/jms-head-testsuite/build" resultproperty="build.returncode" output="${log.dir}/compilejbosshead.log"> <arg line=""/> + <env key="PATH" path="${java15}/bin:${env.PATH}"/> + <env key="JAVA_HOME" path="${java15}"/> </exec> <antcall target="copylogs"> <param name="dest.dir" value="${log.dir}"/> @@ -46,6 +50,8 @@ <sequential> <exec executable="ant" failonerror="false" dir="../checkout/jms-head-testsuite/jms/" resultproperty="buildjms.returncode" output="${log.dir}/compilejms.log"> <arg line=""/> + <env key="PATH" path="${java15}/bin:${env.PATH}"/> + <env key="JAVA_HOME" path="${java15}"/> </exec> <antcall target="copylogs"> <param name="dest.dir" value="${log.dir}"/> @@ -66,6 +72,8 @@ <antcall target="kill"/> <exec executable="ant" failonerror="false" dir="../checkout/jms-head-testsuite/jms/tests" resultproperty="tests.returncode" output="${log.dir}/tests.log"> <arg line="-Dtest.bind.address=${MYTESTIP_1}"/> + <env key="PATH" path="${java15}/bin:${env.PATH}"/> + <env key="JAVA_HOME" path="${java15}"/> </exec> <antcall target="copylogs"> <param name="dest.dir" value="${log.dir}"/> |
From: Anil S. <ani...@jb...> - 2006-07-10 21:31:54
|
User: asaldhana Date: 06/07/10 17:31:53 Modified: src/main/org/jboss/web AbstractWebDeployer.java Log: JBAS-2673: security domain can be null. No need for unregistration of the xacml policy. Revision Changes Path 1.32 +14 -11 jboss/src/main/org/jboss/web/AbstractWebDeployer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractWebDeployer.java =================================================================== RCS file: /cvsroot/jboss/jboss/src/main/org/jboss/web/AbstractWebDeployer.java,v retrieving revision 1.31 retrieving revision 1.32 diff -u -b -r1.31 -r1.32 --- AbstractWebDeployer.java 7 Jul 2006 16:38:41 -0000 1.31 +++ AbstractWebDeployer.java 10 Jul 2006 21:31:53 -0000 1.32 @@ -156,7 +156,7 @@ extends="org.jboss.deployment.SubDeployerMBean" @author Sco...@jb... -@version $Revision: 1.31 $ +@version $Revision: 1.32 $ */ public abstract class AbstractWebDeployer { @@ -444,6 +444,8 @@ pc.delete(); //Unregister any xacml policies String prefixedSecurityDomain = webApp.getMetaData().getSecurityDomain(); + if(prefixedSecurityDomain != null) + { String securityDomain = org.jboss.security.Util.unprefixSecurityDomain(prefixedSecurityDomain); AuthorizationManagerServiceMBean authorizationManager = (AuthorizationManagerServiceMBean) MBeanProxyExt.create(AuthorizationManagerServiceMBean.class, @@ -456,6 +458,7 @@ xam.deRegisterPolicy(contextID); } } + } catch (DeploymentException e) { throw e; |
From: Kabir K. <kk...@jb...> - 2006-07-10 21:27:15
|
User: kkhan Date: 06/07/10 17:27:12 Modified: jboss-aop build-tests-jdk50.xml Log: Continue with the retro stuff Revision Changes Path 1.2 +135 -199 jboss-aop/build-tests-jdk50.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build-tests-jdk50.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build-tests-jdk50.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- build-tests-jdk50.xml 10 Jul 2006 20:48:49 -0000 1.1 +++ build-tests-jdk50.xml 10 Jul 2006 21:27:12 -0000 1.2 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build-tests-jdk50.xml,v 1.1 2006/07/10 20:48:49 kkhan Exp $ --> +<!-- $Id: build-tests-jdk50.xml,v 1.2 2006/07/10 21:27:12 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -119,14 +119,7 @@ <property name="build.reports" value="${module.output}/reports"/> <property name="build.stylesheets" value="${module.output}/stylesheets"/> <property name="build.tests.classes" value="${module.output}/tests.classes"/> - <property name="build15.classes" value="${module.output}/classes15"/> - <property name="build15.tests.classes" value="${module.output}/tests.classes15"/> <property name="build.lib" value="${module.output}/lib"/> - <property name="build.api" value="${module.output}/api"/> - <property name="build.etc" value="${module.output}/etc"/> - <property name="build.gen-src" value="${module.output}/gen-src"/> - <property name="build.gen" value="${module.output}/gen"/> - <property name="build.bootclasspath" value="${module.output}/gen-bootclasspath"/> <!-- Install/Release structure --> <property name="install.id" value="${module.name}-${module.version}"/> @@ -161,6 +154,11 @@ <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/> </path> + <path id="test.jrockit.classpath"> + <path refid="test.classpath"/> + <path path="${jrockit.home}/jre/lib/managementapi.jar"/> + </path> + <!-- The classpath required to build javadocs. --> <path id="javadoc.classpath"> <path refid="javac.classpath"/> @@ -214,96 +212,6 @@ </target> <!-- ================================================================== --> - <!-- Install & Release --> - <!-- ================================================================== --> - - <target name="dist" depends="javadocs, init"> - <fail unless="JROCKIT_AVAILABLE"> - To build a distribution you must have a version of JRockit available and set the jrockit.home property. - </fail> - - <copy todir="${build.lib}" filtering="no"> - <fileset dir="${jboss.common.lib}"> - <include name="jboss-common.jar"/> - </fileset> - </copy> - <copy todir="${build.lib}" filtering="no"> - <fileset dir="${javassist.lib}"> - <include name="javassist.jar"/> - </fileset> - </copy> - <copy todir="${build.lib}" filtering="no"> - <fileset dir="${trove.lib}"> - <include name="trove.jar"/> - </fileset> - </copy> - <copy todir="${build.lib}" filtering="no"> - <fileset dir="${oswego.concurrent.lib}"> - <include name="concurrent.jar"/> - </fileset> - </copy> - <copy todir="${build.lib}" filtering="no"> - <fileset dir="${qdox.qdox.lib}"> - <include name="qdox.jar"/> - </fileset> - </copy> - <copy todir="${build.lib}" filtering="no"> - <fileset dir="${junit.junit.lib}"> - <include name="junit.jar"/> - </fileset> - </copy> - <copy todir="docs" filtering="no"> - <fileset dir="output"> - <include name="api/**"/> - </fileset> - </copy> - <delete file="jboss-aop-dist.zip"/> - <zip zipfile="jboss-aop-dist.zip"> - <zipfileset dir="${build.lib}" prefix="${aop.version}"> - <include name="*.jar"/> - </zipfileset> - <zipfileset dir="." prefix="${aop.version}"> - <include name="docs/api/**"/> - <include name="docs/**/*.html"/> - <include name="docs/**/*.jpg"/> - <include name="docs/examples/**"/> - <exclude name="docs/**/CVS/**"/> - <exclude name="docs/**/*.wiki"/> - </zipfileset> - <zipfileset dir="." prefix="${aop.version}"> - <include name="RELEASE_NOTES.txt"/> - <include name="src/main/**/*.java"/> - <include name="src/resources/test/**/*.xml"/> - <exclude name="src/**/CVS/**"/> - </zipfileset> - <zipfileset file="src/build.xml" prefix="${aop.version}"/> - </zip> - </target> - - <target name="install" - description="Install the structure for a release." - depends="all, _buildmagic:install:default"/> - - <target name="release" depends="install"/> - - <target name="release-zip" - description="Builds a ZIP distribution." - depends="release, _buildmagic:release:zip"/> - - <target name="release-tar" - description="Builds a TAR distribution." - depends="release, _buildmagic:release:tar"/> - - <target name="release-tgz" - description="Builds a TAR-GZ distribution." - depends="release, _buildmagic:release:tgz"/> - - <target name="release-all" - description="Builds a distribution for each archive type." - depends="release-zip, release-tgz"/> - - - <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== --> @@ -343,7 +251,7 @@ depends="_buildmagic:help:standard"/> <!-- ==================================================================================== --> - <!-- JDK 1.4 TESTS --> + <!-- JDK 5.0 TESTS --> <!-- ==================================================================================== --> <target name="tests" depends="main"> @@ -351,13 +259,10 @@ <delete dir="${build.tests.classes}"/> <antcall target="javaagent-genadvisor-tests" inheritRefs="true"/> <antcall target="javaagent-tests" inheritRefs="true"/> + <antcall target="system-classloader-test" inheritRefs="true"/> <antcall target="not-woven-tests" inheritRefs="true"/> - <delete dir="${build.tests.classes}"/> - <antcall target="jrockit-loadtime-tests" inheritRefs="true"/> - - <delete dir="${build.tests.classes}"/> <antcall target="precompiled-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> @@ -365,6 +270,18 @@ <delete dir="${build.tests.classes}"/> <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/> + + <!-- Should move the remaining tests into something similar to _base-tests.xml and run them from the main targets once JBAOP-268 has been done --> + <delete dir="${build.tests.classes}/org/jboss/test"/> + <antcall target="jdk15-loadtime-tests" inheritRefs="true"/> + + <delete dir="${build.tests.classes}/org/jboss/test"/> + <antcall target="jdk15-precompiled-tests" inheritRefs="true"/> + + <delete dir="${build.tests.classes}"/> + <antcall target="jrockit-tests" inheritRefs="true"/> + <antcall target="jrockit-genadvisor-tests" inheritRefs="true"/> + </target> <!-- ==================================================================================== --> @@ -407,7 +324,7 @@ </target> <!-- ==================================================================================== --> - <!-- JDK 1.4 BOOTCLASSPATH TEST COMMONS --> + <!-- JDK 5.0 JAVAAGENT TEST COMMONS --> <!-- These targets should not be called directly, use bootclasspath-tests or --> <!-- bootclasspath-genadvisor-tests --> <!-- ==================================================================================== --> @@ -460,6 +377,7 @@ <jvmarg value="${jboss.aop.class.path}"/> <jvmarg value="${jboss.aop.path}"/> <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> + <sysproperty key="jboss.aop.debug.classes" value="true"/> <formatter type="plain" extension="-${caller}.txt"/> <classpath refid="test.classpath"/> <formatter type="xml" extension="-${caller}.xml"/> @@ -484,7 +402,7 @@ </target> <!-- ==================================================================================== --> - <!-- OPTIMIZED PRECOMPILED TESTS (JDK 1.4) --> + <!-- OPTIMIZED PRECOMPILED TESTS (JDK 5.0) --> <!-- ==================================================================================== --> <target name="precompiled-tests" depends="compile-test-classes"> @@ -497,8 +415,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="precompiled-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -516,7 +435,7 @@ </target> <!-- ==================================================================================== --> - <!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 1.4) --> + <!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 5.0) --> <!-- ==================================================================================== --> <target name="non-optimized-precompiled-tests" depends="compile-test-classes"> @@ -529,8 +448,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="non-optimized-precompiled-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -542,7 +462,7 @@ </target> <!-- ==================================================================================== --> - <!-- JDK 1.5 GENERATED ADVISOR PRECOMPILED TESTS --> + <!-- JDK 5.0 GENERATED ADVISOR PRECOMPILED TESTS --> <!-- ==================================================================================== --> <target name="precompiled-genadvisor-tests" depends="compile-test-classes"> @@ -555,8 +475,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="precompiled-genadvisor-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -579,7 +500,6 @@ </antcall> </target> - <target name="precompiled-test" depends="init"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <antcall target="_run-precompiled-test" inheritRefs="true"> @@ -635,6 +555,7 @@ <!-- aopc --> <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> + <classpath refid="test.classpath"/> <classpath path="${build.tests.classes}"/> <aoppath path="${aoppath}"/> <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> @@ -670,11 +591,11 @@ <!-- determine output directory from weaving mode --> <mkdir dir="${build.reports}"/> - <junit printsummary="yes" fork="no" haltonfailure="no"> + <junit printsummary="yes" fork="yes" haltonfailure="no"> <jvmarg value="${jboss.aop.path}"/> <jvmarg value="${jboss.aop.class.path}"/> - <formatter type="plain" extension="-${caller}.txt"/> - <formatter type="xml" extension="-${caller}.xml"/> + <formatter type="plain" extension="-${caller}-jdk50.txt"/> + <formatter type="xml" extension="-${caller}-jdk50.xml"/> <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> @@ -721,8 +642,8 @@ <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> - <formatter type="plain"/> - <formatter type="xml"/> + <formatter type="plain" extension="-jdk50.txt"/> + <formatter type="xml" extension="-jdk50.xml"/> <batchtest todir="${build.reports}" haltonerror="false" @@ -742,21 +663,11 @@ <!-- JDK 5 TESTS --> <!-- ==================================================================================== --> - <target name="jdk15-tests"> - <delete dir="${build.tests.classes}/org/jboss/test"/> - <antcall target="jdk15-loadtime-tests" inheritRefs="true"/> - - <delete dir="${build.tests.classes}/org/jboss/test"/> - <antcall target="jdk15-precompiled-tests" inheritRefs="true"/> - </target> - <target name="jdk15-loadtime-tests" depends="compile"> <property name="report.dir" value="${build.reports}"/> <mkdir dir="${report.dir}"/> - -<!-- <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> @@ -854,7 +765,7 @@ <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldSet.HotSwapDisabledTester" /> </junit> ---> + </target> <target name="jdk15-precompiled-tests" depends="compile"> @@ -1166,89 +1077,114 @@ </junit> </target> - <target name="jrockit-loadtime-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE"> - <property name="report.dir" value="${build.reports}/jroockit-loadtime-tests"/> - <mkdir dir="${report.dir}"/> + <!-- ==================================================================================== --> + <!-- JROCKIT TESTS (JDK 5.0) --> + <!-- ==================================================================================== --> + <target name="jrockit-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE"> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> - <sysproperty key="jboss.aop.path" value="${source.res}/test/basic/jboss-aop.xml"/> - <sysproperty key="verbose" value="true"/> - <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <classpath refid="test.jrockit.classpath"/> - <classpath path="${build.tests.classes}"/> - <formatter usefile="true" type="plain"/> - <formatter usefile="true" type="xml"/> - <test todir="${report.dir}" name="org.jboss.test.aop.basic.AOPTester" /> - </junit> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> - <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <sysproperty key="jboss.aop.path" value="${source.res}/test/reflection/jboss-aop.xml"/> - <classpath> - <path refid="test.jrockit.classpath"/> - <pathelement location="${build.tests.classes}"/> - </classpath> - <formatter type="plain"/> - <formatter usefile="true" type="xml"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.reflection.ReflectionTester"/> - </junit> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> - <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <sysproperty key="jboss.aop.path" value="${source.res}/test/dotinpointcutname/jboss-aop.xml"/> - <classpath> - <path refid="test.jrockit.classpath"/> - <pathelement location="${build.tests.classes}"/> - </classpath> - <formatter type="plain"/> - <formatter usefile="true" type="xml"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.dotinpointcutname.DotInPointcutNameTestCase"/> - </junit> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> - <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <sysproperty key="jboss.aop.path" value="${source.res}/test/introduction/introduction-aop.xml"/> - <formatter type="plain"/> - <formatter usefile="true" type="xml"/> - <classpath> - <path refid="test.jrockit.classpath"/> - <pathelement location="${build.tests.classes}"/> - </classpath> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.introduction.IntroductionTester"/> - </junit> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> - <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <sysproperty key="jboss.aop.path" value="${source.res}/test/precedence/jboss-aop.xml"/> - <classpath> - <path refid="test.jrockit.classpath"/> - <pathelement location="${build.tests.classes}"/> - <pathelement location="docs"/> - </classpath> - <formatter type="plain"/> - <formatter usefile="true" type="xml"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.precedence.PrecedenceTester"/> - </junit> + <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> + <antcall target="_base-tests" inheritRefs="true"> + <param name="caller" value="jrockit-tests"/> + <param name="test-target" value="_run-jrockit-test"/> + </antcall> + + <!-- Tests only applicable for this weaving mode --> + <antcall target="_run-jrockit-test" inheritRefs="true"> + <param name="test" value="override"/> + <param name="caller" value="jrockit-tests"/> + <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> + </antcall> + + </target> + + <!-- ==================================================================================== --> + <!-- GENERATED ADVISOR JROCKIT TESTS (JDK 5.0) --> + <!-- ==================================================================================== --> + <target name="jrockit-genadvisor-tests" depends="compile-test-classes" if="JROCKIT_AVAILABLE"> + + <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> + <antcall target="_base-tests" inheritRefs="true"> + <param name="caller" value="jrockit-genadvisor-tests"/> + <param name="test-target" value="_run-jrockit-test"/> + </antcall> + + <!-- Tests only applicable for this weaving mode --> + <antcall target="_run-jrockit-test" inheritRefs="true"> + <param name="test" value="override"/> + <param name="caller" value="jrockit-genadvisor-tests"/> + <param name="exclude" value="**/OverrideTestCase.class"/> + </antcall> + </target> + + + <target name="_run-jrockit-test"> + + <!-- Check for jboss-aop.xml override --> + <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}"> + <isset property="aop.xml"/> + </condition> + <condition property="jboss.aop.path" value=""> + <isset property="no.xml"/> + </condition> + <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml"> + <not> + <isset property="aop.xml"/> + </not> + </condition> + + <!-- Get -Djboss.aop.class.path from passed in parameters --> + <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}"> + <isset property="use.annotations"/> + </condition> + <condition property="jboss.aop.class.path" value=""> + <not> + <isset property="use.annotations"/> + </not> + </condition> + + <!-- Set the weaving mode and instrumentor to use--> + <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"> + <equals arg1="${caller}" arg2="jrockit-tests"/> + </condition> + <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> + <equals arg1="${caller}" arg2="jrockit-genadvisor-tests"/> + </condition> + + <echo>Running ${test} with instrumentor ${instrumentor}</echo> + + <mkdir dir="${build.reports}"/> <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${jrockit.home}/bin/java"> <jvmarg value="-Xmanagement:class=org.jboss.aop.hook.JRockitClassPreProcessor"/> - <sysproperty key="jboss.aop.path" value="${source.res}/test/regression/jboss-aop.xml"/> - <formatter type="plain"/> - <formatter usefile="true" type="xml"/> + <jvmarg value="${jboss.aop.class.path}"/> + <jvmarg value="${jboss.aop.path}"/> + <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> + <sysproperty key="jboss.aop.debug.classes" value="true"/> + <formatter type="plain" extension="-${caller}.txt"/> + <classpath refid="test.classpath"/> + <formatter type="xml" extension="-${caller}.xml"/> <classpath> <path refid="test.jrockit.classpath"/> <pathelement location="${build.tests.classes}"/> </classpath> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop206inheritadvised.AOPTester"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop194_undeploy.UndeployTester"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop197.OwnConstructorTestCase"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop110.InnerClassTestCase"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.annotatedIntroduction.AOPTester"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.statictest.AOPTester"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.inheritedmcall.AOPTester"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.arraymethodparam.ArrayMethodParamTestCase"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.inheritedfield.InheritedFieldTestCase"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.ejbthree315.UnderscoreMethodTester"/> - <test todir="${report.dir}" fork="yes" name="org.jboss.test.aop.regression.jbaop137.ExtenderTestCase"/> + <batchtest todir="${build.reports}" + haltonerror="false" + haltonfailure="false" + fork="true"> + <fileset dir="${build.tests.classes}"> + <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/> + <include name="org/jboss/test/aop/${test}/**/*Tester.class"/> + <exclude name="${exclude}"/> + + <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase --> + <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/> + <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/> + </fileset> + </batchtest> </junit> </target> + <target name="compiletime-declare" depends="compile-test-classes"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> |
From: Kabir K. <kk...@jb...> - 2006-07-10 20:48:54
|
User: kkhan Date: 06/07/10 16:48:49 Modified: jboss-aop build-tests-jdk14.xml Added: jboss-aop build-tests-jdk50.xml base-tests.xml Log: Continue with the retro stuff Revision Changes Path 1.3 +26 -308 jboss-aop/build-tests-jdk14.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build-tests-jdk14.xml =================================================================== RCS file: /cvsroot/jboss/jboss-aop/build-tests-jdk14.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- build-tests-jdk14.xml 10 Jul 2006 19:07:48 -0000 1.2 +++ build-tests-jdk14.xml 10 Jul 2006 20:48:49 -0000 1.3 @@ -14,7 +14,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build-tests-jdk14.xml,v 1.2 2006/07/10 19:07:48 kkhan Exp $ --> +<!-- $Id: build-tests-jdk14.xml,v 1.3 2006/07/10 20:48:49 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> @@ -31,6 +31,8 @@ &buildmagic; + <import file="base-tests.xml"/> + <!-- ================================================================== --> <!-- Initialization --> @@ -294,17 +296,18 @@ <arg value="${build.bootclasspath}"/> </java> + <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> + <antcall target="_base-tests" inheritRefs="true"> + <param name="caller" value="bootclasspath-tests"/> + <param name="test-target" value="_run-bootclasspath-test"/> + </antcall> + <!-- Tests only applicable for this weaving mode --> <antcall target="_run-bootclasspath-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="bootclasspath-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> - - <!-- Add tests in _base-bootclasspath-tests unless they should only be run in this weaving mode --> - <antcall target="_base-bootclasspath-tests" inheritRefs="true"> - <param name="caller" value="bootclasspath-tests"/> - </antcall> </target> <!-- ==================================================================================== --> @@ -319,18 +322,25 @@ <arg value="${build.bootclasspath}"/> </java> + <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> + <antcall target="_base-tests" inheritRefs="true"> + <param name="caller" value="bootclasspath-genadvisor-tests"/> + <param name="test-target" value="_run-bootclasspath-test"/> + </antcall> + <!-- Tests only applicable for this weaving mode --> <antcall target="_run-bootclasspath-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="bootclasspath-genadvisor-tests"/> <param name="exclude" value="**/OverrideTestCase.class"/> </antcall> + </target> - <!-- Add tests in _base-bootclasspath-tests unless they should only be run in this weaving mode --> - <antcall target="_base-bootclasspath-tests" inheritRefs="true"> - <param name="caller" value="bootclasspath-genadvisor-tests"/> + <target name="loadtime-test" depends="init"> + <antcall target="_run-bootclasspath-test" inheritRefs="true"> + <param name="test" value="${test}"/> + <param name="caller" value="bootclasspath-tests"/> </antcall> - </target> <!-- ==================================================================================== --> @@ -338,94 +348,6 @@ <!-- These targets should not be called directly, use bootclasspath-tests or --> <!-- bootclasspath-genadvisor-tests --> <!-- ==================================================================================== --> - <target name="_base-bootclasspath-tests"> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="jdk15base"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="stress/simple"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="invoketarget"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="instanceofintroduced"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="implementz"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="annotatedcflow"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="scope"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="construction"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="constructortarget"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="basic"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="marshalling"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="annotatedparams"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="callerscope"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="reflection"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="regression"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="perjoinpoint"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="beanstyleconfig"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="precedence"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="dotinpointcutname"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="instanceofannotated"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="callerargs"/> - </antcall> - - <!-- Tests with special requirements for parameters --> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="jdk15annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="introduction"/> - <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/> - </antcall> - </target> - - <target name="loadtime-test" depends="init"> - <antcall target="_run-bootclasspath-test" inheritRefs="true"> - <param name="test" value="${test}"/> - <param name="caller" value="bootclasspath-tests"/> - </antcall> - </target> <target name="_run-bootclasspath-test"> <path id="bootclasspath"> @@ -510,8 +432,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="precompiled-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -542,8 +465,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="non-optimized-precompiled-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -568,8 +492,9 @@ </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> - <antcall target="_base-precompiled-tests" inheritRefs="true"> + <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="precompiled-genadvisor-tests"/> + <param name="test-target" value="_run-precompiled-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> @@ -592,99 +517,6 @@ </antcall> </target> - - <!-- ==================================================================================== --> - <!-- JDK 1.4 PRECOMPILED TEST COMMONS --> - <!-- These targets should not be called directly, use precompiled-tests, --> - <!-- non-optimized-precompiled-tests or precompiled-genadvisor-tests --> - <!-- bootclasspath-genadvisor-tests --> - <!-- ==================================================================================== --> - - <target name="_base-precompiled-tests"> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="jdk15base"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="invoketarget"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="invoketarget"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="stress/simple"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="instanceofintroduced"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="implementz"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="annotatedcflow"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="scope"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="construction"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="constructortarget"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="basic"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="marshalling"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="annotatedparams"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="callerscope"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="reflection"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="regression"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="perjoinpoint"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="beanstyleconfig"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="precedence"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="dotinpointcutname"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="instanceofannotated"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="callerargs"/> - </antcall> - - <!-- Tests with special requirements for parameters --> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="jdk15annotated"/> - <param name="no.xml" value="true"/> - <param name="use.annotations" value="true"/> - </antcall> - <antcall target="_run-precompiled-test" inheritRefs="true"> - <param name="test" value="introduction"/> - <param name="aop.xml" value="${source.res}/test/introduction/introduction-aop.xml"/> - </antcall> - </target> - <target name="precompiled-test" depends="init"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <antcall target="_run-precompiled-test" inheritRefs="true"> @@ -892,120 +724,6 @@ </junit> </target> -<!-- - <target name="memory-tests" depends="compile-test-classes, compile-jdk15-tests"> - <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> - <annotationc compilerclasspathref="aop.task.classpath" bytecode="true"> - <classpath refid="aop.task.classpath"/> - <classpath path="${build.tests.retro}"/> - <src path="${source.tests.java}"/> - <include name="org/jboss/test/aop/annotatedcflow/*.java"/> - <include name="org/jboss/test/aop/annotatedparams/*.java"/> - <include name="org/jboss/test/aop/perjoinpoint/*.java"/> - <include name="org/jboss/test/aop/annotated/*.java"/> - <include name="org/jboss/test/aop/instanceofannotated/*.java"/> - <include name="org/jboss/test/aop/implementz/*.java"/> - </annotationc> - - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="annotatedcflow"/> - <param name="case" value="AnnotatedCFlowTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="annotatedparams"/> - <param name="case" value="AnnotatedParamsTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="args"/> - <param name="case" value="ArgsTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="basic"/> - <param name="case" value="AOPTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="beanstyleconfig"/> - <param name="case" value="ConfigTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="callerargs"/> - <param name="case" value="CallerArgsTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="callerscope"/> - <param name="case" value="CallerScopeTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="construction"/> - <param name="case" value="ConstructionTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="constructortarget"/> - <param name="case" value="ConstructorTargetTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="dotinpointcutname"/> - <param name="case" value="DotInPointcutNameTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="implementz"/> - <param name="case" value="ImplementsTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="instanceofannotated"/> - <param name="case" value="InstanceOfAnnotatedTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="introduction"/> - <param name="case" value="IntroductionTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="override"/> - <param name="case" value="OverrideTestCase"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="perjoinpoint"/> - <param name="case" value="PerJoinpointTester"/> - </antcall> - <antcall target="memory-test" inheritRefs="true"> - <param name="test" value="scope"/> - <param name="case" value="ScopeTestCase"/> - </antcall> - </target> ---> - <target name="memory-test" depends="init"> - <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> - <property name="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"/> - <property name="testcase" value="org.jboss.test.aop.${test}.${case}"/> - - - <aopc compilerclasspathref="aop.task.classpath" jvm="${java14}"> - <classpath refid="aop.task.classpath"/> - <classpath refid="test.classpath"/> - <classpath path="${build.tests.retro}"/> - <aoppath path="${aoppath}"/> - <src path="${build.tests.retro}"/> - <include name="org/jboss/test/aop/${test}/**"/> - <aopclasspath path="${build.tests.retro}"/> - </aopc> - - <property name="report.dir" value="${build.reports}"/> - <mkdir dir="${report.dir}/memory-tests"/> - - <echo>${testcase}</echo> - <junit printsummary="yes" fork="yes" haltonfailure="no" jvm="${java14}"> - <sysproperty key="jboss.aop.path" value="${aoppath}"/> - <sysproperty key="test.to.run" value="${testcase}"/> - <sysproperty key="leak.report.dir" value="${report.dir}"/> - <classpath refid="test.classpath"/> - <classpath path="${build.tests.retro}"/> - <jvmarg value="-agentlib:jbossAgent"/> - <formatter usefile="true" type="xml" extension="-${testcase}.xml"/> - <formatter usefile="true" type="plain" extension="-${testcase}.txt"/> - <test fork="yes" name="org.jboss.test.aop.memoryleaks.MemoryLeakTestCase" todir="${report.dir}"/> - </junit> - </target> - <target name="compile-stylesheets" depends="configure"> <mkdir dir="${build.stylesheets}"/> <copy todir="${build.stylesheets}" filtering="yes"> 1.1 date: 2006/07/10 20:48:49; author: kkhan; state: Exp;jboss-aop/build-tests-jdk50.xml Index: build-tests-jdk50.xml =================================================================== <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE project [ <!ENTITY buildmagic SYSTEM "../tools/etc/buildmagic/buildmagic.ent"> <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> ]> <!-- ====================================================================== --> <!-- --> <!-- JBoss, the OpenSource J2EE webOS --> <!-- --> <!-- Distributable under LGPL license. --> <!-- See terms of license at http://www.gnu.org. --> <!-- --> <!-- ====================================================================== --> <!-- $Id: build-tests-jdk50.xml,v 1.1 2006/07/10 20:48:49 kkhan Exp $ --> <project default="main" name="JBoss/AOP"> <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> <!-- | Include the common Buildmagic elements. | | This defines several different targets, properties and paths. | It also sets up the basic extention tasks amoung other things. --> &buildmagic; <import file="base-tests.xml"/> <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> <!-- | Initialize the build system. Must depend on '_buildmagic:init'. | Other targets should depend on 'init' or things will mysteriously fail. --> <target name="init" unless="init.disable" depends="_buildmagic:init"> </target> <!-- ================================================================== --> <!-- Configuration --> <!-- ================================================================== --> <!-- | Configure the build system. | | This target is invoked by the Buildmagic initialization logic and | should contain module specific configuration elements. --> <target name="configure" unless="configure.disable"> <property name="aop.version" value="jboss-aop-1.5.0.GA"/> <property name="aop.title" value="JBoss AOP Framework"/> <!-- =================== --> <!-- Basic Configuration --> <!-- =================== --> <!-- Module name(s) & version --> <property name="module.name" value="aop"/> <property name="module.Name" value="JBoss AOP"/> <property name="module.version" value="1.5.0.GA"/> <!-- ========= --> <!-- Libraries --> <!-- ========= --> &libraries; &modules; <!-- The combined library classpath --> <path id="library.classpath"> <path refid="apache.log4j.classpath"/> <path refid="qdox.classpath"/> <path refid="javassist.classpath"/> <path refid="trove.classpath"/> <path refid="xdoclet.xdoclet.classpath"/> <path refid="apache.ant.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="junit.junit.classpath"/> <path refid="jboss.profiler.jvmti.classpath"/> <path refid="jboss.microcontainer.classpath"/> </path> <!-- Defines jrockit.home --> <property file="local.properties"/> <available file="${jrockit.home}/jre/lib/managementapi.jar" property="JROCKIT_AVAILABLE"/> <!-- ======= --> <!-- Modules --> <!-- ======= --> <!-- The combined dependent module classpath --> <path id="dependentmodule.classpath"> <path refid="jboss.common.classpath"/> <path refid="jboss.test.classpath"/> </path> <!-- ===== --> <!-- Tasks --> <!-- ===== --> <!-- Where source files live --> <property name="source.tests.java" value="${module.source}/test"/> <property name="source.etc" value="${module.source}/etc"/> <property name="source.res" value="${module.source}/resources"/> <property name="source.stylesheets" value="../testsuite/src/stylesheets"/> <!-- Where build generated files will go --> <property name="build.reports" value="${module.output}/reports"/> <property name="build.stylesheets" value="${module.output}/stylesheets"/> <property name="build.tests.classes" value="${module.output}/tests.classes"/> <property name="build15.classes" value="${module.output}/classes15"/> <property name="build15.tests.classes" value="${module.output}/tests.classes15"/> <property name="build.lib" value="${module.output}/lib"/> <property name="build.api" value="${module.output}/api"/> <property name="build.etc" value="${module.output}/etc"/> <property name="build.gen-src" value="${module.output}/gen-src"/> <property name="build.gen" value="${module.output}/gen"/> <property name="build.bootclasspath" value="${module.output}/gen-bootclasspath"/> <!-- Install/Release structure --> <property name="install.id" value="${module.name}-${module.version}"/> <property name="release.id" value="${install.id}"/> <property name="install.root" value="${module.output}/${install.id}"/> <!-- The combined thirdparty classpath --> <path id="thirdparty.classpath"> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> </path> <!-- classpath and local.classpath must have a value using with a path --> <property name="classpath" value=""/> <property name="local.classpath" value=""/> <!-- The classpath required to build classes. --> <path id="javac.classpath"> <pathelement path="${classpath}"/> <pathelement path="${local.classpath}"/> <path refid="thirdparty.classpath"/> <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/> </path> <path id="javac.jrockit.classpath"> <path refid="javac.classpath"/> <path path="${jrockit.home}/jre/lib/managementapi.jar"/> </path> <path id="test.classpath"> <path refid="thirdparty.classpath"/> <pathelement path="${build.lib}/jboss-aop-jdk50.jar"/> </path> <!-- The classpath required to build javadocs. --> <path id="javadoc.classpath"> <path refid="javac.classpath"/> </path> <!-- Packages to include when generating api documentation --> <property name="javadoc.packages" value="org.jbos.aop.*"/> <!-- Override JUnit defaults --> <property name="junit.timeout" value="240000"/> <!-- 4 minutes --> <property name="junit.batchtest.todir" value="${build.reports}"/> <property name="junit.jvm.options" value="-Ddummy"/> </target> <!-- ================================================================== --> <!-- Compile --> <!-- ================================================================== --> <!-- | Compile everything. | | This target should depend on other compile-* targets for each | different type of compile that needs to be performed, short of | documentation compiles. --> <target name="compile" description="Compile all source files." depends="compile-test-classes"/> <!-- Compile all class files --> <target name="compile-test-classes" depends="init"> <mkdir dir="${build.tests.classes}"/> <javac destdir="${build.tests.classes}" optimize="${javac.optimize}" target="1.5" source="1.5" debug="${javac.debug}" depend="${javac.depend}" verbose="${javac.verbose}" deprecation="${javac.deprecation}" includeAntRuntime="${javac.include.ant.runtime}" includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> <src path="${source.tests.java}"/> <classpath refid="test.classpath"/> <include name="**/*.java"/> <exclude name="org/jboss/test/aop/memoryleaks/**/*.java"/> </javac> </target> <!-- ================================================================== --> <!-- Install & Release --> <!-- ================================================================== --> <target name="dist" depends="javadocs, init"> <fail unless="JROCKIT_AVAILABLE"> To build a distribution you must have a version of JRockit available and set the jrockit.home property. </fail> <copy todir="${build.lib}" filtering="no"> <fileset dir="${jboss.common.lib}"> <include name="jboss-common.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${javassist.lib}"> <include name="javassist.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${trove.lib}"> <include name="trove.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${oswego.concurrent.lib}"> <include name="concurrent.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${qdox.qdox.lib}"> <include name="qdox.jar"/> </fileset> </copy> <copy todir="${build.lib}" filtering="no"> <fileset dir="${junit.junit.lib}"> <include name="junit.jar"/> </fileset> </copy> <copy todir="docs" filtering="no"> <fileset dir="output"> <include name="api/**"/> </fileset> </copy> <delete file="jboss-aop-dist.zip"/> <zip zipfile="jboss-aop-dist.zip"> <zipfileset dir="${build.lib}" prefix="${aop.version}"> <include name="*.jar"/> </zipfileset> <zipfileset dir="." prefix="${aop.version}"> <include name="docs/api/**"/> <include name="docs/**/*.html"/> <include name="docs/**/*.jpg"/> <include name="docs/examples/**"/> <exclude name="docs/**/CVS/**"/> <exclude name="docs/**/*.wiki"/> </zipfileset> <zipfileset dir="." prefix="${aop.version}"> <include name="RELEASE_NOTES.txt"/> <include name="src/main/**/*.java"/> <include name="src/resources/test/**/*.xml"/> <exclude name="src/**/CVS/**"/> </zipfileset> <zipfileset file="src/build.xml" prefix="${aop.version}"/> </zip> </target> <target name="install" description="Install the structure for a release." depends="all, _buildmagic:install:default"/> <target name="release" depends="install"/> <target name="release-zip" description="Builds a ZIP distribution." depends="release, _buildmagic:release:zip"/> <target name="release-tar" description="Builds a TAR distribution." depends="release, _buildmagic:release:tar"/> <target name="release-tgz" description="Builds a TAR-GZ distribution." depends="release, _buildmagic:release:tgz"/> <target name="release-all" description="Builds a distribution for each archive type." depends="release-zip, release-tgz"/> <!-- ================================================================== --> <!-- Cleaning --> <!-- ================================================================== --> <!-- Clean up all build output --> <target name="clean" description="Cleans up most generated files." depends="init"> <delete dir="${build.tests.classes}"/> </target> <target name="clean-tests" depends="init"> <delete dir="${build.tests.classes}"/> </target> <!-- Clean up all generated files --> <target name="clobber" description="Cleans up all generated files." depends="_buildmagic:clobber, clean"> </target> <!-- ===============================================================p=== --> <!-- Misc. --> <!-- ================================================================== --> <target name="main" depends="most" description="Executes the default target (most)."/> <target name="all" depends="compile" description="Builds everything."/> <target name="most" depends="compile" description="Builds almost everything."/> <target name="help" description="Show this help message." depends="_buildmagic:help:standard"/> <!-- ==================================================================================== --> <!-- JDK 1.4 TESTS --> <!-- ==================================================================================== --> <target name="tests" depends="main"> <delete dir="${build.tests.classes}"/> <antcall target="javaagent-genadvisor-tests" inheritRefs="true"/> <antcall target="javaagent-tests" inheritRefs="true"/> <antcall target="system-classloader-test" inheritRefs="true"/> <antcall target="not-woven-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="jrockit-loadtime-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="precompiled-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="precompiled-genadvisor-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}"/> <antcall target="non-optimized-precompiled-tests" inheritRefs="true"/> </target> <!-- ==================================================================================== --> <!-- JAVAAGENT TESTS (JDK 5.0) --> <!-- ==================================================================================== --> <target name="javaagent-tests" depends="compile-test-classes"> <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="javaagent-tests"/> <param name="test-target" value="_run-javaagent-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-javaagent-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="javaagent-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- GENERATED ADVISOR JAVAGENT TESTS (JDK 5.0) --> <!-- ==================================================================================== --> <target name="javaagent-genadvisor-tests" depends="compile-test-classes"> <!-- Add tests in _base-tests unless they should only be run in this weaving mode --> <antcall target="_base-tests" inheritRefs="true"> <param name="caller" value="javaagent-genadvisor-tests"/> <param name="test-target" value="_run-javaagent-test"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-javaagent-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="javaagent-genadvisor-tests"/> <param name="exclude" value="**/OverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- JDK 1.4 BOOTCLASSPATH TEST COMMONS --> <!-- These targets should not be called directly, use bootclasspath-tests or --> <!-- bootclasspath-genadvisor-tests --> <!-- ==================================================================================== --> <target name="loadtime-test" depends="init"> <antcall target="_run-javaagent-test" inheritRefs="true"> <param name="test" value="${test}"/> <param name="caller" value="javaagent-tests"/> </antcall> </target> <target name="_run-javaagent-test"> <!-- Check for jboss-aop.xml override --> <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}"> <isset property="aop.xml"/> </condition> <condition property="jboss.aop.path" value=""> <isset property="no.xml"/> </condition> <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml"> <not> <isset property="aop.xml"/> </not> </condition> <!-- Get -Djboss.aop.class.path from passed in parameters --> <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}"> <isset property="use.annotations"/> </condition> <condition property="jboss.aop.class.path" value=""> <not> <isset property="use.annotations"/> </not> </condition> <!-- Set the weaving mode and instrumentor to use--> <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"> <equals arg1="${caller}" arg2="javaagent-tests"/> </condition> <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> <equals arg1="${caller}" arg2="javaagent-genadvisor-tests"/> </condition> <echo>Running ${test} with instrumentor ${instrumentor}</echo> <mkdir dir="${build.reports}"/> <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <jvmarg value="${jboss.aop.class.path}"/> <jvmarg value="${jboss.aop.path}"/> <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> <formatter type="plain" extension="-${caller}.txt"/> <classpath refid="test.classpath"/> <formatter type="xml" extension="-${caller}.xml"/> <classpath> <pathelement location="${build.tests.classes}"/> </classpath> <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true"> <fileset dir="${build.tests.classes}"> <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/> <include name="org/jboss/test/aop/${test}/**/*Tester.class"/> <exclude name="${exclude}"/> <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase --> <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/> <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/> </fileset> </batchtest> </junit> </target> <!-- ==================================================================================== --> <!-- OPTIMIZED PRECOMPILED TESTS (JDK 1.4) --> <!-- ==================================================================================== --> <target name="precompiled-tests" depends="compile-test-classes"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> <path id="aop.task.classpath"> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> <path refid="jboss.aop.classpath"/> </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> <antcall target="_base-precompiled-tests" inheritRefs="true"> <param name="caller" value="precompiled-tests"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="args"/> <param name="caller" value="precompiled-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="precompiled-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- NON OPTIMIZED PRECOMPILED TESTS (JDK 1.4) --> <!-- ==================================================================================== --> <target name="non-optimized-precompiled-tests" depends="compile-test-classes"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> <path id="aop.task.classpath"> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> <path refid="jboss.aop.classpath"/> </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> <antcall target="_base-precompiled-tests" inheritRefs="true"> <param name="caller" value="non-optimized-precompiled-tests"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="non-optimized-precompiled-tests"/> <param name="exclude" value="**/GenAdvisorOverrideTestCase.class"/> </antcall> </target> <!-- ==================================================================================== --> <!-- JDK 1.5 GENERATED ADVISOR PRECOMPILED TESTS --> <!-- ==================================================================================== --> <target name="precompiled-genadvisor-tests" depends="compile-test-classes"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> <path id="aop.task.classpath"> <path refid="library.classpath"/> <path refid="dependentmodule.classpath"/> <path refid="jboss.aop.classpath"/> </path> <!-- Add tests in _base-precompiled-tests unless they should only be run in this weaving mode --> <antcall target="_base-precompiled-tests" inheritRefs="true"> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <!-- Tests only applicable for this weaving mode --> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="args"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="beforeafter"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="dynamicgenadvisor"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="override"/> <param name="caller" value="precompiled-genadvisor-tests"/> <param name="exclude" value="**/OverrideTestCase.class"/> </antcall> </target> <target name="precompiled-test" depends="init"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="${test}"/> <param name="caller" value="precompiled-tests"/> </antcall> </target> <target name="precompiled-genadvisor-test" depends="init"> <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="jboss.aop.classpath"/> <antcall target="_run-precompiled-test" inheritRefs="true"> <param name="test" value="args"/> <param name="caller" value="precompiled-genadvisor-tests"/> </antcall> </target> <target name="_run-precompiled-test"> <!-- Check for jboss-aop.xml override for compiler --> <condition property="aoppath" value="${aop.xml}"> <isset property="aop.xml"/> </condition> <condition property="aoppath" value=""> <isset property="no.xml"/> </condition> <condition property="aoppath" value="${source.res}/test/${test}/jboss-aop.xml"> <not> <isset property="aop.xml"/> </not> </condition> <!-- Set the weaving mode and instrumentor to use--> <condition property="optimized" value="true"> <or> <equals arg1="${caller}" arg2="precompiled-tests"/> <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/> </or> </condition> <condition property="optimized" value="false"> <equals arg1="${caller}" arg2="non-optimized-precompiled-tests"/> </condition> <condition property="instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"> <not> <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/> </not> </condition> <condition property="instrumentor" value="org.jboss.aop.instrument.GeneratedAdvisorInstrumentor"> <equals arg1="${caller}" arg2="precompiled-genadvisor-tests"/> </condition> <echo>Compiling ${test} with optimized=${optimized} and instrumentor ${instrumentor}</echo> <!-- aopc --> <aopc optimized="${optimized}" compilerclasspathref="aop.task.classpath"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <aoppath path="${aoppath}"/> <sysproperty key="jboss.aop.instrumentor" value="${instrumentor}"/> <src path="${build.tests.classes}"/> <include name="org/jboss/test/aop/${test}/**"/> <exclude name="${exclude}"/> <aopclasspath path="${build.tests.classes}"/> </aopc> <!-- Get -Djboss.aop.path from passed in parameters --> <condition property="jboss.aop.path" value="-Djboss.aop.path=${aop.xml}"> <isset property="aop.xml"/> </condition> <condition property="jboss.aop.path" value=""> <isset property="no.xml"/> </condition> <condition property="jboss.aop.path" value="-Djboss.aop.path=${source.res}/test/${test}/jboss-aop.xml"> <not> <isset property="aop.xml"/> </not> </condition> <!-- Get -Djboss.aop.class.path from passed in parameters --> <condition property="jboss.aop.class.path" value="-Djboss.aop.class.path=${build.tests.classes}"> <isset property="use.annotations"/> </condition> <condition property="jboss.aop.class.path" value=""> <not> <isset property="use.annotations"/> </not> </condition> <!-- determine output directory from weaving mode --> <mkdir dir="${build.reports}"/> <junit printsummary="yes" fork="no" haltonfailure="no"> <jvmarg value="${jboss.aop.path}"/> <jvmarg value="${jboss.aop.class.path}"/> <formatter type="plain" extension="-${caller}.txt"/> <formatter type="xml" extension="-${caller}.xml"/> <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true"> <fileset dir="${build.tests.classes}"> <include name="org/jboss/test/aop/${test}/**/*TestCase.class"/> <include name="org/jboss/test/aop/${test}/**/*Tester.class"/> <exclude name="${exclude}"/> <!-- These are not test cases, and so they will fail when junit tries to run them. Should really rename all tests to *TestCase --> <exclude name="org/jboss/test/aop/reflection/ReflectionAspectTester.class"/> <exclude name="org/jboss/test/aop/basic/POJOAspectTester.class"/> </fileset> </batchtest> </junit> </target> <!-- ==================================================================================== --> <!-- NON-WOVEN TESTS --> <!-- ==================================================================================== --> <target name="not-woven-tests" depends="compile-test-classes"> <mkdir dir="${build.reports}"/> <taskdef name="annotationc" classname="org.jboss.aop.ant.AnnotationC" classpathref="jboss.aop.classpath"/> <annotationc compilerclasspathref="aop.task.classpath" bytecode="true"> <classpath refid="aop.task.classpath"/> <classpath path="${build.tests.classes}"/> <src path="${source.tests.java}"/> <include name="org/jboss/test/aop/annotationc/*.java"/> </annotationc> <echo>org/jboss/test/aop/methodhashing/MethodHashingTestCase will fail until the microcontainer has been updated in the repository</echo> <junit printsummary="yes" fork="no" haltonfailure="no" > <classpath> <path refid="test.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter type="plain"/> <formatter type="xml"/> <batchtest todir="${build.reports}" haltonerror="false" haltonfailure="false" fork="true"> <fileset dir="${build.tests.classes}"> <include name="org/jboss/test/aop/proxy/ProxyTestCase.class"/> <include name="org/jboss/test/aop/methodhashing/MethodHashingTestCase.class"/> <include name="org/jboss/test/aop/annotationc/AnnotationTester.class"/> </fileset> </batchtest> </junit> </target> <!-- ==================================================================================== --> <!-- JDK 5 TESTS --> <!-- ==================================================================================== --> <target name="jdk15-tests"> <delete dir="${build.tests.classes}/org/jboss/test"/> <antcall target="jdk15-loadtime-tests" inheritRefs="true"/> <delete dir="${build.tests.classes}/org/jboss/test"/> <antcall target="jdk15-precompiled-tests" inheritRefs="true"/> </target> <target name="jdk15-loadtime-tests" depends="compile"> <property name="report.dir" value="${build.reports}"/> <mkdir dir="${report.dir}"/> <!-- <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareAll/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareAll.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareConstructor/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareConstructor.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareMethod/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.prune" value="false"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareMethod.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareField/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareField.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldGet/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty key="java5Agent" value="true"/> <sysproperty key="jboss.aop.instrumentor" value="org.jboss.aop.instrument.ClassicInstrumentor"/> <sysproperty key="jboss.aop.prune" value="false"/> <jvmarg value="-javaagent:${build.lib}/jboss-aop-jdk50.jar"/> <classpath> <path refid="test15.classpath"/> <pathelement location="${build.tests.classes}"/> <pathelement location="docs"/> </classpath> <formatter usefile="true" type="plain" extension="-jdk15-loadtime-tests.txt"/> <formatter usefile="true" type="xml" extension="-jdk15-loadtime-tests.xml"/> <test todir="${report.dir}" name="org.jboss.test.aop.jdk15.dynamic.prepareFieldGet.HotSwapDisabledTester" /> </junit> <junit printsummary="yes" fork="yes" haltonfailure="no"> <sysproperty key="jboss.aop.path" value="${source.res}/test/jdk15/dynamic/prepareFieldSet/jboss-aop.xml"/> <sysproperty key="scenario.jar" value="${build.tests.classes}/org/jboss/test/aop/jdk15/dynamic/common/scenario.jar"/> <sysproperty ... [truncated message content] |
From: Kabir K. <kk...@jb...> - 2006-07-10 20:08:21
|
User: kkhan Date: 06/07/10 16:08:19 Modified: javassist .classpath Log: Get rid of reference to local/src Revision Changes Path 1.4 +0 -1 javassist/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/javassist/.classpath,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- .classpath 30 Jan 2006 10:14:15 -0000 1.3 +++ .classpath 10 Jul 2006 20:08:19 -0000 1.4 @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry excluding="javassist/util/HotSwapper.java" kind="src" path="src/main"/> - <classpathentry kind="src" path="local/src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="output" path="build/classes"/> </classpath> |
From: Anil S. <ani...@jb...> - 2006-07-10 20:06:17
|
User: asaldhana Date: 06/07/10 16:06:13 Modified: src/main/org/jboss/security Util.java Log: Account for null security domain Revision Changes Path 1.14 +10 -7 jbosssx/src/main/org/jboss/security/Util.java (In the diff below, changes in quantity of whitespace are not shown.) Index: Util.java =================================================================== RCS file: /cvsroot/jboss/jbosssx/src/main/org/jboss/security/Util.java,v retrieving revision 1.13 retrieving revision 1.14 diff -u -b -r1.13 -r1.14 --- Util.java 7 Jul 2006 16:28:44 -0000 1.13 +++ Util.java 10 Jul 2006 20:06:13 -0000 1.14 @@ -46,7 +46,7 @@ Jhong for the SRP Distribution (http://srp.stanford.edu/srp/). @author Sco...@jb... - @version $Revision: 1.13 $ + @version $Revision: 1.14 $ */ public class Util { @@ -601,12 +601,15 @@ */ public static String unprefixSecurityDomain(String securityDomain) { - String result = ""; + String result = null; + if(securityDomain != null) + { if(securityDomain.startsWith("java:/jaas")) result = securityDomain.substring("java:/jaas/".length()); else if(securityDomain.startsWith("java:/jbsx")) result = securityDomain.substring("java:/jbsx/".length()); + } return result; } |