[Commits] svn commit: 9286

Subversion Database Process svn at thor.atrc.utoronto.ca
Fri Feb 5 18:16:27 UTC 2010


------------------------------------------------------------------------
r9286 | snedkov at asteasolutions.com | 2010-02-05 13:16:27 -0500 (Fri, 05 Feb 2010) | 1 line
Changed paths:
   A /scratchpad/myCollection-tryout/fluid-engage-core/.settings (from /fluid/engage/fluid-engage-core/trunk/.settings:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/.settings/org.eclipse.core.resources.prefs (from /fluid/engage/fluid-engage-core/trunk/.settings/org.eclipse.core.resources.prefs:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/artifactView/html/view.html
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/browse/html/browse.html
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/browse/js/Browse.js
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/browse/messages/messages_fr.json
   A /scratchpad/myCollection-tryout/fluid-engage-core/components/browseCatalogue (from /fluid/engage/fluid-engage-core/trunk/components/browseCatalogue:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/browseCatalogue/html (from /fluid/engage/fluid-engage-core/trunk/components/browseCatalogue/html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/browseCatalogue/messages (from /fluid/engage/fluid-engage-core/trunk/components/browseCatalogue/messages:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/browseCatalogue/messages/messages_en.json (from /fluid/engage/fluid-engage-core/trunk/components/browseCatalogue/messages/messages_en.json:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/browseCatalogue/messages/messages_fr.json (from /fluid/engage/fluid-engage-core/trunk/components/browseCatalogue/messages/messages_fr.json:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/cabinet/css/Cabinet.css
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/cabinet/html/Cabinet.html
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/catalogue/html/view.html
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/catalogue/js/Catalogue.js
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/description/css/Description.css
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibition/css/Exhibition.css
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibition/html/about.html
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibition/html/view.html
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibition/js/ExhibitionView.js
   A /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibitionBrowse (from /fluid/engage/fluid-engage-core/trunk/components/exhibitionBrowse:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibitionBrowse/html (from /fluid/engage/fluid-engage-core/trunk/components/exhibitionBrowse/html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibitionBrowse/messages (from /fluid/engage/fluid-engage-core/trunk/components/exhibitionBrowse/messages:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibitionBrowse/messages/messages_en.json (from /fluid/engage/fluid-engage-core/trunk/components/exhibitionBrowse/messages/messages_en.json:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/exhibitionBrowse/messages/messages_fr.json (from /fluid/engage/fluid-engage-core/trunk/components/exhibitionBrowse/messages/messages_fr.json:9285)
   A /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook (from /fluid/engage/fluid-engage-core/trunk/components/guestbook:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/css (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/css:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/css/guestbook.css (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/css/guestbook.css:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/data (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/data:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/data/demoData.json (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/data/demoData.json:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/html (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/html/guestbook.html (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/html/guestbook.html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/images (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/images:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/images/addnote.png (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/images/addnote.png:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/js (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/js/guestbook.js (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/js/guestbook.js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/messages (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/messages:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/messages/messages_en.json (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/messages/messages_en.json:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/guestbook/messages/messages_fr.json (from /fluid/engage/fluid-engage-core/trunk/components/guestbook/messages/messages_fr.json:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/home/css/Home.css
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/home/html/home.html
   D /scratchpad/myCollection-tryout/fluid-engage-core/components/home/images/Collections.png
   A /scratchpad/myCollection-tryout/fluid-engage-core/components/home/images/flag.png (from /fluid/engage/fluid-engage-core/trunk/components/home/images/flag.png:9285)
   A /scratchpad/myCollection-tryout/fluid-engage-core/components/home/js (from /fluid/engage/fluid-engage-core/trunk/components/home/js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/home/js/Home.js (from /fluid/engage/fluid-engage-core/trunk/components/home/js/Home.js:9285)
   A /scratchpad/myCollection-tryout/fluid-engage-core/components/home/messages (from /fluid/engage/fluid-engage-core/trunk/components/home/messages:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/components/home/messages/messages_fr.json (from /fluid/engage/fluid-engage-core/trunk/components/home/messages/messages_fr.json:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/import/css/import.css
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/import/js/import.js
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/navigationList/css/NavigationList.css
   M /scratchpad/myCollection-tryout/fluid-engage-core/components/navigationList/html/NavigationList.html
   D /scratchpad/myCollection-tryout/fluid-engage-core/components/preview
   M /scratchpad/myCollection-tryout/fluid-engage-core/framework/js/Engage.js
   A /scratchpad/myCollection-tryout/fluid-engage-core/framework/js/dateUtils.js (from /fluid/engage/fluid-engage-core/trunk/framework/js/dateUtils.js:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/framework/js/engageClientUtils.js
   A /scratchpad/myCollection-tryout/fluid-engage-core/framework/js/iPhoneChromeless.js (from /fluid/engage/fluid-engage-core/trunk/framework/js/iPhoneChromeless.js:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/framework/js/loadData.js
   A /scratchpad/myCollection-tryout/fluid-engage-core/lib/jquery/datepicker (from /fluid/engage/fluid-engage-core/trunk/lib/jquery/datepicker:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/lib/jquery/datepicker/i18n (from /fluid/engage/fluid-engage-core/trunk/lib/jquery/datepicker/i18n:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/lib/jquery/datepicker/i18n/jquery.ui.datepicker-en-GB.js (from /fluid/engage/fluid-engage-core/trunk/lib/jquery/datepicker/i18n/jquery.ui.datepicker-en-GB.js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/lib/jquery/datepicker/i18n/jquery.ui.datepicker-fr.js (from /fluid/engage/fluid-engage-core/trunk/lib/jquery/datepicker/i18n/jquery.ui.datepicker-fr.js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/lib/jquery/datepicker/ui.datepicker-stub.js (from /fluid/engage/fluid-engage-core/trunk/lib/jquery/datepicker/ui.datepicker-stub.js:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-core/tests/component-tests/browse/js/BrowseTests.js
   A /scratchpad/myCollection-tryout/fluid-engage-core/tests/component-tests/home (from /fluid/engage/fluid-engage-core/trunk/tests/component-tests/home:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/component-tests/home/html (from /fluid/engage/fluid-engage-core/trunk/tests/component-tests/home/html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/component-tests/home/html/Home-test.html (from /fluid/engage/fluid-engage-core/trunk/tests/component-tests/home/html/Home-test.html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/component-tests/home/js (from /fluid/engage/fluid-engage-core/trunk/tests/component-tests/home/js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/component-tests/home/js/HomeTests.js (from /fluid/engage/fluid-engage-core/trunk/tests/component-tests/home/js/HomeTests.js:9285)
   A /scratchpad/myCollection-tryout/fluid-engage-core/tests/framework-tests/dates (from /fluid/engage/fluid-engage-core/trunk/tests/framework-tests/dates:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/framework-tests/dates/html (from /fluid/engage/fluid-engage-core/trunk/tests/framework-tests/dates/html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/framework-tests/dates/html/Date-test.html (from /fluid/engage/fluid-engage-core/trunk/tests/framework-tests/dates/html/Date-test.html:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/framework-tests/dates/js (from /fluid/engage/fluid-engage-core/trunk/tests/framework-tests/dates/js:9285)
   R /scratchpad/myCollection-tryout/fluid-engage-core/tests/framework-tests/dates/js/DateTests.js (from /fluid/engage/fluid-engage-core/trunk/tests/framework-tests/dates/js/DateTests.js:9285)
   A /scratchpad/myCollection-tryout/fluid-engage-kettle/.settings/org.eclipse.core.resources.prefs (from /fluid/engage/fluid-engage-kettle/trunk/.settings/org.eclipse.core.resources.prefs:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/java/org/fluidproject/kettle/ResourceUtil.java
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/application/engageConfig.json
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/application/engageStandaloneConfig.json
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/application/js/EngageApp.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/kettle/KettleIncludes.json
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/kettle/js/contentTypes.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/kettle/js/env2.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/kettle/js/kettle.js
   A /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/kettle/js/kettleUtils.js (from /fluid/engage/fluid-engage-kettle/trunk/src/main/webapp/kettle/js/kettleUtils.js:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/kettle/js/servletJSGI.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/artifactView/js/artifactView.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/browse/js/browse.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/browseCatalogue/js/browseCatalogue.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/catalogue/js/catalogue.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/exhibitionAbout/js/exhibitionAbout.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/exhibitionBrowse/js/exhibitionBrowse.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/exhibitionView/js/exhibitionView.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/home/js/HomeService.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/services/import/js/import.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/tests/kettle/html/Kettle-test.html
   A /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/tests/kettle/html/KettleApp-test.html (from /fluid/engage/fluid-engage-kettle/trunk/src/main/webapp/tests/kettle/html/KettleApp-test.html:9285)
   A /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/tests/kettle/js/KettleAppTests.js (from /fluid/engage/fluid-engage-kettle/trunk/src/main/webapp/tests/kettle/js/KettleAppTests.js:9285)
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/main/webapp/tests/kettle/js/KettleTests.js
   M /scratchpad/myCollection-tryout/fluid-engage-kettle/src/test/java/org/fluidproject/engage/TestENGAGE246.java

ENGAGE-164: My Collection - merging with project trunks
------------------------------------------------------------------------



More information about the Commits mailing list