Change 20070108-ben-N by [EMAIL PROTECTED] on 2007-01-08 15:48:19 PST
in /Users/ben/src/svn/openlaszlo/branches/legals-mergeSummary: merge trunk 2660:3319 into legals New Features: Bugs Fixed: Technical Reviewer: ptw QA Reviewer: frisco Doc Reviewer: frisco Documentation: merge -r2660:3319 from trunk. This is a merge to keep legals and trunk from diverging too far; CSS does not yet work in legals; video does not yet work in legals;Just a few conflicts needed to be resolved: Compiler.java, schema/ lzx.rnc, LzCSSStyle.js.
Release Notes: Details: Tests: ant lztest lzpix in swf and dhtml ant runlzunit -- fails on my mac, but so does legals head. Files: M test/video/test-video-rtmp.lzx M test/video/test-camera-mute-multiple.lzx M test/video/test-live.lzx M test/video/test-stream-video.lzx M test/video/test-rtmpconnection.lzx M test/video/test-stream-video-rtmp-sep.lzx M test/video/test-muting-and-playing.lzx M test/video/test-video.lzx M test/video/test-live-echo.lzx M test/video/test-recording.lzx M test/video/test-microphone-recording.lzx M test/video/test-stream-video-rtmp.lzx M test/video/test-stream-video-sep.lzx M test/leak/view_leaks.lzx D test/image/beavis_butthead_bush_cheney.jpg M test/image/image-test.lzx A + test/image/food_is_large.jpg D test/image/img/beavis_butthead_bush_cheney.jpg A + test/image/img/food_is_large.jpg A + test/style/urlparam A + test/style/urlparam/paramifyme.lzx A + test/style/urlparam/carla.css A + test/style/resource A + test/style/resource/test.png A + test/style/resource/resource-not-found.lzx M test/style/elementselector/elementselector-test.lzx M test/style/elementselector/specialclassnames-test.lzx M test/style/elementselector/elementselectors.css M test/style/idselector/ids.lzx M test/style/names/main_dash.lzx M test/style/names/main.lzx M test/style/names/main_underscore.lzx M test/style/typography/typography-test.lzx M test/style/fake/test-fake.lzx M test/style/constraints/subclassing.lzx M test/style/constraints/speedtest.lzx M test/style/constraints/constraint-test.lzx M test/style/descendantselector/descendantselector-test.lzxM test/style/descendantselector/complex-descendant-selector- test.lzx
M test/style/descendantselector/simplerdescendant-test.lzx M test/style/compiler/stylesheetelement-test.lzx M test/style/compiler/external-only.lzx M test/style/attrselector/main.lzx M test/style/attrselector/attrs.lzx M test/style/attrselector/name-test.lzx M test/style/specificity/newspecificity.lzx M test/style/specificity/applicability.lzx M test/style/specificity/specificity-tests.lzx A + test/style/parsertricks A + test/style/parsertricks/import-test.lzx A + test/style/parsertricks/importme.css M WEB-INF/lps/schema/lzx.rnc M WEB-INF/lps/lfc/services/LzCSSStyle.js M WEB-INF/lps/server/src/org/openlaszlo/css/StyleProperty.java M WEB-INF/lps/server/src/org/openlaszlo/css/CSSHandler.java M WEB-INF/lps/server/src/org/openlaszlo/compiler/Compiler.javaM WEB-INF/lps/server/src/org/openlaszlo/compiler/ StyleSheetCompiler.java
M docs/src/dguide/css.html M docs/src/dguide/methods-events-attributes.html M docs/src/dguide/deployers-guide.html M docs/src/dguide/text.html M docs/src/dguide/lps-request-types.html M docs/src/dguide/colors.html M docs/src/dguide/components-design.html M docs/src/dguide/lzunit.html M docs/src/dguide/program-development.html M docs/src/dguide/proxied.html M docs/src/wrappers/testresult.html M docs/src/wrappers/simplelayout.html M docs/src/wrappers/testcase.html A + docs/src/wrappers/rtmpstatus.html M docs/src/wrappers/test.html ! docs/guide/cookie.jsp ! docs/guide/hello.lzx.test M build-tools/build-opt.xml M lps/components/extensions/av/microphone.lzx M lps/components/extensions/av/camera.lzx M lps/components/extensions/av/mediastream.lzx M lps/components/extensions/av/mediadevice.lzx M lps/components/extensions/av/videoview.lzx M lps/components/extensions/av/rtmpconnection.lzx M lps/components/library.lzx A + lps/components/av/videoplayer.lzx A + lps/components/av/library.lzx A + lps/components/av/videolibraryicon.lzx A + lps/components/av/videotogglebutton.lzx M lps/components/av/rtmpstatus.lzx A + lps/components/av/videoscreen.lzx A + lps/components/av/videoutils.lzx A + lps/components/av/videoslider.lzx A + lps/components/av/videothumbnail.lzx A + lps/components/av/videovolumebutton.lzx A + lps/components/av/resources/stop_btn_up.png A + lps/components/av/resources/scroll_track.swf A + lps/components/av/resources/volume_button_mo.png A + lps/components/av/resources/volume_lines.png A + lps/components/av/resources/scroll_lft_button_up.png A + lps/components/av/resources/record_btn_dn.png A + lps/components/av/resources/win_bot_mid.swf A + lps/components/av/resources/win_mid_rt.swf A + lps/components/av/resources/vid_btn_dn.png A + lps/components/av/resources/volume_button_up.png A + lps/components/av/resources/win_bot_lft.png A + lps/components/av/resources/win_bot_rt.png A + lps/components/av/resources/stop_btn_dn.png A + lps/components/av/resources/cam_btn_selected.png A + lps/components/av/resources/controls_cover.swf A + lps/components/av/resources/scroll_lft_button_dn.png A + lps/components/av/resources/volume_button_dn.png A + lps/components/av/resources/win_top_mid.swf A + lps/components/av/resources/win_top_lft.png A + lps/components/av/resources/win_top_rt.png A + lps/components/av/resources/scroll_thmb_lft.swf A + lps/components/av/resources/scroll_rt_button_mo.png A + lps/components/av/resources/audio_meter_under.png A + lps/components/av/resources/play_button_mo.png A + lps/components/av/resources/video_no_icon.gif A + lps/components/av/resources/vid_btn_selected.png A + lps/components/av/resources/cam_btn_mo.png A + lps/components/av/resources/win_title.png A + lps/components/av/resources/resize.png A + lps/components/av/resources/controls_well.swf A + lps/components/av/resources/volume_mute.png A + lps/components/av/resources/scroll_rt_button_up.png A + lps/components/av/resources/pause_button_mo.png A + lps/components/av/resources/play_button_up.png A + lps/components/av/resources/win_mid_lft.swf A + lps/components/av/resources/cam_btn_up.png A + lps/components/av/resources/scroll_thmb_mid.swf A + lps/components/av/resources/record_btn_mo.png A + lps/components/av/resources/pause_button_up.png A + lps/components/av/resources/scroll_rt_button_dn.png A + lps/components/av/resources/thumb.png A + lps/components/av/resources/vid_btn_mo.png A + lps/components/av/resources/play_button_dn.png A + lps/components/av/resources/stop_btn_mo.png A + lps/components/av/resources/cam_btn_dn.png A + lps/components/av/resources/record_btn_up.png A + lps/components/av/resources/scroll_thmb_rt.swf A + lps/components/av/resources/audio_meter_over.png A + lps/components/av/resources/scroll_lft_button_mo.png A + lps/components/av/resources/pause_button_dn.png A + lps/components/av/resources/vid_btn_up.png A + lps/components/av/resources/win_mid_mid.swf A + lps/components/av/videolibrarypopup.lzx M tools/index.html M demos/weather/weather.html A + demos/videolibrary A + demos/videolibrary/videolibrarybutton.lzx A + demos/videolibrary/videolibraryplayer.lzx A + demos/videolibrary/videocontrols.lzx A + demos/videolibrary/videolibrary.jsp A + demos/videolibrary/videocamerabutton.lzx A + demos/videolibrary/videolibrary.lzx A + demos/videolibrary/videolibrarypanel.lzx A + demos/videolibrary/videos A + demos/videolibrary/videos/good-dog.flv A + demos/videolibrary/resources A + demos/videolibrary/resources/stop_btn_up.png A + demos/videolibrary/resources/vid_btn_selected.png A + demos/videolibrary/resources/cam_btn_mo.png A + demos/videolibrary/resources/controls_well.swf A + demos/videolibrary/resources/record_btn_dn.png A + demos/videolibrary/resources/vid_btn_dn.png A + demos/videolibrary/resources/cam_btn_up.png A + demos/videolibrary/resources/stop_btn_dn.png A + demos/videolibrary/resources/audio_only_icon.png A + demos/videolibrary/resources/cam_btn_selected.png A + demos/videolibrary/resources/record_btn_mo.png A + demos/videolibrary/resources/vid_btn_mo.png A + demos/videolibrary/resources/stop_btn_mo.png A + demos/videolibrary/resources/cam_btn_dn.png A + demos/videolibrary/resources/record_btn_up.png A + demos/videolibrary/resources/audio_no_icon.gif A + demos/videolibrary/resources/audio_meter_over.png A + demos/videolibrary/resources/vid_btn_up.png A + demos/videolibrary/resources/audio_meter_under.png A + demos/videolibrary/resources/video_no_icon.gif A + demos/videolibrary/README.txt A + demos/videolibrary/videocamerapanel.lzx A + demos/videolibrary/videolibrarythumbnail.lzx A + demos/youtube A + demos/youtube/youtubeplayer.lzx A + demos/youtube/youtube.jsp A + demos/youtube/youtube.lzxChangeset: http://svn.openlaszlo.org/openlaszlo/patches/20070108-ben- N.tar
