Common subdirectories: trunk/.svn and ../trunk/chat/.svn
Common subdirectories: trunk/chat-api and ../trunk/chat/chat-api
Common subdirectories: trunk/chat-help and ../trunk/chat/chat-help
Common subdirectories: trunk/chat-impl and ../trunk/chat/chat-impl
Common subdirectories: trunk/chat-tool and ../trunk/chat/chat-tool
diff -r trunk/pom.xml ../trunk/chat/pom.xml
7c7
< SNAPSHOT
---
> M2
14,21d13
<
<
< scm:svn:https://source.sakaiproject.org/svn/chat/trunk
< scm:svn:https://source.sakaiproject.org/svn/chat/trunk
< https://source.sakaiproject.org/svn/chat/trunk
<
<
<
Only in ../trunk/chat: velocity.log
Only in ../trunk/chat: velocity.log.1
diff -r trunk/.svn/all-wcprops ../trunk/chat/.svn/all-wcprops
3,4c3,4
< V 30
< /svn/!svn/ver/46322/chat/trunk
---
> V 45
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat
9,10c9,10
< V 38
< /svn/!svn/ver/38343/chat/trunk/pom.xml
---
> V 53
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/pom.xml
Only in ../trunk/chat/.svn: dir-prop-base
diff -r trunk/.svn/entries ../trunk/chat/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,13
< 2008-05-09T02:04:38.299819Z
< 46322
< stephen.marquard@uct.ac.za
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
> has-props
14d14
<
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
44,49c44,48
< 2008-05-12T17:00:31.000000Z
< f27e8b2c053efd99261b27540845d24f
< 2007-11-18T22:50:58.975395Z
< 38343
< ian@caret.cam.ac.uk
< has-props
---
> 2008-03-01T15:05:21.000000Z
> aad7287c5e2cb831d6504245d9a17a9f
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/.svn/prop-base and ../trunk/chat/.svn/prop-base
Common subdirectories: trunk/.svn/props and ../trunk/chat/.svn/props
Common subdirectories: trunk/.svn/text-base and ../trunk/chat/.svn/text-base
Common subdirectories: trunk/.svn/tmp and ../trunk/chat/.svn/tmp
Only in trunk/.svn/prop-base: pom.xml.svn-base
diff -r trunk/.svn/text-base/pom.xml.svn-base ../trunk/chat/.svn/text-base/pom.xml.svn-base
7c7
< SNAPSHOT
---
> M2
14,21d13
<
<
< scm:svn:https://source.sakaiproject.org/svn/chat/trunk
< scm:svn:https://source.sakaiproject.org/svn/chat/trunk
< https://source.sakaiproject.org/svn/chat/trunk
<
<
<
Common subdirectories: trunk/.svn/tmp/prop-base and ../trunk/chat/.svn/tmp/prop-base
Common subdirectories: trunk/.svn/tmp/props and ../trunk/chat/.svn/tmp/props
Common subdirectories: trunk/.svn/tmp/text-base and ../trunk/chat/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/.svn and ../trunk/chat/chat-api/.svn
Common subdirectories: trunk/chat-api/api and ../trunk/chat/chat-api/api
diff -r trunk/chat-api/.svn/all-wcprops ../trunk/chat/chat-api/.svn/all-wcprops
3,4c3,4
< V 39
< /svn/!svn/ver/42151/chat/trunk/chat-api
---
> V 54
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api
9,10c9,10
< V 50
< /svn/!svn/ver/32813/chat/trunk/chat-api/.classpath
---
> V 65
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/.classpath
15,16c15,16
< V 48
< /svn/!svn/ver/22637/chat/trunk/chat-api/.project
---
> V 63
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/.project
diff -r trunk/chat-api/.svn/dir-prop-base ../trunk/chat/chat-api/.svn/dir-prop-base
3c3,4
< V 4
---
> V 11
> target
diff -r trunk/chat-api/.svn/entries ../trunk/chat/chat-api/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2007-07-19T10:30:31.413571Z
< 32813
< ian@caret.cam.ac.uk
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
48c48
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
50,52c50,52
< 2007-03-14T20:34:28.140467Z
< 22637
< chmaurer@iupui.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-api/.svn/prop-base and ../trunk/chat/chat-api/.svn/prop-base
Common subdirectories: trunk/chat-api/.svn/props and ../trunk/chat/chat-api/.svn/props
Common subdirectories: trunk/chat-api/.svn/text-base and ../trunk/chat/chat-api/.svn/text-base
Common subdirectories: trunk/chat-api/.svn/tmp and ../trunk/chat/chat-api/.svn/tmp
diff -r trunk/chat-api/.svn/prop-base/.classpath.svn-base ../trunk/chat/chat-api/.svn/prop-base/.classpath.svn-base
5,8d4
< K 12
< svn:keywords
< V 31
< Date Revision Author HeadURL Id
diff -r trunk/chat-api/.svn/prop-base/.project.svn-base ../trunk/chat/chat-api/.svn/prop-base/.project.svn-base
5,8d4
< K 12
< svn:keywords
< V 31
< Date Revision Author HeadURL Id
Common subdirectories: trunk/chat-api/.svn/tmp/prop-base and ../trunk/chat/chat-api/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/.svn/tmp/props and ../trunk/chat/chat-api/.svn/tmp/props
Common subdirectories: trunk/chat-api/.svn/tmp/text-base and ../trunk/chat/chat-api/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/.svn and ../trunk/chat/chat-api/api/.svn
Only in ../trunk/chat/chat-api/api: m2-target
diff -r trunk/chat-api/api/pom.xml ../trunk/chat/chat-api/api/pom.xml
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-api/api/src and ../trunk/chat/chat-api/api/src
diff -r trunk/chat-api/api/.svn/all-wcprops ../trunk/chat/chat-api/api/.svn/all-wcprops
3,4c3,4
< V 43
< /svn/!svn/ver/42151/chat/trunk/chat-api/api
---
> V 58
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api
9,10c9,10
< V 51
< /svn/!svn/ver/38274/chat/trunk/chat-api/api/pom.xml
---
> V 66
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/pom.xml
diff -r trunk/chat-api/api/.svn/dir-prop-base ../trunk/chat/chat-api/api/.svn/dir-prop-base
3,4c3
< V 19
< m2-target
---
> V 31
5a5,7
> m2-target
> bin
> .settings
7,8d8
<
<
diff -r trunk/chat-api/api/.svn/entries ../trunk/chat/chat-api/api/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
38,43c38,42
< 2008-05-12T17:00:30.000000Z
< 02ab7d18ebb982e34f3670d607cfe300
< 2007-11-18T20:39:38.930812Z
< 38274
< ian@caret.cam.ac.uk
< has-props
---
> 2008-03-01T15:05:20.000000Z
> fd0649bd106d961bf1a79c76c826aa11
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-api/api/.svn/prop-base and ../trunk/chat/chat-api/api/.svn/prop-base
Common subdirectories: trunk/chat-api/api/.svn/props and ../trunk/chat/chat-api/api/.svn/props
Common subdirectories: trunk/chat-api/api/.svn/text-base and ../trunk/chat/chat-api/api/.svn/text-base
Common subdirectories: trunk/chat-api/api/.svn/tmp and ../trunk/chat/chat-api/api/.svn/tmp
Only in trunk/chat-api/api/.svn/prop-base: pom.xml.svn-base
diff -r trunk/chat-api/api/.svn/text-base/pom.xml.svn-base ../trunk/chat/chat-api/api/.svn/text-base/pom.xml.svn-base
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-api/api/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/.svn/tmp/props and ../trunk/chat/chat-api/api/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/.svn/tmp/text-base and ../trunk/chat/chat-api/api/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/.svn and ../trunk/chat/chat-api/api/src/.svn
Common subdirectories: trunk/chat-api/api/src/java and ../trunk/chat/chat-api/api/src/java
diff -r trunk/chat-api/api/src/.svn/all-wcprops ../trunk/chat/chat-api/api/src/.svn/all-wcprops
3,4c3,4
< V 47
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src
---
> V 62
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src
diff -r trunk/chat-api/api/src/.svn/entries ../trunk/chat/chat-api/api/src/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-api/api/src/.svn/prop-base and ../trunk/chat/chat-api/api/src/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/.svn/props and ../trunk/chat/chat-api/api/src/.svn/props
Common subdirectories: trunk/chat-api/api/src/.svn/text-base and ../trunk/chat/chat-api/api/src/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/.svn/tmp and ../trunk/chat/chat-api/api/src/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/.svn/tmp/props and ../trunk/chat/chat-api/api/src/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/.svn and ../trunk/chat/chat-api/api/src/java/.svn
Common subdirectories: trunk/chat-api/api/src/java/org and ../trunk/chat/chat-api/api/src/java/org
diff -r trunk/chat-api/api/src/java/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/.svn/all-wcprops
3,4c3,4
< V 52
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java
---
> V 67
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java
diff -r trunk/chat-api/api/src/java/.svn/entries ../trunk/chat/chat-api/api/src/java/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-api/api/src/java/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/.svn/props and ../trunk/chat/chat-api/api/src/java/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/.svn/text-base and ../trunk/chat/chat-api/api/src/java/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/.svn/tmp and ../trunk/chat/chat-api/api/src/java/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/.svn and ../trunk/chat/chat-api/api/src/java/org/.svn
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject and ../trunk/chat/chat-api/api/src/java/org/sakaiproject
diff -r trunk/chat-api/api/src/java/org/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/.svn/all-wcprops
3,4c3,4
< V 56
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org
---
> V 71
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org
diff -r trunk/chat-api/api/src/java/org/.svn/entries ../trunk/chat/chat-api/api/src/java/org/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/props and ../trunk/chat/chat-api/api/src/java/org/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2 and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2
diff -r trunk/chat-api/api/src/java/org/sakaiproject/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/all-wcprops
3,4c3,4
< V 69
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org/sakaiproject
---
> V 84
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject
diff -r trunk/chat-api/api/src/java/org/sakaiproject/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/all-wcprops
3,4c3,4
< V 74
< /svn/!svn/ver/21005/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat
---
> V 89
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-02-05T02:40:13.356669Z
< 21005
< csev@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannel.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannel.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannel.java $
< * $Id: ChatChannel.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannel.java $
> * $Id: ChatChannel.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannelEdit.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannelEdit.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannelEdit.java $
< * $Id: ChatChannelEdit.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannelEdit.java $
> * $Id: ChatChannelEdit.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessage.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessage.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessage.java $
< * $Id: ChatMessage.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessage.java $
> * $Id: ChatMessage.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageEdit.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageEdit.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageEdit.java $
< * $Id: ChatMessageEdit.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageEdit.java $
> * $Id: ChatMessageEdit.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeader.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeader.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeader.java $
< * $Id: ChatMessageHeader.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeader.java $
> * $Id: ChatMessageHeader.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeaderEdit.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeaderEdit.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeaderEdit.java $
< * $Id: ChatMessageHeaderEdit.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeaderEdit.java $
> * $Id: ChatMessageHeaderEdit.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatService.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatService.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatService.java $
< * $Id: ChatService.java 21005 2007-02-05 02:40:13Z csev@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatService.java $
> * $Id: ChatService.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/all-wcprops
3,4c3,4
< V 78
< /svn/!svn/ver/21005/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api
---
> V 93
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api
9,10c9,10
< V 95
< /svn/!svn/ver/21005/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatService.java
---
> V 110
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatService.java
15,16c15,16
< V 104
< /svn/!svn/ver/8206/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeaderEdit.java
---
> V 120
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeaderEdit.java
21,22c21,22
< V 94
< /svn/!svn/ver/8206/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessage.java
---
> V 110
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessage.java
27,28c27,28
< V 94
< /svn/!svn/ver/8206/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannel.java
---
> V 110
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannel.java
33,34c33,34
< V 98
< /svn/!svn/ver/8206/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageEdit.java
---
> V 114
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageEdit.java
39,40c39,40
< V 100
< /svn/!svn/ver/8206/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeader.java
---
> V 116
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatMessageHeader.java
45,46c45,46
< V 98
< /svn/!svn/ver/8206/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannelEdit.java
---
> V 114
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/ChatChannelEdit.java
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/api
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-02-05T02:40:13.356669Z
< 21005
< csev@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2007-02-05T02:40:13.356669Z
< 21005
< csev@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
48c48
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
50,52c50,52
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
61c61
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
63,65c63,65
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
74c74
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
76,78c76,78
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
87c87
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
89,91c89,91
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
100c100
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
102,104c102,104
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
113c113
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
115,117c115,117
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/api/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/ChatService.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/ChatService.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/ChatService.java $
< * $Id: ChatService.java 20991 2007-02-04 02:49:20Z csev@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/ChatService.java $
> * $Id: ChatService.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/all-wcprops
3,4c3,4
< V 80
< /svn/!svn/ver/20991/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/cover
---
> V 95
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover
9,10c9,10
< V 97
< /svn/!svn/ver/20991/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/ChatService.java
---
> V 112
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/ChatService.java
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat/cover
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-02-04T02:49:20.595082Z
< 20991
< csev@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2007-02-04T02:49:20.595082Z
< 20991
< csev@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat/cover/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/all-wcprops
3,4c3,4
< V 75
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2
---
> V 90
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatChannel.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatChannel.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatChannel.java $
< * $Id: ChatChannel.java 42151 2008-03-11 20:29:48Z wang58@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatChannel.java $
> * $Id: ChatChannel.java 626 2008-01-11 18:18:08Z jayshao $
51c51
< private String filterType = FILTER_ALL;
---
> private String filterType = FILTER_BY_TIME;
53,54d52
< private int timeParam = 3;
< private int numberParam = 10;
71,72d68
< this.timeParam = defaults.getTimeParam();
< this.numberParam = defaults.getNumberParam();
261,263d256
<
< public int getNumberParam() {
< return numberParam;
265,277d257
<
< public void setNumberParam(int numberParam) {
< this.numberParam = numberParam;
< }
<
< public int getTimeParam() {
< return timeParam;
< }
<
< public void setTimeParam(int timeParam) {
< this.timeParam = timeParam;
< }
< }
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatFunctions.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatFunctions.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatFunctions.java $
< * $Id: ChatFunctions.java 22637 2007-03-14 20:34:28Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatFunctions.java $
> * $Id: ChatFunctions.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatManager.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatManager.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatManager.java $
< * $Id: ChatManager.java 34367 2007-08-24 15:43:45Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatManager.java $
> * $Id: ChatManager.java 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatMessage.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatMessage.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatMessage.java $
< * $Id: ChatMessage.java 39469 2007-12-18 21:43:30Z bkirschn@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatMessage.java $
> * $Id: ChatMessage.java 626 2008-01-11 18:18:08Z jayshao $
54d53
< static String parenRegexp = "[\\s+(]";
96,97c95
< // split on spaces, parenthesis, and backslashes
< String[] parts = formattedBody.split("[\\s()\\\\]");
---
> String[] parts = formattedBody.split("\\s");
109c107
< // replace url that's preceded by space(s)
---
> // replace url that's embedded in text
113,116d110
< // replace url that's preceded by parenthesis
< formattedBody =
< formattedBody.replaceFirst( parenRegexp+parts[i],
< "("+href.toString() );
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/PresenceObserver.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/PresenceObserver.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/PresenceObserver.java $
< * $Id: PresenceObserver.java 23077 2007-03-21 18:15:46Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/PresenceObserver.java $
> * $Id: PresenceObserver.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/RoomObserver.java ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/RoomObserver.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/RoomObserver.java $
< * $Id: RoomObserver.java 23077 2007-03-21 18:15:46Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/RoomObserver.java $
> * $Id: RoomObserver.java 615 2008-01-08 14:53:08Z jayshao $
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/all-wcprops
3,4c3,4
< V 81
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model
---
> V 96
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model
6c6
< ChatMessage.java
---
> RoomObserver.java
9,10c9,10
< V 98
< /svn/!svn/ver/39469/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatMessage.java
---
> V 114
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/RoomObserver.java
12c12
< RoomObserver.java
---
> ChatMessage.java
15,16c15,16
< V 99
< /svn/!svn/ver/23077/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/RoomObserver.java
---
> V 113
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatMessage.java
18c18
< ChatChannel.java
---
> ChatFunctions.java
21,22c21,22
< V 98
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatChannel.java
---
> V 115
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatFunctions.java
24c24
< ChatFunctions.java
---
> ChatChannel.java
27,28c27,28
< V 100
< /svn/!svn/ver/22637/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatFunctions.java
---
> V 113
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatChannel.java
33,34c33,34
< V 98
< /svn/!svn/ver/34367/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatManager.java
---
> V 113
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/ChatManager.java
39,40c39,40
< V 103
< /svn/!svn/ver/23077/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/PresenceObserver.java
---
> V 118
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/PresenceObserver.java
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
32c32
< ChatMessage.java
---
> RoomObserver.java
38,42c38,42
< 2008-05-12T17:00:30.000000Z
< d1d7dbc88f855b301a82c38a9a999066
< 2007-12-18T21:43:30.776587Z
< 39469
< bkirschn@umich.edu
---
> 2008-03-01T15:05:20.000000Z
> 577f9efedacf1ce082cc88da4a209162
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
45c45
< RoomObserver.java
---
> ChatMessage.java
51,55c51,55
< 2008-05-12T17:00:30.000000Z
< 577f9efedacf1ce082cc88da4a209162
< 2007-03-21T18:15:46.584998Z
< 23077
< chmaurer@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 8b2a12b36c1649cc951c21f08402d7cd
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
58c58
< ChatChannel.java
---
> ChatFunctions.java
64,68c64,68
< 2008-05-12T17:00:30.000000Z
< 3923c823c74fdbb224132118c9096ee2
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 740bba97fd0693de992b12d00765f4b2
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
71c71
< ChatFunctions.java
---
> ChatChannel.java
77,81c77,81
< 2008-05-12T17:00:30.000000Z
< 740bba97fd0693de992b12d00765f4b2
< 2007-03-14T20:34:28.140467Z
< 22637
< chmaurer@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 81e2474b735ef177c4ad1dae9381dac1
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
90c90
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
92,94c92,94
< 2007-08-24T15:43:45.181383Z
< 34367
< chmaurer@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
103c103
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
105,107c105,107
< 2007-03-21T18:15:46.584998Z
< 23077
< chmaurer@iupui.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/text-base/ChatChannel.java.svn-base ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/text-base/ChatChannel.java.svn-base
51c51
< private String filterType = FILTER_ALL;
---
> private String filterType = FILTER_BY_TIME;
53,54d52
< private int timeParam = 3;
< private int numberParam = 10;
71,72d68
< this.timeParam = defaults.getTimeParam();
< this.numberParam = defaults.getNumberParam();
261,263d256
<
< public int getNumberParam() {
< return numberParam;
265,277d257
<
< public void setNumberParam(int numberParam) {
< this.numberParam = numberParam;
< }
<
< public int getTimeParam() {
< return timeParam;
< }
<
< public void setTimeParam(int timeParam) {
< this.timeParam = timeParam;
< }
< }
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/text-base/ChatMessage.java.svn-base ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/text-base/ChatMessage.java.svn-base
54d53
< static String parenRegexp = "[\\s+(]";
96,97c95
< // split on spaces, parenthesis, and backslashes
< String[] parts = formattedBody.split("[\\s()\\\\]");
---
> String[] parts = formattedBody.split("\\s");
109c107
< // replace url that's preceded by space(s)
---
> // replace url that's embedded in text
113,116d110
< // replace url that's preceded by parenthesis
< formattedBody =
< formattedBody.replaceFirst( parenRegexp+parts[i],
< "("+href.toString() );
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/.svn/tmp/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/ChatImpl.hbm.xml ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/ChatImpl.hbm.xml
25,26d24
<
<
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/all-wcprops ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/all-wcprops
3,4c3,4
< V 86
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl
---
> V 101
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl
9,10c9,10
< V 103
< /svn/!svn/ver/42151/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/ChatImpl.hbm.xml
---
> V 118
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/ChatImpl.hbm.xml
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/entries ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35,40c35,39
< 2008-05-12T17:00:30.000000Z
< 645114c039bab6d593d94bdbc0881c14
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
< has-props
---
> 2008-03-01T15:05:20.000000Z
> 5b4410500ae5284338f9669312c805e0
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp
Only in trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base: ChatImpl.hbm.xml.svn-base
diff -r trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base/ChatImpl.hbm.xml.svn-base ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base/ChatImpl.hbm.xml.svn-base
25,26d24
<
<
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/prop-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/prop-base
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/props and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/props
Common subdirectories: trunk/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/text-base and ../trunk/chat/chat-api/api/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/text-base
Common subdirectories: trunk/chat-help/.svn and ../trunk/chat/chat-help/.svn
Only in ../trunk/chat/chat-help: m2-target
diff -r trunk/chat-help/pom.xml ../trunk/chat/chat-help/pom.xml
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-help/src and ../trunk/chat/chat-help/src
diff -r trunk/chat-help/.svn/all-wcprops ../trunk/chat/chat-help/.svn/all-wcprops
3,4c3,4
< V 40
< /svn/!svn/ver/46322/chat/trunk/chat-help
---
> V 55
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-help
9,10c9,10
< V 48
< /svn/!svn/ver/38274/chat/trunk/chat-help/pom.xml
---
> V 63
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-help/pom.xml
diff -r trunk/chat-help/.svn/dir-prop-base ../trunk/chat/chat-help/.svn/dir-prop-base
3,4c3
< V 19
< m2-target
---
> V 31
5a5,7
> m2-target
> bin
> .settings
7,8d8
<
<
diff -r trunk/chat-help/.svn/entries ../trunk/chat/chat-help/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-help
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-help
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-05-09T02:04:38.299819Z
< 46322
< stephen.marquard@uct.ac.za
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
38,43c38,42
< 2008-05-12T17:00:30.000000Z
< 022609bd5450213dc9da38a69567da73
< 2007-11-18T20:39:38.930812Z
< 38274
< ian@caret.cam.ac.uk
< has-props
---
> 2008-03-01T15:05:20.000000Z
> 45e990d0e76962a80b39dd7ce7fd11d6
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-help/.svn/prop-base and ../trunk/chat/chat-help/.svn/prop-base
Common subdirectories: trunk/chat-help/.svn/props and ../trunk/chat/chat-help/.svn/props
Common subdirectories: trunk/chat-help/.svn/text-base and ../trunk/chat/chat-help/.svn/text-base
Common subdirectories: trunk/chat-help/.svn/tmp and ../trunk/chat/chat-help/.svn/tmp
Only in trunk/chat-help/.svn/prop-base: pom.xml.svn-base
diff -r trunk/chat-help/.svn/text-base/pom.xml.svn-base ../trunk/chat/chat-help/.svn/text-base/pom.xml.svn-base
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-help/.svn/tmp/prop-base and ../trunk/chat/chat-help/.svn/tmp/prop-base
Common subdirectories: trunk/chat-help/.svn/tmp/props and ../trunk/chat/chat-help/.svn/tmp/props
Common subdirectories: trunk/chat-help/.svn/tmp/text-base and ../trunk/chat/chat-help/.svn/tmp/text-base
Common subdirectories: trunk/chat-help/src/.svn and ../trunk/chat/chat-help/src/.svn
Common subdirectories: trunk/chat-help/src/sakai_chat and ../trunk/chat/chat-help/src/sakai_chat
diff -r trunk/chat-help/src/.svn/all-wcprops ../trunk/chat/chat-help/src/.svn/all-wcprops
3,4c3,4
< V 44
< /svn/!svn/ver/46322/chat/trunk/chat-help/src
---
> V 59
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-help/src
diff -r trunk/chat-help/src/.svn/entries ../trunk/chat/chat-help/src/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-help/src
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-help/src
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-05-09T02:04:38.299819Z
< 46322
< stephen.marquard@uct.ac.za
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-help/src/.svn/prop-base and ../trunk/chat/chat-help/src/.svn/prop-base
Common subdirectories: trunk/chat-help/src/.svn/props and ../trunk/chat/chat-help/src/.svn/props
Common subdirectories: trunk/chat-help/src/.svn/text-base and ../trunk/chat/chat-help/src/.svn/text-base
Common subdirectories: trunk/chat-help/src/.svn/tmp and ../trunk/chat/chat-help/src/.svn/tmp
Common subdirectories: trunk/chat-help/src/.svn/tmp/prop-base and ../trunk/chat/chat-help/src/.svn/tmp/prop-base
Common subdirectories: trunk/chat-help/src/.svn/tmp/props and ../trunk/chat/chat-help/src/.svn/tmp/props
Common subdirectories: trunk/chat-help/src/.svn/tmp/text-base and ../trunk/chat/chat-help/src/.svn/tmp/text-base
Common subdirectories: trunk/chat-help/src/sakai_chat/.svn and ../trunk/chat/chat-help/src/sakai_chat/.svn
diff -r trunk/chat-help/src/sakai_chat/arcv.html ../trunk/chat/chat-help/src/sakai_chat/arcv.html
1,2c1
<
<
---
>
33a33,40
>
>
>
>
>
>
>
>
49,54c56,58
<
In the menubar, click Chat Room. You will
< enter the default room (as specified by the site leader). To change
< rooms, click Change Room at the top, and select the room to
< which you would like to change.
<
To see who is presently in the room, look under "Users in Chat" on
< the right side of the screen.
---
>
In the menubar, click Chat Room. You will enter the default Chat Room specified by the Site Leader. To change Chat Rooms, click Change Room at the top and select the room you would like to change to.
>
To see who is presently in the Chat Room, look under "Users in
> Chat" on the right side of the screen.
59,60c63,64
< Only, Date and Time, Date Only, Neither
< Date or Time or ID only.
---
> Only, Date and Time, Date Only, or Neither
> Date or Time.
95,97d98
<
To permanently delete all messages from a chat room, click
< Options, and then click Clear History. Click
< Delete to confirm.
Default room: Site leaders can use
< Options to specify which room is visible by default to
< participants accessing the tool.
<
67,69c43,44
<
Site leaders can specify how many chat messages are archived and
< for how long, or they can allow participants to configure their own
< archive settings.
---
>
All chat messages are archived and can be read by any site
> participant.
In the menubar, click Chat Room. You will
< enter the default room (as specified by the site leader). To change
< rooms, click Change Room at the top, and select the room to
< which you would like to change.
<
To see who is presently in the room, look under "Users in Chat" on
< the right side of the screen.
---
>
In the menubar, click Chat Room. You will enter the default Chat Room specified by the Site Leader. To change Chat Rooms, click Change Room at the top and select the room you would like to change to.
>
To see who is presently in the Chat Room, look under "Users in
> Chat" on the right side of the screen.
59,60c63,64
< Only, Date and Time, Date Only, Neither
< Date or Time or ID only.
---
> Only, Date and Time, Date Only, or Neither
> Date or Time.
95,97d98
<
To permanently delete all messages from a chat room, click
< Options, and then click Clear History. Click
< Delete to confirm.
Default room: Site leaders can use
< Options to specify which room is visible by default to
< participants accessing the tool.
<
67,69c43,44
<
Site leaders can specify how many chat messages are archived and
< for how long, or they can allow participants to configure their own
< archive settings.
---
>
All chat messages are archived and can be read by any site
> participant.
77,82d51
<
<
<
<
<
<
diff -r trunk/chat-help/src/sakai_chat/.svn/text-base/ardp.html.svn-base ../trunk/chat/chat-help/src/sakai_chat/.svn/text-base/ardp.html.svn-base
1,2c1
<
<
---
>
100c99
< Delete. To keep the room, click Cancel.
---
> Delete. Or, click Cancel to keep the room.
102a102
>
Common subdirectories: trunk/chat-help/src/sakai_chat/.svn/tmp/prop-base and ../trunk/chat/chat-help/src/sakai_chat/.svn/tmp/prop-base
Common subdirectories: trunk/chat-help/src/sakai_chat/.svn/tmp/props and ../trunk/chat/chat-help/src/sakai_chat/.svn/tmp/props
Common subdirectories: trunk/chat-help/src/sakai_chat/.svn/tmp/text-base and ../trunk/chat/chat-help/src/sakai_chat/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/.svn and ../trunk/chat/chat-impl/.svn
Common subdirectories: trunk/chat-impl/impl and ../trunk/chat/chat-impl/impl
Common subdirectories: trunk/chat-impl/pack and ../trunk/chat/chat-impl/pack
diff -r trunk/chat-impl/.svn/all-wcprops ../trunk/chat/chat-impl/.svn/all-wcprops
3,4c3,4
< V 40
< /svn/!svn/ver/42321/chat/trunk/chat-impl
---
> V 55
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl
9,10c9,10
< V 51
< /svn/!svn/ver/35249/chat/trunk/chat-impl/.classpath
---
> V 66
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/.classpath
15,16c15,16
< V 48
< /svn/!svn/ver/8206/chat/trunk/chat-impl/.project
---
> V 64
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/.project
diff -r trunk/chat-impl/.svn/dir-prop-base ../trunk/chat/chat-impl/.svn/dir-prop-base
3c3,4
< V 4
---
> V 11
> target
diff -r trunk/chat-impl/.svn/entries ../trunk/chat/chat-impl/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-14T21:02:40.830448Z
< 42321
< bkirschn@umich.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
37,39c37,39
< 2007-09-18T14:39:03.638648Z
< 35249
< lance@indiana.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
51c51
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
53,55c53,55
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-impl/.svn/prop-base and ../trunk/chat/chat-impl/.svn/prop-base
Common subdirectories: trunk/chat-impl/.svn/props and ../trunk/chat/chat-impl/.svn/props
Common subdirectories: trunk/chat-impl/.svn/text-base and ../trunk/chat/chat-impl/.svn/text-base
Common subdirectories: trunk/chat-impl/.svn/tmp and ../trunk/chat/chat-impl/.svn/tmp
Common subdirectories: trunk/chat-impl/.svn/tmp/prop-base and ../trunk/chat/chat-impl/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/.svn/tmp/props and ../trunk/chat/chat-impl/.svn/tmp/props
Common subdirectories: trunk/chat-impl/.svn/tmp/text-base and ../trunk/chat/chat-impl/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/.svn and ../trunk/chat/chat-impl/impl/.svn
Only in ../trunk/chat/chat-impl/impl: m2-target
diff -r trunk/chat-impl/impl/pom.xml ../trunk/chat/chat-impl/impl/pom.xml
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-impl/impl/src and ../trunk/chat/chat-impl/impl/src
diff -r trunk/chat-impl/impl/.svn/all-wcprops ../trunk/chat/chat-impl/impl/.svn/all-wcprops
3,4c3,4
< V 45
< /svn/!svn/ver/42321/chat/trunk/chat-impl/impl
---
> V 60
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl
9,10c9,10
< V 53
< /svn/!svn/ver/38274/chat/trunk/chat-impl/impl/pom.xml
---
> V 68
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/pom.xml
diff -r trunk/chat-impl/impl/.svn/dir-prop-base ../trunk/chat/chat-impl/impl/.svn/dir-prop-base
3,4c3
< V 19
< m2-target
---
> V 31
5a5,7
> m2-target
> bin
> .settings
7,8d8
<
<
diff -r trunk/chat-impl/impl/.svn/entries ../trunk/chat/chat-impl/impl/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-14T21:02:40.830448Z
< 42321
< bkirschn@umich.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
38,43c38,42
< 2008-05-12T17:00:31.000000Z
< 2da79c4a9bec00bfba0fc0d1d6ebc543
< 2007-11-18T20:39:38.930812Z
< 38274
< ian@caret.cam.ac.uk
< has-props
---
> 2008-04-10T01:33:25.000000Z
> f0b731ad0bf93f160cc521ea836e35be
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-impl/impl/.svn/prop-base and ../trunk/chat/chat-impl/impl/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/.svn/props and ../trunk/chat/chat-impl/impl/.svn/props
Common subdirectories: trunk/chat-impl/impl/.svn/text-base and ../trunk/chat/chat-impl/impl/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/.svn/tmp and ../trunk/chat/chat-impl/impl/.svn/tmp
Only in trunk/chat-impl/impl/.svn/prop-base: pom.xml.svn-base
diff -r trunk/chat-impl/impl/.svn/text-base/pom.xml.svn-base ../trunk/chat/chat-impl/impl/.svn/text-base/pom.xml.svn-base
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-impl/impl/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/.svn/tmp/props and ../trunk/chat/chat-impl/impl/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/.svn and ../trunk/chat/chat-impl/impl/src/.svn
Common subdirectories: trunk/chat-impl/impl/src/bundle and ../trunk/chat/chat-impl/impl/src/bundle
Common subdirectories: trunk/chat-impl/impl/src/java and ../trunk/chat/chat-impl/impl/src/java
Common subdirectories: trunk/chat-impl/impl/src/sql and ../trunk/chat/chat-impl/impl/src/sql
diff -r trunk/chat-impl/impl/src/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/.svn/all-wcprops
3,4c3,4
< V 49
< /svn/!svn/ver/42321/chat/trunk/chat-impl/impl/src
---
> V 64
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src
diff -r trunk/chat-impl/impl/src/.svn/entries ../trunk/chat/chat-impl/impl/src/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-14T21:02:40.830448Z
< 42321
< bkirschn@umich.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/.svn/props and ../trunk/chat/chat-impl/impl/src/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/.svn/text-base and ../trunk/chat/chat-impl/impl/src/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/.svn/tmp and ../trunk/chat/chat-impl/impl/src/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn and ../trunk/chat/chat-impl/impl/src/bundle/.svn
diff -r trunk/chat-impl/impl/src/bundle/chat-sql.properties ../trunk/chat/chat-impl/impl/src/bundle/chat-sql.properties
3,5c3
< insert.channel=insert into CHAT2_CHANNEL (CHANNEL_ID, CONTEXT, CREATION_DATE, title, description, filterType, filterParam, placementDefaultChannel, ENABLE_USER_OVERRIDE, migratedChannelId) \
< select ?, ?, ?, ?, ?, ?, ?, ?, ?, ? from dual where not exists \
< (select * from CHAT2_CHANNEL c2 where c2.migratedChannelId=?)
---
> insert.channel=insert into CHAT2_CHANNEL (CHANNEL_ID, CONTEXT, CREATION_DATE, title, description, filterType, filterParam, placementDefaultChannel, ENABLE_USER_OVERRIDE, migratedChannelId) select ?, ?, ?, ?, ?, ?, ?, ?, ?, ? from dual where not exists (select * from CHAT2_CHANNEL c2 where c2.migratedChanneId=?)
9,11c7
< insert.message=insert into CHAT2_MESSAGE (MESSAGE_ID, CHANNEL_ID, OWNER, MESSAGE_DATE, BODY, migratedMessageId) \
< select ?, ?, ?, ?, ?, ? from dual where not exists \
< (select * from CHAT2_MESSAGE m2 where m2.migratedMessageId=?)
---
> insert.message=insert into CHAT2_MESSAGE (MESSAGE_ID, CHANNEL_ID, OWNER, MESSAGE_DATE, BODY, migratedMessageId) select ?, ?, ?, ?, ?, ? from dual where not exists (select * from CHAT2_MESSAGE m2 where m2.migratedMessageId=?)
Only in trunk/chat-impl/impl/src/bundle: chat_pt_BR.properties
Only in trunk/chat-impl/impl/src/bundle: chat_pt_PT.properties
diff -r trunk/chat-impl/impl/src/bundle/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/bundle/.svn/all-wcprops
3,4c3,4
< V 56
< /svn/!svn/ver/42321/chat/trunk/chat-impl/impl/src/bundle
---
> V 71
> /repos/sakai2.3/!svn/ver/676/sakai/trunk/chat/chat-impl/impl/src/bundle
6,17d5
< chat_pt_BR.properties
< K 25
< svn:wc:ra_dav:version-url
< V 78
< /svn/!svn/ver/42321/chat/trunk/chat-impl/impl/src/bundle/chat_pt_BR.properties
< END
< chat_pt_PT.properties
< K 25
< svn:wc:ra_dav:version-url
< V 78
< /svn/!svn/ver/39190/chat/trunk/chat-impl/impl/src/bundle/chat_pt_PT.properties
< END
21,22c9,10
< V 75
< /svn/!svn/ver/27724/chat/trunk/chat-impl/impl/src/bundle/chat_es.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-impl/impl/src/bundle/chat_es.properties
27,28c15,16
< V 75
< /svn/!svn/ver/32229/chat/trunk/chat-impl/impl/src/bundle/chat_nl.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/bundle/chat_nl.properties
33,34c21,22
< V 78
< /svn/!svn/ver/31607/chat/trunk/chat-impl/impl/src/bundle/chat_fr_CA.properties
---
> V 93
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/bundle/chat_fr_CA.properties
39,40c27,28
< V 76
< /svn/!svn/ver/33981/chat/trunk/chat-impl/impl/src/bundle/chat-sql.properties
---
> V 91
> /repos/sakai2.3/!svn/ver/676/sakai/trunk/chat/chat-impl/impl/src/bundle/chat-sql.properties
45,46c33,34
< V 72
< /svn/!svn/ver/22868/chat/trunk/chat-impl/impl/src/bundle/chat.properties
---
> V 87
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-impl/impl/src/bundle/chat.properties
51,52c39,40
< V 75
< /svn/!svn/ver/27867/chat/trunk/chat-impl/impl/src/bundle/chat_ca.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-impl/impl/src/bundle/chat_ca.properties
diff -r trunk/chat-impl/impl/src/bundle/.svn/entries ../trunk/chat/chat-impl/impl/src/bundle/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/bundle
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/bundle
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-14T21:02:40.830448Z
< 42321
< bkirschn@umich.edu
---
> 2008-01-18T23:58:09.044958Z
> 676
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
29,53d28
< chat_pt_BR.properties
< file
<
<
<
<
< 2008-05-12T17:00:31.000000Z
< befce6d4b9989a87cfd9ae583dbc3f52
< 2008-03-14T21:02:40.830448Z
< 42321
< bkirschn@umich.edu
<
< chat_pt_PT.properties
< file
<
<
<
<
< 2008-05-12T17:00:31.000000Z
< dc131d453245f81bf7630258425cdbcd
< 2007-12-13T15:07:09.454510Z
< 39190
< nuno@ufp.pt
< has-props
<
60c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
62,64c37,39
< 2007-03-23T20:00:05.536526Z
< 27724
< bkirschn@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
72c47
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
74,76c49,51
< 2007-07-10T19:35:33.617967Z
< 32229
< bkirschn@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
84c59
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
86,88c61,63
< 2007-06-18T13:07:21.878270Z
< 31607
< bkirschn@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
96,101c71,75
< 2008-05-12T17:00:31.000000Z
< 2a948ac33953ebae0ec7832bfcbf5fd0
< 2007-08-14T17:26:33.269765Z
< 33981
< bahollad@indiana.edu
< has-props
---
> 2008-03-01T15:05:21.000000Z
> 2eed16d2d8b7fd9a96b448e678259eb2
> 2008-01-18T23:58:09.044958Z
> 676
> script
109c83
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
111,114c85,87
< 2007-03-19T01:49:36.838455Z
< 22868
< chmaurer@iupui.edu
< has-props
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
122c95
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
124,126c97,99
< 2007-03-27T18:16:54.600889Z
< 27867
< bkirschn@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/bundle/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/props and ../trunk/chat/chat-impl/impl/src/bundle/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/text-base and ../trunk/chat/chat-impl/impl/src/bundle/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/tmp and ../trunk/chat/chat-impl/impl/src/bundle/.svn/tmp
Only in trunk/chat-impl/impl/src/bundle/.svn/prop-base: chat-sql.properties.svn-base
Only in trunk/chat-impl/impl/src/bundle/.svn/prop-base: chat.properties.svn-base
Only in trunk/chat-impl/impl/src/bundle/.svn/prop-base: chat_pt_PT.properties.svn-base
diff -r trunk/chat-impl/impl/src/bundle/.svn/text-base/chat-sql.properties.svn-base ../trunk/chat/chat-impl/impl/src/bundle/.svn/text-base/chat-sql.properties.svn-base
3,5c3
< insert.channel=insert into CHAT2_CHANNEL (CHANNEL_ID, CONTEXT, CREATION_DATE, title, description, filterType, filterParam, placementDefaultChannel, ENABLE_USER_OVERRIDE, migratedChannelId) \
< select ?, ?, ?, ?, ?, ?, ?, ?, ?, ? from dual where not exists \
< (select * from CHAT2_CHANNEL c2 where c2.migratedChannelId=?)
---
> insert.channel=insert into CHAT2_CHANNEL (CHANNEL_ID, CONTEXT, CREATION_DATE, title, description, filterType, filterParam, placementDefaultChannel, ENABLE_USER_OVERRIDE, migratedChannelId) select ?, ?, ?, ?, ?, ?, ?, ?, ?, ? from dual where not exists (select * from CHAT2_CHANNEL c2 where c2.migratedChanneId=?)
9,11c7
< insert.message=insert into CHAT2_MESSAGE (MESSAGE_ID, CHANNEL_ID, OWNER, MESSAGE_DATE, BODY, migratedMessageId) \
< select ?, ?, ?, ?, ?, ? from dual where not exists \
< (select * from CHAT2_MESSAGE m2 where m2.migratedMessageId=?)
---
> insert.message=insert into CHAT2_MESSAGE (MESSAGE_ID, CHANNEL_ID, OWNER, MESSAGE_DATE, BODY, migratedMessageId) select ?, ?, ?, ?, ?, ? from dual where not exists (select * from CHAT2_MESSAGE m2 where m2.migratedMessageId=?)
Only in trunk/chat-impl/impl/src/bundle/.svn/text-base: chat_pt_BR.properties.svn-base
Only in trunk/chat-impl/impl/src/bundle/.svn/text-base: chat_pt_PT.properties.svn-base
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/bundle/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/bundle/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/bundle/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/bundle/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/.svn and ../trunk/chat/chat-impl/impl/src/java/.svn
Common subdirectories: trunk/chat-impl/impl/src/java/org and ../trunk/chat/chat-impl/impl/src/java/org
diff -r trunk/chat-impl/impl/src/java/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/.svn/all-wcprops
3,4c3,4
< V 54
< /svn/!svn/ver/41784/chat/trunk/chat-impl/impl/src/java
---
> V 69
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java
diff -r trunk/chat-impl/impl/src/java/.svn/entries ../trunk/chat/chat-impl/impl/src/java/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-02T00:44:03.027046Z
< 41784
< csev@umich.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/props and ../trunk/chat/chat-impl/impl/src/java/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn and ../trunk/chat/chat-impl/impl/src/java/org/.svn
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject
diff -r trunk/chat-impl/impl/src/java/org/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/.svn/all-wcprops
3,4c3,4
< V 58
< /svn/!svn/ver/41784/chat/trunk/chat-impl/impl/src/java/org
---
> V 73
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java/org
diff -r trunk/chat-impl/impl/src/java/org/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-02T00:44:03.027046Z
< 41784
< csev@umich.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2 and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/all-wcprops
3,4c3,4
< V 71
< /svn/!svn/ver/41784/chat/trunk/chat-impl/impl/src/java/org/sakaiproject
---
> V 86
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-02T00:44:03.027046Z
< 41784
< csev@umich.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/all-wcprops
3,4c3,4
< V 76
< /svn/!svn/ver/41784/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat
---
> V 91
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-02T00:44:03.027046Z
< 41784
< csev@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/BaseChatService.java ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/BaseChatService.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/BaseChatService.java $
< * $Id: BaseChatService.java 41493 2008-02-21 16:22:19Z lance@indiana.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/BaseChatService.java $
> * $Id: BaseChatService.java 626 2008-01-11 18:18:08Z jayshao $
42d41
< import org.sakaiproject.chat2.model.ChatManager;
878c877
< M_log.warn("Exception archiving channel with id: " + channelId, e);
---
> M_log.warn("Exception archiving channel with id: " + channelId);
881,882d879
< if(channel == null)
< throw new IllegalStateException("ChatChannel channel == null!");
1237,1241d1233
<
< public void transferCopyEntities(String fromContext, String toContext, List ids, boolean cleanup)
< {
< //TODO
< }
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/DbChatService.java ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/DbChatService.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/DbChatService.java $
< * $Id: DbChatService.java 41784 2008-03-02 00:44:03Z csev@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/DbChatService.java $
> * $Id: DbChatService.java 255 2007-07-13 18:46:44Z jayshao $
40,41d39
< import org.sakaiproject.javax.Filter;
< import org.sakaiproject.javax.PagingPosition;
303,317d300
< public int getCount(MessageChannel channel)
< {
< return super.getCount(channel);
< }
<
< public int getCount(MessageChannel channel, Filter filter)
< {
< return super.getCount(channel, filter);
< }
<
< public List getMessages(MessageChannel channel, Filter filter, boolean asc, PagingPosition pager)
< {
< return super.getAllResources(channel, filter, null, asc, pager);
< }
<
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/all-wcprops
3,4c3,4
< V 81
< /svn/!svn/ver/41784/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl
---
> V 96
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl
9,10c9,10
< V 100
< /svn/!svn/ver/41784/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/DbChatService.java
---
> V 115
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/DbChatService.java
15,16c15,16
< V 102
< /svn/!svn/ver/41493/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/BaseChatService.java
---
> V 117
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/BaseChatService.java
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-02T00:44:03.027046Z
< 41784
< csev@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35,39c35,39
< 2008-05-12T17:00:31.000000Z
< 3a95f7512e086a6dbbb0b191de1e6087
< 2008-03-02T00:44:03.027046Z
< 41784
< csev@umich.edu
---
> 2008-03-01T15:05:20.000000Z
> cf7d6778b3ec505d3715cc2ff410aadc
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
48,52c48,52
< 2008-05-12T17:00:31.000000Z
< feca769464311f328624fd1f98f7df7e
< 2008-02-21T16:22:19.246226Z
< 41493
< lance@indiana.edu
---
> 2008-03-01T15:05:20.000000Z
> 48fe65b916a895673f04daebc6d12e9a
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/text-base/BaseChatService.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/text-base/BaseChatService.java.svn-base
42d41
< import org.sakaiproject.chat2.model.ChatManager;
878c877
< M_log.warn("Exception archiving channel with id: " + channelId, e);
---
> M_log.warn("Exception archiving channel with id: " + channelId);
881,882d879
< if(channel == null)
< throw new IllegalStateException("ChatChannel channel == null!");
1237,1241d1233
<
< public void transferCopyEntities(String fromContext, String toContext, List ids, boolean cleanup)
< {
< //TODO
< }
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/text-base/DbChatService.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/text-base/DbChatService.java.svn-base
40,41d39
< import org.sakaiproject.javax.Filter;
< import org.sakaiproject.javax.PagingPosition;
303,317d300
< public int getCount(MessageChannel channel)
< {
< return super.getCount(channel);
< }
<
< public int getCount(MessageChannel channel, Filter filter)
< {
< return super.getCount(channel, filter);
< }
<
< public List getMessages(MessageChannel channel, Filter filter, boolean asc, PagingPosition pager)
< {
< return super.getAllResources(channel, filter, null, asc, pager);
< }
<
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat/impl/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/all-wcprops
3,4c3,4
< V 77
< /svn/!svn/ver/39222/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2
---
> V 92
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-12-13T19:57:03.283905Z
< 39222
< tnguyen@iupui.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/all-wcprops
3,4c3,4
< V 83
< /svn/!svn/ver/39222/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model
---
> V 98
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-12-13T19:57:03.283905Z
< 39222
< tnguyen@iupui.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatContentProducer.java ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatContentProducer.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatContentProducer.java $
< * $Id: ChatContentProducer.java 33713 2007-08-09 11:38:05Z ian@caret.cam.ac.uk $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatContentProducer.java $
> * $Id: ChatContentProducer.java 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatDataMigration.java ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatDataMigration.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatDataMigration.java $
< * $Id: ChatDataMigration.java 36606 2007-10-09 13:35:28Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatDataMigration.java $
> * $Id: ChatDataMigration.java 677 2008-01-19 18:52:21Z script $
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java $
< * $Id: ChatEntityProducer.java 39222 2007-12-13 19:57:03Z tnguyen@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java $
> * $Id: ChatEntityProducer.java 626 2008-01-11 18:18:08Z jayshao $
779,804d778
<
< public void transferCopyEntities(String fromContext, String toContext, List ids, boolean cleanup)
< {
< try
< {
< if(cleanup == true)
< {
< // retrieve all of the chat rooms
< List channels = getChatManager().getContextChannels(toContext, true);
<
< if (channels != null && !channels.isEmpty())
< {
< Iterator channelIterator = channels.iterator();
<
< while (channelIterator.hasNext())
< {
< ChatChannel oldChannel = (ChatChannel)channelIterator.next();
<
< try
< {
< getChatManager().deleteChannel(oldChannel);
< }
< catch (Exception e)
< {
< logger.debug("Exception while removing chat channel: " + e);
< }
806,817d779
< }
< }
< }
< transferCopyEntities(fromContext, toContext, ids);
< }
<
< catch (Exception e)
< {
< logger.debug("Chat transferCopyEntities(): exception in handling " + e);
< }
< }
<
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java $
> * $Id: ChatManagerImpl.java 887 2008-04-23 03:42:07Z hedrick $
586a587,588
> System.out.println("after add roomObservers " + roomObservers);
>
608d609
<
609a611
> System.out.println("after remove roomObservers " + roomObservers);
624,627c626,630
< if (TransactionSynchronizationManager.isSynchronizationActive()) {
< TransactionSynchronizationManager.registerSynchronization(txSync);
< }
< else {
---
> // if (TransactionSynchronizationManager.isSynchronizationActive()) {
> // TransactionSynchronizationManager.registerSynchronization(txSync);
> // }
> // else {
> getHibernateTemplate().flush();
629c632
< }
---
> // }
795c798
< List observers = (List)roomListeners.get(ref.getContainer());
---
> ArrayList observers = (ArrayList)roomListeners.get(ref.getContainer());
796a800,804
> // originally we did the iteration inside synchronized.
> // however that turns out to hold the lock too long
> // a shallow copy of an arraylist shouldn't be bad.
> // we currently call removeRoom from receivedMessage in
> // some cases, so it can't be locked or we will deadlock
799,803c807,812
< for(Iterator i = observers.iterator(); i.hasNext(); ) {
< RoomObserver observer = (RoomObserver)i.next();
<
< observer.receivedMessage(ref.getContainer(), ref.getId());
< }
---
> observers = (ArrayList)observers.clone();
> }
> for(Iterator i = observers.iterator(); i.hasNext(); ) {
> RoomObserver observer = (RoomObserver)i.next();
>
> observer.receivedMessage(ref.getContainer(), ref.getId());
811c820
< List observers = (List)roomListeners.get(ref.getId());
---
> ArrayList observers = (ArrayList)roomListeners.get(ref.getId());
815,820c824,830
< for(Iterator i = observers.iterator(); i.hasNext(); ) {
< RoomObserver observer = (RoomObserver)i.next();
<
< observer.roomDeleted(ref.getId());
< }
< }
---
> observers = (ArrayList)observers.clone();
> }
> for(Iterator i = observers.iterator(); i.hasNext(); ) {
> RoomObserver observer = (RoomObserver)i.next();
>
> observer.roomDeleted(ref.getId());
> }
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/all-wcprops
3,4c3,4
< V 88
< /svn/!svn/ver/39222/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl
---
> V 103
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl
9,10c9,10
< V 112
< /svn/!svn/ver/39222/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java
---
> V 127
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatEntityProducer.java
15,16c15,16
< V 111
< /svn/!svn/ver/36606/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatDataMigration.java
---
> V 126
> /repos/sakai2.3/!svn/ver/677/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatDataMigration.java
21,22c21,22
< V 109
< /svn/!svn/ver/36606/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java
---
> V 124
> /repos/sakai2.3/!svn/ver/887/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatManagerImpl.java
27,28c27,28
< V 113
< /svn/!svn/ver/33713/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatContentProducer.java
---
> V 128
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/ChatContentProducer.java
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/entries ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-12-13T19:57:03.283905Z
< 39222
< tnguyen@iupui.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35,39c35,39
< 2008-05-12T17:00:31.000000Z
< ccaea239527896640731a30950bfce95
< 2007-12-13T19:57:03.283905Z
< 39222
< tnguyen@iupui.edu
---
> 2008-03-01T15:05:21.000000Z
> 27970441fc611a3ecd5b5dd8e58d35ff
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
48c48
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
50,52c50,52
< 2007-10-09T13:35:28.684143Z
< 36606
< chmaurer@iupui.edu
---
> 2008-01-19T18:52:21.486348Z
> 677
> script
56a57
> 887
60,65c61,66
<
< 2008-05-12T17:00:31.000000Z
< 989c7be6a77da0e3ec48ced02a1ff7e6
< 2007-10-09T13:35:28.684143Z
< 36606
< chmaurer@iupui.edu
---
> 2008-04-23T04:41:26.000000Z
> c63a3026e2229b341ad380c9b380b7ce
> 2008-04-23T03:42:07.610995Z
> 887
> hedrick
> has-props
73c74
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:21.000000Z
75,77c76,78
< 2007-08-09T11:38:05.087481Z
< 33713
< ian@caret.cam.ac.uk
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base/ChatContentProducer.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base/ChatContentProducer.java.svn-base
1,4d0
< K 13
< svn:eol-style
< V 6
< native
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base/ChatDataMigration.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base/ChatDataMigration.java.svn-base
1,4d0
< K 13
< svn:eol-style
< V 6
< native
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base/ChatEntityProducer.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base/ChatEntityProducer.java.svn-base
1,4d0
< K 13
< svn:eol-style
< V 6
< native
Only in ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/prop-base: ChatManagerImpl.java.svn-base
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base/ChatEntityProducer.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base/ChatEntityProducer.java.svn-base
779,804d778
<
< public void transferCopyEntities(String fromContext, String toContext, List ids, boolean cleanup)
< {
< try
< {
< if(cleanup == true)
< {
< // retrieve all of the chat rooms
< List channels = getChatManager().getContextChannels(toContext, true);
<
< if (channels != null && !channels.isEmpty())
< {
< Iterator channelIterator = channels.iterator();
<
< while (channelIterator.hasNext())
< {
< ChatChannel oldChannel = (ChatChannel)channelIterator.next();
<
< try
< {
< getChatManager().deleteChannel(oldChannel);
< }
< catch (Exception e)
< {
< logger.debug("Exception while removing chat channel: " + e);
< }
806,817d779
< }
< }
< }
< transferCopyEntities(fromContext, toContext, ids);
< }
<
< catch (Exception e)
< {
< logger.debug("Chat transferCopyEntities(): exception in handling " + e);
< }
< }
<
diff -r trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base/ChatManagerImpl.java.svn-base ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/text-base/ChatManagerImpl.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL$
> * $Id$
586a587,588
> System.out.println("after add roomObservers " + roomObservers);
>
608d609
<
609a611
> System.out.println("after remove roomObservers " + roomObservers);
624,627c626,630
< if (TransactionSynchronizationManager.isSynchronizationActive()) {
< TransactionSynchronizationManager.registerSynchronization(txSync);
< }
< else {
---
> // if (TransactionSynchronizationManager.isSynchronizationActive()) {
> // TransactionSynchronizationManager.registerSynchronization(txSync);
> // }
> // else {
> getHibernateTemplate().flush();
629c632
< }
---
> // }
795c798
< List observers = (List)roomListeners.get(ref.getContainer());
---
> ArrayList observers = (ArrayList)roomListeners.get(ref.getContainer());
796a800,804
> // originally we did the iteration inside synchronized.
> // however that turns out to hold the lock too long
> // a shallow copy of an arraylist shouldn't be bad.
> // we currently call removeRoom from receivedMessage in
> // some cases, so it can't be locked or we will deadlock
799,803c807,812
< for(Iterator i = observers.iterator(); i.hasNext(); ) {
< RoomObserver observer = (RoomObserver)i.next();
<
< observer.receivedMessage(ref.getContainer(), ref.getId());
< }
---
> observers = (ArrayList)observers.clone();
> }
> for(Iterator i = observers.iterator(); i.hasNext(); ) {
> RoomObserver observer = (RoomObserver)i.next();
>
> observer.receivedMessage(ref.getContainer(), ref.getId());
811c820
< List observers = (List)roomListeners.get(ref.getId());
---
> ArrayList observers = (ArrayList)roomListeners.get(ref.getId());
815,820c824,830
< for(Iterator i = observers.iterator(); i.hasNext(); ) {
< RoomObserver observer = (RoomObserver)i.next();
<
< observer.roomDeleted(ref.getId());
< }
< }
---
> observers = (ArrayList)observers.clone();
> }
> for(Iterator i = observers.iterator(); i.hasNext(); ) {
> RoomObserver observer = (RoomObserver)i.next();
>
> observer.roomDeleted(ref.getId());
> }
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/java/org/sakaiproject/chat2/model/impl/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn and ../trunk/chat/chat-impl/impl/src/sql/.svn
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb and ../trunk/chat/chat-impl/impl/src/sql/hsqldb
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql and ../trunk/chat/chat-impl/impl/src/sql/mysql
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle and ../trunk/chat/chat-impl/impl/src/sql/oracle
diff -r trunk/chat-impl/impl/src/sql/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/sql/.svn/all-wcprops
3,4c3,4
< V 52
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql
---
> V 68
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql
diff -r trunk/chat-impl/impl/src/sql/.svn/entries ../trunk/chat/chat-impl/impl/src/sql/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/sql
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/sql
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/sql/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/props and ../trunk/chat/chat-impl/impl/src/sql/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/text-base and ../trunk/chat/chat-impl/impl/src/sql/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/tmp and ../trunk/chat/chat-impl/impl/src/sql/.svn/tmp
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/sql/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/sql/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/sql/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/sql/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn
diff -r trunk/chat-impl/impl/src/sql/hsqldb/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/all-wcprops
3,4c3,4
< V 59
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql/hsqldb
---
> V 75
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql/hsqldb
9,10c9,10
< V 74
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql/hsqldb/sakai_chat.sql
---
> V 90
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql/hsqldb/sakai_chat.sql
diff -r trunk/chat-impl/impl/src/sql/hsqldb/.svn/entries ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/sql/hsqldb
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/sql/hsqldb
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/props and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/text-base and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/tmp and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/tmp
diff -r trunk/chat-impl/impl/src/sql/hsqldb/.svn/prop-base/sakai_chat.sql.svn-base ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/prop-base/sakai_chat.sql.svn-base
4a5,8
> K 12
> svn:keywords
> V 31
> Date Revision Author HeadURL Id
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/sql/hsqldb/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/sql/hsqldb/.svn/tmp/text-base
Only in ../trunk/chat/chat-impl/impl/src/sql/mysql: #sakai_chat.sql#
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn
diff -r trunk/chat-impl/impl/src/sql/mysql/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/all-wcprops
3,4c3,4
< V 58
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql/mysql
---
> V 74
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql/mysql
9,10c9,10
< V 73
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql/mysql/sakai_chat.sql
---
> V 89
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql/mysql/sakai_chat.sql
diff -r trunk/chat-impl/impl/src/sql/mysql/.svn/entries ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/sql/mysql
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/sql/mysql
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/props and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/text-base and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/tmp and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/tmp
diff -r trunk/chat-impl/impl/src/sql/mysql/.svn/prop-base/sakai_chat.sql.svn-base ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/prop-base/sakai_chat.sql.svn-base
4a5,8
> K 12
> svn:keywords
> V 31
> Date Revision Author HeadURL Id
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/sql/mysql/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/sql/mysql/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn
diff -r trunk/chat-impl/impl/src/sql/oracle/.svn/all-wcprops ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/all-wcprops
3,4c3,4
< V 59
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql/oracle
---
> V 75
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql/oracle
9,10c9,10
< V 74
< /svn/!svn/ver/8206/chat/trunk/chat-impl/impl/src/sql/oracle/sakai_chat.sql
---
> V 90
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-impl/impl/src/sql/oracle/sakai_chat.sql
diff -r trunk/chat-impl/impl/src/sql/oracle/.svn/entries ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/impl/src/sql/oracle
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/impl/src/sql/oracle
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/prop-base and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/props and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/props
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/text-base and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/text-base
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/tmp and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/tmp
diff -r trunk/chat-impl/impl/src/sql/oracle/.svn/prop-base/sakai_chat.sql.svn-base ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/prop-base/sakai_chat.sql.svn-base
4a5,8
> K 12
> svn:keywords
> V 31
> Date Revision Author HeadURL Id
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/tmp/prop-base and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/tmp/props and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/tmp/props
Common subdirectories: trunk/chat-impl/impl/src/sql/oracle/.svn/tmp/text-base and ../trunk/chat/chat-impl/impl/src/sql/oracle/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/pack/.svn and ../trunk/chat/chat-impl/pack/.svn
Only in ../trunk/chat/chat-impl/pack: m2-target
diff -r trunk/chat-impl/pack/pom.xml ../trunk/chat/chat-impl/pack/pom.xml
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-impl/pack/src and ../trunk/chat/chat-impl/pack/src
diff -r trunk/chat-impl/pack/.svn/all-wcprops ../trunk/chat/chat-impl/pack/.svn/all-wcprops
3,4c3,4
< V 45
< /svn/!svn/ver/42151/chat/trunk/chat-impl/pack
---
> V 60
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/pack
9,10c9,10
< V 53
< /svn/!svn/ver/38274/chat/trunk/chat-impl/pack/pom.xml
---
> V 68
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/pack/pom.xml
diff -r trunk/chat-impl/pack/.svn/dir-prop-base ../trunk/chat/chat-impl/pack/.svn/dir-prop-base
3,4c3
< V 19
< m2-target
---
> V 31
5a5,7
> m2-target
> bin
> .settings
7,8d8
<
<
diff -r trunk/chat-impl/pack/.svn/entries ../trunk/chat/chat-impl/pack/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/pack
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/pack
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
38,43c38,42
< 2008-05-12T17:00:31.000000Z
< 60d74aeab9ff6595188574a8a8e53a77
< 2007-11-18T20:39:38.930812Z
< 38274
< ian@caret.cam.ac.uk
< has-props
---
> 2008-03-01T15:05:21.000000Z
> c3612f2f4eb931bcc39834f00145c700
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-impl/pack/.svn/prop-base and ../trunk/chat/chat-impl/pack/.svn/prop-base
Common subdirectories: trunk/chat-impl/pack/.svn/props and ../trunk/chat/chat-impl/pack/.svn/props
Common subdirectories: trunk/chat-impl/pack/.svn/text-base and ../trunk/chat/chat-impl/pack/.svn/text-base
Common subdirectories: trunk/chat-impl/pack/.svn/tmp and ../trunk/chat/chat-impl/pack/.svn/tmp
Only in trunk/chat-impl/pack/.svn/prop-base: pom.xml.svn-base
diff -r trunk/chat-impl/pack/.svn/text-base/pom.xml.svn-base ../trunk/chat/chat-impl/pack/.svn/text-base/pom.xml.svn-base
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-impl/pack/.svn/tmp/prop-base and ../trunk/chat/chat-impl/pack/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/pack/.svn/tmp/props and ../trunk/chat/chat-impl/pack/.svn/tmp/props
Common subdirectories: trunk/chat-impl/pack/.svn/tmp/text-base and ../trunk/chat/chat-impl/pack/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/pack/src/.svn and ../trunk/chat/chat-impl/pack/src/.svn
Common subdirectories: trunk/chat-impl/pack/src/webapp and ../trunk/chat/chat-impl/pack/src/webapp
diff -r trunk/chat-impl/pack/src/.svn/all-wcprops ../trunk/chat/chat-impl/pack/src/.svn/all-wcprops
3,4c3,4
< V 49
< /svn/!svn/ver/42151/chat/trunk/chat-impl/pack/src
---
> V 64
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/pack/src
diff -r trunk/chat-impl/pack/src/.svn/entries ../trunk/chat/chat-impl/pack/src/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/pack/src
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/pack/src
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/pack/src/.svn/prop-base and ../trunk/chat/chat-impl/pack/src/.svn/prop-base
Common subdirectories: trunk/chat-impl/pack/src/.svn/props and ../trunk/chat/chat-impl/pack/src/.svn/props
Common subdirectories: trunk/chat-impl/pack/src/.svn/text-base and ../trunk/chat/chat-impl/pack/src/.svn/text-base
Common subdirectories: trunk/chat-impl/pack/src/.svn/tmp and ../trunk/chat/chat-impl/pack/src/.svn/tmp
Common subdirectories: trunk/chat-impl/pack/src/.svn/tmp/prop-base and ../trunk/chat/chat-impl/pack/src/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/pack/src/.svn/tmp/props and ../trunk/chat/chat-impl/pack/src/.svn/tmp/props
Common subdirectories: trunk/chat-impl/pack/src/.svn/tmp/text-base and ../trunk/chat/chat-impl/pack/src/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn and ../trunk/chat/chat-impl/pack/src/webapp/.svn
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF
diff -r trunk/chat-impl/pack/src/webapp/.svn/all-wcprops ../trunk/chat/chat-impl/pack/src/webapp/.svn/all-wcprops
3,4c3,4
< V 56
< /svn/!svn/ver/42151/chat/trunk/chat-impl/pack/src/webapp
---
> V 71
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/pack/src/webapp
diff -r trunk/chat-impl/pack/src/webapp/.svn/entries ../trunk/chat/chat-impl/pack/src/webapp/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/pack/src/webapp
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/pack/src/webapp
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/prop-base and ../trunk/chat/chat-impl/pack/src/webapp/.svn/prop-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/props and ../trunk/chat/chat-impl/pack/src/webapp/.svn/props
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/text-base and ../trunk/chat/chat-impl/pack/src/webapp/.svn/text-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/tmp and ../trunk/chat/chat-impl/pack/src/webapp/.svn/tmp
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/tmp/prop-base and ../trunk/chat/chat-impl/pack/src/webapp/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/tmp/props and ../trunk/chat/chat-impl/pack/src/webapp/.svn/tmp/props
Common subdirectories: trunk/chat-impl/pack/src/webapp/.svn/tmp/text-base and ../trunk/chat/chat-impl/pack/src/webapp/.svn/tmp/text-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn
diff -r trunk/chat-impl/pack/src/webapp/WEB-INF/components.xml ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/components.xml
56c56
< 3
< 10
diff -r trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/all-wcprops ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/all-wcprops
3,4c3,4
< V 64
< /svn/!svn/ver/42151/chat/trunk/chat-impl/pack/src/webapp/WEB-INF
---
> V 79
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/pack/src/webapp/WEB-INF
9,10c9,10
< V 79
< /svn/!svn/ver/42151/chat/trunk/chat-impl/pack/src/webapp/WEB-INF/components.xml
---
> V 94
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-impl/pack/src/webapp/WEB-INF/components.xml
diff -r trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/entries ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-impl/pack/src/webapp/WEB-INF
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-impl/pack/src/webapp/WEB-INF
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35,39c35,39
< 2008-05-12T17:00:31.000000Z
< 28ab05f518db3091b6200ad5c0bd90c8
< 2008-03-11T20:29:48.533478Z
< 42151
< wang58@iupui.edu
---
> 2008-03-01T15:05:21.000000Z
> ef22a9bf7285caba8cfb80202335f12a
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/prop-base and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/prop-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/props and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/props
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/text-base and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/text-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp
diff -r trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/text-base/components.xml.svn-base ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/text-base/components.xml.svn-base
56c56
< 3
< 10
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp/prop-base and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp/prop-base
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp/props and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp/props
Common subdirectories: trunk/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp/text-base and ../trunk/chat/chat-impl/pack/src/webapp/WEB-INF/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/.svn and ../trunk/chat/chat-tool/.svn
Common subdirectories: trunk/chat-tool/tool and ../trunk/chat/chat-tool/tool
diff -r trunk/chat-tool/.svn/all-wcprops ../trunk/chat/chat-tool/.svn/all-wcprops
3,4c3,4
< V 40
< /svn/!svn/ver/45880/chat/trunk/chat-tool
---
> V 55
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool
9,10c9,10
< V 51
< /svn/!svn/ver/32813/chat/trunk/chat-tool/.classpath
---
> V 66
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/.classpath
15,16c15,16
< V 48
< /svn/!svn/ver/8206/chat/trunk/chat-tool/.project
---
> V 64
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/.project
diff -r trunk/chat-tool/.svn/dir-prop-base ../trunk/chat/chat-tool/.svn/dir-prop-base
3c3,4
< V 4
---
> V 11
> target
diff -r trunk/chat-tool/.svn/entries ../trunk/chat/chat-tool/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-28T15:01:20.074733Z
< 45880
< hu2@iupui.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2007-07-19T10:30:31.413571Z
< 32813
< ian@caret.cam.ac.uk
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
48c48
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
50,52c50,52
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
Common subdirectories: trunk/chat-tool/.svn/prop-base and ../trunk/chat/chat-tool/.svn/prop-base
Common subdirectories: trunk/chat-tool/.svn/props and ../trunk/chat/chat-tool/.svn/props
Common subdirectories: trunk/chat-tool/.svn/text-base and ../trunk/chat/chat-tool/.svn/text-base
Common subdirectories: trunk/chat-tool/.svn/tmp and ../trunk/chat/chat-tool/.svn/tmp
Common subdirectories: trunk/chat-tool/.svn/tmp/prop-base and ../trunk/chat/chat-tool/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/.svn/tmp/props and ../trunk/chat/chat-tool/.svn/tmp/props
Common subdirectories: trunk/chat-tool/.svn/tmp/text-base and ../trunk/chat/chat-tool/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/.svn and ../trunk/chat/chat-tool/tool/.svn
Only in ../trunk/chat/chat-tool/tool: m2-target
diff -r trunk/chat-tool/tool/pom.xml ../trunk/chat/chat-tool/tool/pom.xml
7c7
< SNAPSHOT
---
> M2
Only in ../trunk/chat/chat-tool/tool: pom.xml-1.2
Common subdirectories: trunk/chat-tool/tool/src and ../trunk/chat/chat-tool/tool/src
Only in ../trunk/chat/chat-tool/tool: velocity.log
diff -r trunk/chat-tool/tool/.svn/all-wcprops ../trunk/chat/chat-tool/tool/.svn/all-wcprops
3,4c3,4
< V 45
< /svn/!svn/ver/45880/chat/trunk/chat-tool/tool
---
> V 60
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool/tool
9,10c9,10
< V 53
< /svn/!svn/ver/38274/chat/trunk/chat-tool/tool/pom.xml
---
> V 68
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/pom.xml
diff -r trunk/chat-tool/tool/.svn/dir-prop-base ../trunk/chat/chat-tool/tool/.svn/dir-prop-base
3,4c3
< V 19
< m2-target
---
> V 31
5a5,7
> m2-target
> bin
> .settings
7,8d8
<
<
diff -r trunk/chat-tool/tool/.svn/entries ../trunk/chat/chat-tool/tool/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-28T15:01:20.074733Z
< 45880
< hu2@iupui.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
38,43c38,42
< 2008-05-12T17:00:31.000000Z
< e0fcc8e0858228fbee083fdc375148bf
< 2007-11-18T20:39:38.930812Z
< 38274
< ian@caret.cam.ac.uk
< has-props
---
> 2008-04-10T22:24:27.000000Z
> 067e6da9b485a520c7117cfe1f584816
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-tool/tool/.svn/prop-base and ../trunk/chat/chat-tool/tool/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/.svn/props and ../trunk/chat/chat-tool/tool/.svn/props
Common subdirectories: trunk/chat-tool/tool/.svn/text-base and ../trunk/chat/chat-tool/tool/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/.svn/tmp and ../trunk/chat/chat-tool/tool/.svn/tmp
Only in trunk/chat-tool/tool/.svn/prop-base: pom.xml.svn-base
diff -r trunk/chat-tool/tool/.svn/text-base/pom.xml.svn-base ../trunk/chat/chat-tool/tool/.svn/text-base/pom.xml.svn-base
7c7
< SNAPSHOT
---
> M2
Common subdirectories: trunk/chat-tool/tool/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/.svn/tmp/props and ../trunk/chat/chat-tool/tool/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/.svn and ../trunk/chat/chat-tool/tool/src/.svn
Common subdirectories: trunk/chat-tool/tool/src/bundle and ../trunk/chat/chat-tool/tool/src/bundle
Common subdirectories: trunk/chat-tool/tool/src/java and ../trunk/chat/chat-tool/tool/src/java
Common subdirectories: trunk/chat-tool/tool/src/webapp and ../trunk/chat/chat-tool/tool/src/webapp
diff -r trunk/chat-tool/tool/src/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/.svn/all-wcprops
3,4c3,4
< V 49
< /svn/!svn/ver/45880/chat/trunk/chat-tool/tool/src
---
> V 64
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool/tool/src
diff -r trunk/chat-tool/tool/src/.svn/entries ../trunk/chat/chat-tool/tool/src/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-28T15:01:20.074733Z
< 45880
< hu2@iupui.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-tool/tool/src/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/.svn/props and ../trunk/chat/chat-tool/tool/src/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/.svn/text-base and ../trunk/chat/chat-tool/tool/src/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/.svn/tmp and ../trunk/chat/chat-tool/tool/src/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn and ../trunk/chat/chat-tool/tool/src/bundle/.svn
diff -r trunk/chat-tool/tool/src/bundle/chat.properties ../trunk/chat/chat-tool/tool/src/bundle/chat.properties
17c17
< shownone =Show no message history
---
> shownone = Show no Message History
50,51d49
< control.lab=Enter chat message
< combox.viewfrom= View messages from...
109c107
< past_x_messages=Last {0} messages
---
> past_x_messages=Past {0} messages
181c179
< channel_enable_override_description=Allow chat participants to change the chat display settings for their own chat window
---
> channel_enable_override_description=Allow site participants to change the chat display settings for their own chat window
Only in trunk/chat-tool/tool/src/bundle: chat_pt_BR.properties
Only in trunk/chat-tool/tool/src/bundle: chat_pt_PT.properties
Only in trunk/chat-tool/tool/src/bundle: chat_ru.properties
diff -r trunk/chat-tool/tool/src/bundle/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/bundle/.svn/all-wcprops
3,4c3,4
< V 56
< /svn/!svn/ver/45880/chat/trunk/chat-tool/tool/src/bundle
---
> V 71
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle
9,10c9,10
< V 74
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_es.metaprops
---
> V 89
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_es.metaprops
12,23d11
< chat_ru.properties
< K 25
< svn:wc:ra_dav:version-url
< V 75
< /svn/!svn/ver/40184/chat/trunk/chat-tool/tool/src/bundle/chat_ru.properties
< END
< chat_pt_PT.properties
< K 25
< svn:wc:ra_dav:version-url
< V 78
< /svn/!svn/ver/39190/chat/trunk/chat-tool/tool/src/bundle/chat_pt_PT.properties
< END
27,28c15,16
< V 74
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_ko.metaprops
---
> V 89
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ko.metaprops
33,34c21,22
< V 74
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_nl.metaprops
---
> V 89
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_nl.metaprops
39,40c27,28
< V 75
< /svn/!svn/ver/22456/chat/trunk/chat-tool/tool/src/bundle/chat_sv.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_sv.properties
45,46c33,34
< V 77
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_fr_CA.metaprops
---
> V 92
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_fr_CA.metaprops
51,52c39,40
< V 75
< /svn/!svn/ver/30317/chat/trunk/chat-tool/tool/src/bundle/chat_ja.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ja.properties
57,58c45,46
< V 71
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat.metaprops
---
> V 86
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat.metaprops
60c48
< chat_zh_CN.properties
---
> chat_ca.metaprops
63,64c51,52
< V 78
< /svn/!svn/ver/36014/chat/trunk/chat-tool/tool/src/bundle/chat_zh_CN.properties
---
> V 89
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ca.metaprops
66c54
< chat_ca.metaprops
---
> chat_zh_CN.properties
69,70c57,58
< V 74
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_ca.metaprops
---
> V 93
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_zh_CN.properties
75,76c63,64
< V 75
< /svn/!svn/ver/27903/chat/trunk/chat-tool/tool/src/bundle/chat_ar.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ar.properties
78,83d65
< chat_pt_BR.properties
< K 25
< svn:wc:ra_dav:version-url
< V 78
< /svn/!svn/ver/42321/chat/trunk/chat-tool/tool/src/bundle/chat_pt_BR.properties
< END
87,88c69,70
< V 75
< /svn/!svn/ver/29995/chat/trunk/chat-tool/tool/src/bundle/chat_es.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_es.properties
93,94c75,76
< V 74
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_ja.metaprops
---
> V 89
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ja.metaprops
99,100c81,82
< V 75
< /svn/!svn/ver/37717/chat/trunk/chat-tool/tool/src/bundle/chat_nl.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_nl.properties
105,106c87,88
< V 75
< /svn/!svn/ver/10808/chat/trunk/chat-tool/tool/src/bundle/chat_ko.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ko.properties
111,112c93,94
< V 78
< /svn/!svn/ver/31607/chat/trunk/chat-tool/tool/src/bundle/chat_fr_CA.properties
---
> V 93
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_fr_CA.properties
117,118c99,100
< V 77
< /svn/!svn/ver/11717/chat/trunk/chat-tool/tool/src/bundle/chat_zh_CN.metaprops
---
> V 92
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_zh_CN.metaprops
123,124c105,106
< V 72
< /svn/!svn/ver/45880/chat/trunk/chat-tool/tool/src/bundle/chat.properties
---
> V 87
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/bundle/chat.properties
129,130c111,112
< V 75
< /svn/!svn/ver/27867/chat/trunk/chat-tool/tool/src/bundle/chat_ca.properties
---
> V 90
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/bundle/chat_ca.properties
diff -r trunk/chat-tool/tool/src/bundle/.svn/entries ../trunk/chat/chat-tool/tool/src/bundle/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/bundle
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/bundle
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-28T15:01:20.074733Z
< 45880
< hu2@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
41c41
< chat_ru.properties
---
> chat_nl.metaprops
47,51c47,51
< 2008-05-12T17:00:31.000000Z
< 29c3989d030f61e4a60e63f30f5b7761
< 2008-01-17T15:31:30.021179Z
< 40184
< bkirschn@umich.edu
---
> 2008-03-01T15:05:20.000000Z
> d4c8e076cb4bfa7a39c4f15700c32f9f
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
53,65d52
< chat_pt_PT.properties
< file
<
<
<
<
< 2008-05-12T17:00:31.000000Z
< 4d0204eebc83ae18f56b399830ff3390
< 2007-12-13T15:07:09.454510Z
< 39190
< nuno@ufp.pt
< has-props
<
72c59
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
74,76c61,63
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
78c65
< chat_nl.metaprops
---
> chat_fr_CA.metaprops
84,88c71,75
< 2008-05-12T17:00:31.000000Z
< d4c8e076cb4bfa7a39c4f15700c32f9f
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2008-03-01T15:05:20.000000Z
> ed60197f4545a2acf13c1c77db55c032
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
96c83
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
98,100c85,87
< 2007-03-12T19:31:03.726799Z
< 22456
< bkirschn@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
103,114d89
< chat_fr_CA.metaprops
< file
<
<
<
<
< 2008-05-12T17:00:31.000000Z
< ed60197f4545a2acf13c1c77db55c032
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
<
121c96
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
123,125c98,100
< 2007-05-10T16:18:48.097246Z
< 30317
< bkirschn@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
134c109
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
136,138c111,113
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
146c121
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
148,150c123,125
< 2007-10-01T19:21:43.612037Z
< 36014
< bkirschn@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
159c134
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
161,163c136,138
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
171c146
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
173,175c148,150
< 2007-03-27T21:08:32.632383Z
< 27903
< bkirschn@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
178,189d152
< chat_pt_BR.properties
< file
<
<
<
<
< 2008-05-12T17:00:31.000000Z
< 263415f73f3c6e5905ba205de29bd0b4
< 2008-03-14T21:02:40.830448Z
< 42321
< bkirschn@umich.edu
<
196c159
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
198,200c161,163
< 2007-05-03T15:02:01.398668Z
< 29995
< bkirschn@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
209c172
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
211,213c174,176
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
215c178
< chat_nl.properties
---
> chat_ko.properties
221,225c184,188
< 2008-05-12T17:00:31.000000Z
< c80e102519186836d8d592fb954ca4d7
< 2007-11-02T19:03:53.507151Z
< 37717
< bkirschn@umich.edu
---
> 2008-03-01T15:05:20.000000Z
> 1b6a02d78bc010844598423051caed5b
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
228c191
< chat_ko.properties
---
> chat_nl.properties
234,238c197,201
< 2008-05-12T17:00:31.000000Z
< 1b6a02d78bc010844598423051caed5b
< 2006-06-16T20:26:08.734150Z
< 10808
< lance@indiana.edu
---
> 2008-03-01T15:05:20.000000Z
> c80e102519186836d8d592fb954ca4d7
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
247c210
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
249,251c212,214
< 2007-06-18T13:07:21.878270Z
< 31607
< bkirschn@umich.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
260c223
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
262,264c225,227
< 2006-07-07T21:21:53.718849Z
< 11717
< bkirschn@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
272,276c235,239
< 2008-05-12T17:00:31.000000Z
< b81cac37e4ca57d655cc879f79a5e738
< 2008-04-28T15:01:20.074733Z
< 45880
< hu2@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 89aeddd9b30c796362325e066afc4f25
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
285c248
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
287,289c250,252
< 2007-03-27T18:16:54.600889Z
< 27867
< bkirschn@umich.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/bundle/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/props and ../trunk/chat/chat-tool/tool/src/bundle/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/text-base and ../trunk/chat/chat-tool/tool/src/bundle/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/tmp and ../trunk/chat/chat-tool/tool/src/bundle/.svn/tmp
Only in trunk/chat-tool/tool/src/bundle/.svn/prop-base: chat_pt_PT.properties.svn-base
diff -r trunk/chat-tool/tool/src/bundle/.svn/text-base/chat.properties.svn-base ../trunk/chat/chat-tool/tool/src/bundle/.svn/text-base/chat.properties.svn-base
17c17
< shownone =Show no message history
---
> shownone = Show no Message History
50,51d49
< control.lab=Enter chat message
< combox.viewfrom= View messages from...
109c107
< past_x_messages=Last {0} messages
---
> past_x_messages=Past {0} messages
181c179
< channel_enable_override_description=Allow chat participants to change the chat display settings for their own chat window
---
> channel_enable_override_description=Allow site participants to change the chat display settings for their own chat window
Only in trunk/chat-tool/tool/src/bundle/.svn/text-base: chat_pt_BR.properties.svn-base
Only in trunk/chat-tool/tool/src/bundle/.svn/text-base: chat_pt_PT.properties.svn-base
Only in trunk/chat-tool/tool/src/bundle/.svn/text-base: chat_ru.properties.svn-base
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/bundle/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/bundle/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/bundle/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/bundle/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/.svn and ../trunk/chat/chat-tool/tool/src/java/.svn
Common subdirectories: trunk/chat-tool/tool/src/java/org and ../trunk/chat/chat-tool/tool/src/java/org
diff -r trunk/chat-tool/tool/src/java/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/.svn/all-wcprops
3,4c3,4
< V 54
< /svn/!svn/ver/45756/chat/trunk/chat-tool/tool/src/java
---
> V 69
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool/tool/src/java
diff -r trunk/chat-tool/tool/src/java/.svn/entries ../trunk/chat/chat-tool/tool/src/java/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-24T19:48:23.631385Z
< 45756
< lance@indiana.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/props and ../trunk/chat/chat-tool/tool/src/java/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn and ../trunk/chat/chat-tool/tool/src/java/org/.svn
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject
diff -r trunk/chat-tool/tool/src/java/org/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/org/.svn/all-wcprops
3,4c3,4
< V 58
< /svn/!svn/ver/45756/chat/trunk/chat-tool/tool/src/java/org
---
> V 73
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool/tool/src/java/org
diff -r trunk/chat-tool/tool/src/java/org/.svn/entries ../trunk/chat/chat-tool/tool/src/java/org/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-24T19:48:23.631385Z
< 45756
< lance@indiana.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/props and ../trunk/chat/chat-tool/tool/src/java/org/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/org/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/org/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/org/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/org/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2 and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/all-wcprops
3,4c3,4
< V 71
< /svn/!svn/ver/45756/chat/trunk/chat-tool/tool/src/java/org/sakaiproject
---
> V 86
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/entries ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-24T19:48:23.631385Z
< 45756
< lance@indiana.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/all-wcprops
3,4c3,4
< V 76
< /svn/!svn/ver/34900/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat
---
> V 91
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/entries ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-09-10T22:39:59.851218Z
< 34900
< lance@indiana.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/.svn/tmp/text-base
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool: #ChatAction.java#
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatAction.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatAction.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatAction.java $
< * $Id: ChatAction.java 34900 2007-09-10 22:39:59Z lance@indiana.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatAction.java $
> * $Id: ChatAction.java 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java $
< * $Id: ChatDelivery.java 14062 2006-08-27 03:44:18Z csev@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java $
> * $Id: ChatDelivery.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatObservingCourier.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatObservingCourier.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatObservingCourier.java $
< * $Id: ChatObservingCourier.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatObservingCourier.java $
> * $Id: ChatObservingCourier.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java $
< * $Id: ColorMapper.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java $
> * $Id: ColorMapper.java 255 2007-07-13 18:46:44Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/all-wcprops
3,4c3,4
< V 81
< /svn/!svn/ver/34900/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool
---
> V 96
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool
9,10c9,10
< V 99
< /svn/!svn/ver/14062/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java
---
> V 114
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java
15,16c15,16
< V 97
< /svn/!svn/ver/8206/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java
---
> V 113
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java
21,22c21,22
< V 106
< /svn/!svn/ver/8206/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatObservingCourier.java
---
> V 122
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatObservingCourier.java
27,28c27,28
< V 97
< /svn/!svn/ver/34900/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatAction.java
---
> V 112
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatAction.java
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/entries ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-09-10T22:39:59.851218Z
< 34900
< lance@indiana.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2006-08-27T03:44:18.801990Z
< 14062
< csev@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
48c48
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
50,52c50,52
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
61c61
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-25T00:47:47.000000Z
63,65c63,65
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
74c74
< 2008-05-12T17:00:30.000000Z
---
> 2008-03-01T15:05:20.000000Z
76,78c76,78
< 2007-09-10T22:39:59.851218Z
< 34900
< lance@indiana.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat/tool/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2: svn-commit.2.tmp
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2: svn-commit.2.tmp~
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2: svn-commit.3.tmp~
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2: svn-commit.tmp
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2: svn-commit.tmp~
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/all-wcprops
3,4c3,4
< V 77
< /svn/!svn/ver/45756/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2
---
> V 92
> /repos/sakai2.3/!svn/ver/800/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/entries ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-24T19:48:23.631385Z
< 45756
< lance@indiana.edu
---
> 2008-04-09T19:27:33.481210Z
> 800
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/.svn/tmp/text-base
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: #PresenceObserverHelper.java#
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: .#ChatTool.java
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/AlertDelivery.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/AlertDelivery.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java $
< * $Id: ChatDelivery.java 14062 2006-08-27 03:44:18Z csev@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/AlertDelivery.java $
> * $Id: AlertDelivery.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatDelivery.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatDelivery.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java $
< * $Id: ChatDelivery.java 14062 2006-08-27 03:44:18Z csev@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatDelivery.java $
> * $Id: ChatDelivery.java 891 2008-04-24 17:57:01Z hedrick $
27a28
> import org.sakaiproject.chat2.tool.ChatTool;
98a100,102
> // assume the message is being delivered, so clear timeout
> ChatTool.setTimeout(getAddress(),null);
>
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatNavigationHandler.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatNavigationHandler.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatNavigationHandler.java $
< * $Id: ChatNavigationHandler.java 34737 2007-09-06 13:57:37Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatNavigationHandler.java $
> * $Id: ChatNavigationHandler.java 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java $
> * $Id: ChatTool.java 891 2008-04-24 17:57:01Z hedrick $
223c223
<
---
> private static Map timeouts = new HashMap();
344,349c344,350
< if (getCurrentChannel() == null) {
< ChatChannel defaultChannel = getChatManager().getDefaultChannel(
< getToolManager().getCurrentPlacement().getContext(),
< getToolManager().getCurrentPlacement().getId());
< setCurrentChannel(new DecoratedChatChannel(this, defaultChannel));
< }
---
> // not sure what this would accomplish
> //if (getCurrentChannel() == null) {
> // ChatChannel defaultChannel = getChatManager().getDefaultChannel(
> // getToolManager().getCurrentPlacement().getContext(),
> // getToolManager().getCurrentPlacement().getId());
> // setCurrentChannel(new DecoratedChatChannel(this, defaultChannel));
> // }
365a367,376
> static void setTimeout(String address, Long timeout)
> {
> synchronized(timeouts) {
> if (timeout != null)
> timeouts.put(address, timeout);
> else
> timeouts.remove(address);
> }
> }
>
373c384,397
< m_courierService.deliver(new ChatDelivery(sessionId+roomId, "Monitor", message, placementId, false, getChatManager()));
---
> String address = sessionId + roomId;
> Long timeout = timeouts.get(address);
> if (SessionManager.getSession(sessionId) == null ||
> (timeout != null &&
> (timeout + (60*1000)) < System.currentTimeMillis())) {
> System.out.println("received msg expired session " + sessionId + " " + currentChannel);
> resetCurrentChannel(currentChannel, true);
> m_courierService.clear(address);
> setTimeout(address, null);
> } else {
> m_courierService.deliver(new ChatDelivery(address, "Monitor", message, placementId, false, getChatManager()));
> if (timeout == null)
> setTimeout(address, System.currentTimeMillis());
> }
383a408,409
> m_courierService.clear(sessionId+roomId);
> setTimeout(sessionId+roomId, null);
416c442
< System.out.println("user left expired session " + sessionId + " " + currentChannel);
---
> // System.out.println("user left expired session " + sessionId + " " + currentChannel);
417a444,445
> m_courierService.clear(sessionId+location);
> setTimeout(sessionId+location, null);
502,503c530
< if (currentChannelEdit.getChatChannel().getFilterType().equals(ChatChannel.FILTER_ALL) ||
< currentChannelEdit.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER) ||
---
> if (currentChannelEdit.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER) ||
506,507c533,534
< currentChannelEdit.setFilterParamLast(currentChannelEdit.getChatChannel().getNumberParam());
< currentChannelEdit.setFilterParamPast(currentChannelEdit.getChatChannel().getTimeParam());
---
> currentChannelEdit.setFilterParamLast(currentChannelEdit.getChatChannel().getFilterParam());
> currentChannelEdit.setFilterParamPast(currentChannelEdit.getChatChannel().getFilterParam());
594,603d620
< String filter = getCurrentChannel().getChatChannel().getFilterType();
< if(filter.equals(ChatChannel.FILTER_ALL)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_ALL_MESSAGES));
< }else if(filter.equals(ChatChannel.FILTER_BY_NUMBER)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_NUMBER));
< }else if(filter.equals(ChatChannel.FILTER_BY_TIME)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_DATE));
< }else if(filter.equals(ChatChannel.FILTER_NONE)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_NO_MESSAGES));
< }
658,660c675,681
< chatChannel.setFilterParamNone(0);
< chatChannel.setFilterParamLast(chatChannel.getChatChannel().getNumberParam());
< chatChannel.setFilterParamPast(chatChannel.getChatChannel().getTimeParam());
---
> if (chatChannel.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER) ||
> chatChannel.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_TIME) ||
> chatChannel.getChatChannel().getFilterType().equals(ChatChannel.FILTER_NONE)) {
> chatChannel.setFilterParamLast(chatChannel.getChatChannel().getFilterParam());
> chatChannel.setFilterParamPast(chatChannel.getChatChannel().getFilterParam());
> chatChannel.setFilterParamNone(0);
> }
674c695
< boolean directEdit = getCurrentChannelEdit().isDirectEdit();
---
> boolean directEdit = getCurrentChannelEdit().isDirectEdit();
676,679d696
< //set default number and time values based on the decordatedChannel class
< channel.setNumberParam(getCurrentChannelEdit().getFilterParamLast());
< channel.setTimeParam(getCurrentChannelEdit().getFilterParamPast());
<
932c949
< if(presenceChannelObserver != null)
---
> if(presenceChannelObserver != null){
933a951,953
> m_courierService.clear(sessionId+currentChannel.getChatChannel().getId());
> setTimeout(sessionId+currentChannel, null);
> }
997a1018
> currentChannel = null;
1161c1182
<
---
>
1221,1223c1242,1243
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_ALL)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_ALL_MESSAGES);
---
> return getCanRenderMessageOptions() ||
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_ALL);
1227,1229c1247,1248
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_TIME)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_MESSAGES_BY_DATE);
---
> return !getCanRenderMessageOptions() &&
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_TIME);
1233,1235c1252,1253
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_MESSAGES_BY_NUMBER);
---
> return !getCanRenderMessageOptions() &&
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER);
1239,1241c1257,1258
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_NONE)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_NO_MESSAGES);
---
> return !getCanRenderMessageOptions() &&
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_NONE);
1245,1273c1262,1267
< List messageOptions = new ArrayList();
< int numberParam = getCurrentChannel().getChatChannel().getNumberParam();
< int timeParam = getCurrentChannel().getChatChannel().getTimeParam();
<
< if(getCanRenderMessageOptions()){
<
< SelectItem item1 = new SelectItem(Integer.toString(MESSAGEOPTIONS_ALL_MESSAGES), getMessageFromBundle("allMessages"));
< SelectItem item2 = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_NUMBER), getCustomOptionText(ChatChannel.FILTER_BY_NUMBER, numberParam));
< SelectItem item3 = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_DATE), getCustomOptionText(ChatChannel.FILTER_BY_TIME, timeParam));
< SelectItem item4 = new SelectItem(Integer.toString(MESSAGEOPTIONS_NO_MESSAGES), getCustomOptionText(ChatChannel.FILTER_NONE, 0));
<
< messageOptions.add(item1);
< messageOptions.add(item2);
< messageOptions.add(item3);
< messageOptions.add(item4);
< }else{
< String filter = getCurrentChannel().getChatChannel().getFilterType();
< SelectItem item = null;
< if(filter.equals(ChatChannel.FILTER_ALL)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_ALL_MESSAGES), getMessageFromBundle("allMessages"));
< }else if(filter.equals(ChatChannel.FILTER_BY_NUMBER)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_NUMBER), getCustomOptionText(ChatChannel.FILTER_BY_NUMBER, numberParam));
< }else if(filter.equals(ChatChannel.FILTER_BY_TIME)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_DATE), getCustomOptionText(ChatChannel.FILTER_BY_TIME, timeParam));
< }else if(filter.equals(ChatChannel.FILTER_NONE)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_NO_MESSAGES), getCustomOptionText(ChatChannel.FILTER_NONE, 0));
< }
< messageOptions.add(item);
< }
---
> List messageOptions = new ArrayList();
> String filterType = getCurrentChannel().getChatChannel().getFilterType();
> int filterParam = getCurrentChannel().getChatChannel().getFilterParam();
> SelectItem item = new SelectItem(getCustomOptionValue(filterType), getCustomOptionText(filterType, filterParam));
> messageOptions.add(item);
>
1332c1326
<
---
> int x = getCurrentChannel().getChatChannel().getFilterParam();
1334d1327
< int x = getCurrentChannel().getChatChannel().getTimeParam();
1339d1331
< int x = getCurrentChannel().getChatChannel().getNumberParam();
1452,1455d1443
< protected String getAllMessagesText() {
< return getMessageFromBundle("allMessages");
< }
<
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: ChatTool.java.exp~
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: ChatTool.java.hold
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: ChatTool.java.new
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: ChatTool.java.new~
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ColorMapper.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ColorMapper.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java $
< * $Id: ColorMapper.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ColorMapper.java $
> * $Id: ColorMapper.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java $
> * $Id: DecoratedChatChannel.java 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatMessage.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatMessage.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatMessage.java $
> * $Id: DecoratedChatMessage.java 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedSynopticOptions.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedSynopticOptions.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedSynopticOptions.java $
< * $Id: DecoratedSynopticOptions.java 22615 2007-03-14 19:53:58Z chmaurer@iupui.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedSynopticOptions.java $
> * $Id: DecoratedSynopticOptions.java 615 2008-01-08 14:53:08Z jayshao $
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/PresenceObserverHelper.java ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/PresenceObserverHelper.java
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/presence/trunk/presence-util/util/src/java/org/sakaiproject/util/PresenceObservingCourier.java $
< * $Id: PresenceObservingCourier.java 8204 2006-04-24 19:35:57Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/PresenceObserverHelper.java $
> * $Id: PresenceObserverHelper.java 789 2008-03-25 18:01:24Z hedrick $
98a99,108
> /**
> * This method is called to find out if there are other users in this location.
> * @return count
> * The number of sessions present in this location.
> */
> public int getPresentSessionsCount()
> {
> return PresenceService.getPresentSessionsCount(location);
> }
>
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool: diff
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/all-wcprops
3,4c3,4
< V 82
< /svn/!svn/ver/45756/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool
---
> V 97
> /repos/sakai2.3/!svn/ver/891/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool
9,10c9,10
< V 108
< /svn/!svn/ver/34216/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatMessage.java
---
> V 123
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatMessage.java
15,16c15,16
< V 112
< /svn/!svn/ver/22615/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedSynopticOptions.java
---
> V 127
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedSynopticOptions.java
21,22c21,22
< V 100
< /svn/!svn/ver/34758/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatDelivery.java
---
> V 115
> /repos/sakai2.3/!svn/ver/891/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatDelivery.java
27,28c27,28
< V 99
< /svn/!svn/ver/21895/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ColorMapper.java
---
> V 114
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ColorMapper.java
33,34c33,34
< V 108
< /svn/!svn/ver/32896/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java
---
> V 123
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/DecoratedChatChannel.java
39,40c39,40
< V 101
< /svn/!svn/ver/21895/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/AlertDelivery.java
---
> V 116
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/AlertDelivery.java
45,46c45,46
< V 110
< /svn/!svn/ver/21895/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/PresenceObserverHelper.java
---
> V 125
> /repos/sakai2.3/!svn/ver/789/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/PresenceObserverHelper.java
51,52c51,52
< V 109
< /svn/!svn/ver/34737/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatNavigationHandler.java
---
> V 124
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatNavigationHandler.java
57,58c57,58
< V 96
< /svn/!svn/ver/45756/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java
---
> V 111
> /repos/sakai2.3/!svn/ver/891/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/ChatTool.java
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/entries ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool
< https://source.sakaiproject.org/svn
---
> 897
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-24T19:48:23.631385Z
< 45756
< lance@indiana.edu
---
> 2008-04-24T17:57:01.378439Z
> 891
> hedrick
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35,39c35,40
< 2008-05-12T17:00:31.000000Z
< 4133f27d053e61a5ac3950e3c25b9164
< 2007-08-21T18:35:03.752631Z
< 34216
< bahollad@indiana.edu
---
> 2008-03-01T15:05:20.000000Z
> f5cfb54d72e238fde9f0582e5da1d2bb
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
> has-props
47c48
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
49,51c50,52
< 2007-03-14T19:53:58.631374Z
< 22615
< chmaurer@iupui.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
60,64c61,66
< 2008-05-12T17:00:31.000000Z
< 7c1489cff1a3df67c4ac8df19f09985e
< 2007-09-07T02:56:56.797483Z
< 34758
< lance@indiana.edu
---
> 2008-04-24T18:56:19.000000Z
> df2b30a6a814b00c68cb97ad6f8e77d5
> 2008-04-24T17:57:01.378439Z
> 891
> hedrick
> has-props
72,76c74,79
< 2008-05-12T17:00:31.000000Z
< aa0c97fec892b5a6dde1cfbd3cef24d6
< 2007-02-23T23:30:38.541391Z
< 21895
< andersjb@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 7b0e103a727f17cb6c9ef9e7d5a56549
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
> has-props
84,88c87,92
< 2008-05-12T17:00:31.000000Z
< e8e30f759e53f3a179b61b1e5f428fe6
< 2007-07-19T18:06:54.705208Z
< 32896
< chmaurer@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 464ed7324f315ed144ded62b32f03eca
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
> has-props
96,100c100,105
< 2008-05-12T17:00:31.000000Z
< e44c6f2d6862664576455f6fc0cb2f2c
< 2007-02-23T23:30:38.541391Z
< 21895
< andersjb@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> abaa4c056cac3c14380ab3e9c7817041
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
> has-props
108,112c113,118
< 2008-05-12T17:00:31.000000Z
< 535568265df51bc9c3e24c059ad7ff5a
< 2007-02-23T23:30:38.541391Z
< 21895
< andersjb@iupui.edu
---
> 2008-04-19T19:19:01.000000Z
> b609a54ac77321befe408dbfc1d8d4ce
> 2008-03-25T18:01:24.124370Z
> 789
> hedrick
> has-props
120c126
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
122,124c128,130
< 2007-09-06T13:57:37.580089Z
< 34737
< chmaurer@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
133,137c139,144
< 2008-05-12T17:00:31.000000Z
< 7d33c3cf198fef722145fbe2280bd7b7
< 2008-04-24T19:48:23.631385Z
< 45756
< lance@indiana.edu
---
> 2008-05-09T18:50:08.000000Z
> 2b76ea8cf45257c292f6320c849b43d4
> 2008-04-24T17:57:01.378439Z
> 891
> hedrick
> has-props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: AlertDelivery.java.svn-base
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: ChatDelivery.java.svn-base
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base/ChatNavigationHandler.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base/ChatNavigationHandler.java.svn-base
1,4d0
< K 13
< svn:eol-style
< V 6
< native
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: ChatTool.java.svn-base
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: ColorMapper.java.svn-base
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: DecoratedChatChannel.java.svn-base
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: DecoratedChatMessage.java.svn-base
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base/DecoratedSynopticOptions.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base/DecoratedSynopticOptions.java.svn-base
1,4d0
< K 13
< svn:eol-style
< V 6
< native
Only in ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/prop-base: PresenceObserverHelper.java.svn-base
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/AlertDelivery.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/AlertDelivery.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java $
< * $Id: ChatDelivery.java 14062 2006-08-27 03:44:18Z csev@umich.edu $
---
> * $URL$
> * $Id$
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/ChatDelivery.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/ChatDelivery.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ChatDelivery.java $
< * $Id: ChatDelivery.java 14062 2006-08-27 03:44:18Z csev@umich.edu $
---
> * $URL$
> * $Id$
27a28
> import org.sakaiproject.chat2.tool.ChatTool;
98a100,102
> // assume the message is being delivered, so clear timeout
> ChatTool.setTimeout(getAddress(),null);
>
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/ChatTool.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/ChatTool.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL$
> * $Id$
223c223
<
---
> private static Map timeouts = new HashMap();
344,349c344,350
< if (getCurrentChannel() == null) {
< ChatChannel defaultChannel = getChatManager().getDefaultChannel(
< getToolManager().getCurrentPlacement().getContext(),
< getToolManager().getCurrentPlacement().getId());
< setCurrentChannel(new DecoratedChatChannel(this, defaultChannel));
< }
---
> // not sure what this would accomplish
> //if (getCurrentChannel() == null) {
> // ChatChannel defaultChannel = getChatManager().getDefaultChannel(
> // getToolManager().getCurrentPlacement().getContext(),
> // getToolManager().getCurrentPlacement().getId());
> // setCurrentChannel(new DecoratedChatChannel(this, defaultChannel));
> // }
365a367,376
> static void setTimeout(String address, Long timeout)
> {
> synchronized(timeouts) {
> if (timeout != null)
> timeouts.put(address, timeout);
> else
> timeouts.remove(address);
> }
> }
>
373c384,397
< m_courierService.deliver(new ChatDelivery(sessionId+roomId, "Monitor", message, placementId, false, getChatManager()));
---
> String address = sessionId + roomId;
> Long timeout = timeouts.get(address);
> if (SessionManager.getSession(sessionId) == null ||
> (timeout != null &&
> (timeout + (60*1000)) < System.currentTimeMillis())) {
> System.out.println("received msg expired session " + sessionId + " " + currentChannel);
> resetCurrentChannel(currentChannel, true);
> m_courierService.clear(address);
> setTimeout(address, null);
> } else {
> m_courierService.deliver(new ChatDelivery(address, "Monitor", message, placementId, false, getChatManager()));
> if (timeout == null)
> setTimeout(address, System.currentTimeMillis());
> }
383a408,409
> m_courierService.clear(sessionId+roomId);
> setTimeout(sessionId+roomId, null);
416c442
< System.out.println("user left expired session " + sessionId + " " + currentChannel);
---
> // System.out.println("user left expired session " + sessionId + " " + currentChannel);
417a444,445
> m_courierService.clear(sessionId+location);
> setTimeout(sessionId+location, null);
502,503c530
< if (currentChannelEdit.getChatChannel().getFilterType().equals(ChatChannel.FILTER_ALL) ||
< currentChannelEdit.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER) ||
---
> if (currentChannelEdit.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER) ||
506,507c533,534
< currentChannelEdit.setFilterParamLast(currentChannelEdit.getChatChannel().getNumberParam());
< currentChannelEdit.setFilterParamPast(currentChannelEdit.getChatChannel().getTimeParam());
---
> currentChannelEdit.setFilterParamLast(currentChannelEdit.getChatChannel().getFilterParam());
> currentChannelEdit.setFilterParamPast(currentChannelEdit.getChatChannel().getFilterParam());
594,603d620
< String filter = getCurrentChannel().getChatChannel().getFilterType();
< if(filter.equals(ChatChannel.FILTER_ALL)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_ALL_MESSAGES));
< }else if(filter.equals(ChatChannel.FILTER_BY_NUMBER)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_NUMBER));
< }else if(filter.equals(ChatChannel.FILTER_BY_TIME)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_DATE));
< }else if(filter.equals(ChatChannel.FILTER_NONE)){
< setMessageOptions(Integer.toString(MESSAGEOPTIONS_NO_MESSAGES));
< }
658,660c675,681
< chatChannel.setFilterParamNone(0);
< chatChannel.setFilterParamLast(chatChannel.getChatChannel().getNumberParam());
< chatChannel.setFilterParamPast(chatChannel.getChatChannel().getTimeParam());
---
> if (chatChannel.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER) ||
> chatChannel.getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_TIME) ||
> chatChannel.getChatChannel().getFilterType().equals(ChatChannel.FILTER_NONE)) {
> chatChannel.setFilterParamLast(chatChannel.getChatChannel().getFilterParam());
> chatChannel.setFilterParamPast(chatChannel.getChatChannel().getFilterParam());
> chatChannel.setFilterParamNone(0);
> }
674c695
< boolean directEdit = getCurrentChannelEdit().isDirectEdit();
---
> boolean directEdit = getCurrentChannelEdit().isDirectEdit();
676,679d696
< //set default number and time values based on the decordatedChannel class
< channel.setNumberParam(getCurrentChannelEdit().getFilterParamLast());
< channel.setTimeParam(getCurrentChannelEdit().getFilterParamPast());
<
932c949
< if(presenceChannelObserver != null)
---
> if(presenceChannelObserver != null){
933a951,953
> m_courierService.clear(sessionId+currentChannel.getChatChannel().getId());
> setTimeout(sessionId+currentChannel, null);
> }
997a1018
> currentChannel = null;
1161c1182
<
---
>
1221,1223c1242,1243
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_ALL)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_ALL_MESSAGES);
---
> return getCanRenderMessageOptions() ||
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_ALL);
1227,1229c1247,1248
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_TIME)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_MESSAGES_BY_DATE);
---
> return !getCanRenderMessageOptions() &&
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_TIME);
1233,1235c1252,1253
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_MESSAGES_BY_NUMBER);
---
> return !getCanRenderMessageOptions() &&
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_BY_NUMBER);
1239,1241c1257,1258
< return (!getCanRenderMessageOptions() &&
< getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_NONE)) ||
< (getCanRenderMessageOptions() && messageOptions == MESSAGEOPTIONS_NO_MESSAGES);
---
> return !getCanRenderMessageOptions() &&
> getCurrentChannel().getChatChannel().getFilterType().equals(ChatChannel.FILTER_NONE);
1245,1273c1262,1267
< List messageOptions = new ArrayList();
< int numberParam = getCurrentChannel().getChatChannel().getNumberParam();
< int timeParam = getCurrentChannel().getChatChannel().getTimeParam();
<
< if(getCanRenderMessageOptions()){
<
< SelectItem item1 = new SelectItem(Integer.toString(MESSAGEOPTIONS_ALL_MESSAGES), getMessageFromBundle("allMessages"));
< SelectItem item2 = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_NUMBER), getCustomOptionText(ChatChannel.FILTER_BY_NUMBER, numberParam));
< SelectItem item3 = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_DATE), getCustomOptionText(ChatChannel.FILTER_BY_TIME, timeParam));
< SelectItem item4 = new SelectItem(Integer.toString(MESSAGEOPTIONS_NO_MESSAGES), getCustomOptionText(ChatChannel.FILTER_NONE, 0));
<
< messageOptions.add(item1);
< messageOptions.add(item2);
< messageOptions.add(item3);
< messageOptions.add(item4);
< }else{
< String filter = getCurrentChannel().getChatChannel().getFilterType();
< SelectItem item = null;
< if(filter.equals(ChatChannel.FILTER_ALL)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_ALL_MESSAGES), getMessageFromBundle("allMessages"));
< }else if(filter.equals(ChatChannel.FILTER_BY_NUMBER)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_NUMBER), getCustomOptionText(ChatChannel.FILTER_BY_NUMBER, numberParam));
< }else if(filter.equals(ChatChannel.FILTER_BY_TIME)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_MESSAGES_BY_DATE), getCustomOptionText(ChatChannel.FILTER_BY_TIME, timeParam));
< }else if(filter.equals(ChatChannel.FILTER_NONE)){
< item = new SelectItem(Integer.toString(MESSAGEOPTIONS_NO_MESSAGES), getCustomOptionText(ChatChannel.FILTER_NONE, 0));
< }
< messageOptions.add(item);
< }
---
> List messageOptions = new ArrayList();
> String filterType = getCurrentChannel().getChatChannel().getFilterType();
> int filterParam = getCurrentChannel().getChatChannel().getFilterParam();
> SelectItem item = new SelectItem(getCustomOptionValue(filterType), getCustomOptionText(filterType, filterParam));
> messageOptions.add(item);
>
1332c1326
<
---
> int x = getCurrentChannel().getChatChannel().getFilterParam();
1334d1327
< int x = getCurrentChannel().getChatChannel().getTimeParam();
1339d1331
< int x = getCurrentChannel().getChatChannel().getNumberParam();
1452,1455d1443
< protected String getAllMessagesText() {
< return getMessageFromBundle("allMessages");
< }
<
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/ColorMapper.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/ColorMapper.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/java/org/sakaiproject/chat/tool/ColorMapper.java $
< * $Id: ColorMapper.java 8206 2006-04-24 19:40:15Z ggolden@umich.edu $
---
> * $URL$
> * $Id$
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/DecoratedChatChannel.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/DecoratedChatChannel.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL$
> * $Id$
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/DecoratedChatMessage.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/DecoratedChatMessage.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/portal/trunk/portal-util/util/src/java/org/sakaiproject/portal/util/PortalSiteHelper.java $
< * $Id: PortalSiteHelper.java 21708 2007-02-18 21:59:28Z ian@caret.cam.ac.uk $
---
> * $URL$
> * $Id$
diff -r trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/PresenceObserverHelper.java.svn-base ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/text-base/PresenceObserverHelper.java.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/presence/trunk/presence-util/util/src/java/org/sakaiproject/util/PresenceObservingCourier.java $
< * $Id: PresenceObservingCourier.java 8204 2006-04-24 19:35:57Z ggolden@umich.edu $
---
> * $URL$
> * $Id$
98a99,108
> /**
> * This method is called to find out if there are other users in this location.
> * @return count
> * The number of sessions present in this location.
> */
> public int getPresentSessionsCount()
> {
> return PresenceService.getPresentSessionsCount(location);
> }
>
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/java/org/sakaiproject/chat2/tool/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn and ../trunk/chat/chat-tool/tool/src/webapp/.svn
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF
Common subdirectories: trunk/chat-tool/tool/src/webapp/js and ../trunk/chat/chat-tool/tool/src/webapp/js
Common subdirectories: trunk/chat-tool/tool/src/webapp/jsp and ../trunk/chat/chat-tool/tool/src/webapp/jsp
Common subdirectories: trunk/chat-tool/tool/src/webapp/tools and ../trunk/chat/chat-tool/tool/src/webapp/tools
Common subdirectories: trunk/chat-tool/tool/src/webapp/vm and ../trunk/chat/chat-tool/tool/src/webapp/vm
diff -r trunk/chat-tool/tool/src/webapp/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/webapp/.svn/all-wcprops
3,4c3,4
< V 56
< /svn/!svn/ver/45880/chat/trunk/chat-tool/tool/src/webapp
---
> V 71
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/webapp
9,10c9,10
< V 75
< /svn/!svn/ver/8206/chat/trunk/chat-tool/tool/src/webapp/velocity.properties
---
> V 91
> /repos/sakai2.3/!svn/ver/464/sakai/trunk/chat/chat-tool/tool/src/webapp/velocity.properties
diff -r trunk/chat-tool/tool/src/webapp/.svn/entries ../trunk/chat/chat-tool/tool/src/webapp/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/webapp
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/webapp
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2008-04-28T15:01:20.074733Z
< 45880
< hu2@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
44c44
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
46,48c46,48
< 2006-04-24T19:40:15.479292Z
< 8206
< ggolden@umich.edu
---
> 2007-07-13T18:46:44.997442Z
> 255
> jayshao
51c51
< js
---
> jsp
54c54
< jsp
---
> js
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/props and ../trunk/chat/chat-tool/tool/src/webapp/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/text-base and ../trunk/chat/chat-tool/tool/src/webapp/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/tmp and ../trunk/chat/chat-tool/tool/src/webapp/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/webapp/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/webapp/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd
diff -r trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/all-wcprops
3,4c3,4
< V 64
< /svn/!svn/ver/34857/chat/trunk/chat-tool/tool/src/webapp/WEB-INF
---
> V 79
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF
9,10c9,10
< V 81
< /svn/!svn/ver/34857/chat/trunk/chat-tool/tool/src/webapp/WEB-INF/faces-config.xml
---
> V 96
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF/faces-config.xml
15,16c15,16
< V 72
< /svn/!svn/ver/32650/chat/trunk/chat-tool/tool/src/webapp/WEB-INF/web.xml
---
> V 87
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF/web.xml
diff -r trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/entries ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/webapp/WEB-INF
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-09-10T18:02:37.687149Z
< 34857
< chmaurer@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,39c37,39
< 2007-09-10T18:02:37.687149Z
< 34857
< chmaurer@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
50c50
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
52,54c52,54
< 2007-07-17T15:01:24.013120Z
< 32650
< chmaurer@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/props and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/text-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn
diff -r trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/all-wcprops
3,4c3,4
< V 68
< /svn/!svn/ver/28180/chat/trunk/chat-tool/tool/src/webapp/WEB-INF/dtd
---
> V 83
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd
9,10c9,10
< V 92
< /svn/!svn/ver/28180/chat/trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/web-facesconfig_1_0.dtd
---
> V 107
> /repos/sakai2.3/!svn/ver/615/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/web-facesconfig_1_0.dtd
diff -r trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/entries ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/webapp/WEB-INF/dtd
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-03-30T12:46:04.721206Z
< 28180
< chmaurer@iupui.edu
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35c35
< 2008-05-12T17:00:31.000000Z
---
> 2008-03-01T15:05:20.000000Z
37,40c37,39
< 2007-03-30T12:46:04.721206Z
< 28180
< chmaurer@iupui.edu
< has-props
---
> 2008-01-08T14:53:08.278076Z
> 615
> jayshao
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/props and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/text-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp
Only in trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/prop-base: web-facesconfig_1_0.dtd.svn-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/webapp/WEB-INF/dtd/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn
diff -r trunk/chat-tool/tool/src/webapp/js/chatscript.js ../trunk/chat/chat-tool/tool/src/webapp/js/chatscript.js
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/presence/trunk/presence-util/util/src/java/org/sakaiproject/util/PresenceObservingCourier.java $
< * $Id: PresenceObservingCourier.java 8204 2006-04-24 19:35:57Z ggolden@umich.edu $
---
> * $URL: https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/webapp/js/chatscript.js $
> * $Id: chatscript.js 626 2008-01-11 18:18:08Z jayshao $
diff -r trunk/chat-tool/tool/src/webapp/js/.svn/all-wcprops ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/all-wcprops
3,4c3,4
< V 59
< /svn/!svn/ver/34737/chat/trunk/chat-tool/tool/src/webapp/js
---
> V 74
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/webapp/js
9,10c9,10
< V 73
< /svn/!svn/ver/34737/chat/trunk/chat-tool/tool/src/webapp/js/chatscript.js
---
> V 88
> /repos/sakai2.3/!svn/ver/626/sakai/trunk/chat/chat-tool/tool/src/webapp/js/chatscript.js
diff -r trunk/chat-tool/tool/src/webapp/js/.svn/entries ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/entries
4,6c4,6
< 46366
< https://source.sakaiproject.org/svn/chat/trunk/chat-tool/tool/src/webapp/js
< https://source.sakaiproject.org/svn
---
> 805
> https://boshi.rutgers.edu:8443/repos/sakai2.3/sakai/trunk/chat/chat-tool/tool/src/webapp/js
> https://boshi.rutgers.edu:8443/repos/sakai2.3
10,12c10,12
< 2007-09-06T13:57:37.580089Z
< 34737
< chmaurer@iupui.edu
---
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
27c27
< 66ffb92e-73f9-0310-93c1-f5514f145a0a
---
> 660572ee-8c23-0410-aa79-c0a67fdd1877
35,39c35,39
< 2008-05-12T17:00:31.000000Z
< 5b968393b09abbdadfe51c3426a4cfbc
< 2007-09-06T13:57:37.580089Z
< 34737
< chmaurer@iupui.edu
---
> 2008-03-01T15:05:20.000000Z
> 55e5bc62fa32134f36da4684ec4f76e3
> 2008-01-11T18:18:08.192619Z
> 626
> jayshao
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/props and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/text-base and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/tmp and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/tmp
diff -r trunk/chat-tool/tool/src/webapp/js/.svn/prop-base/chatscript.js.svn-base ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/prop-base/chatscript.js.svn-base
1,4c1,4
< K 13
< svn:eol-style
< V 6
< native
---
> K 12
> svn:keywords
> V 31
> Date Revision Author HeadURL Id
diff -r trunk/chat-tool/tool/src/webapp/js/.svn/text-base/chatscript.js.svn-base ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/text-base/chatscript.js.svn-base
2,3c2,3
< * $URL: https://source.sakaiproject.org/svn/presence/trunk/presence-util/util/src/java/org/sakaiproject/util/PresenceObservingCourier.java $
< * $Id: PresenceObservingCourier.java 8204 2006-04-24 19:35:57Z ggolden@umich.edu $
---
> * $URL$
> * $Id$
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/tmp/prop-base and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/tmp/prop-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/tmp/props and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/tmp/props
Common subdirectories: trunk/chat-tool/tool/src/webapp/js/.svn/tmp/text-base and ../trunk/chat/chat-tool/tool/src/webapp/js/.svn/tmp/text-base
Common subdirectories: trunk/chat-tool/tool/src/webapp/jsp/.svn and ../trunk/chat/chat-tool/tool/src/webapp/jsp/.svn
diff -r trunk/chat-tool/tool/src/webapp/jsp/room.jsp ../trunk/chat/chat-tool/tool/src/webapp/jsp/room.jsp
8,11d7
<
<
39d34
<
42,43c37,40
< onchange="this.form.submit();">
<
---
> onchange="this.form.submit();"
> rendered="#{ChatTool.canRenderMessageOptions}">
>
>
45d41
<
52c48
<
---
>
55c51
<
---
>
78d73
< class="wcwmenu"
91d85
< class="wcwmenu"
diff -r trunk/chat-tool/tool/src/webapp/jsp/roomControl.jsp ../trunk/chat/chat-tool/tool/src/webapp/jsp/roomControl.jsp
34,42d33
< function formSubmit(field)
< {
< var actionInjection = document.getElementById("actionInjection");
< actionInjection.name = field.name;
< field.form.submit();
< return false;
<
< }
<
54,55c45
<
<
---
>
60d49
< onclick="formSubmit(this)"
65d53
< onclick="formSubmit(this)"
diff -r trunk/chat-tool/tool/src/webapp/jsp/roomMonitor.jspf ../trunk/chat/chat-tool/tool/src/webapp/jsp/roomMonitor.jspf
21,22d20
<
24,25c22
<
---
>
27,32c24,25
<
<
<
---
>
>