Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/OpenNTF/collaborationtoda…
Browse files Browse the repository at this point in the history 
…y.git
  • Loading branch information
@sbasegmez
sbasegmez committed Jan 17, 2013
2 parents 6b9da39 + f46e9c0 commit c3a5c5a
Show file tree
Hide file tree
Showing 11 changed files with 106 additions and 293 deletions.
8 changes: 7 additions & 1 deletion NOTICE
View file
Expand Up @@ -83,4 +83,10 @@ Licensed under Apache 2.0
Available from https://github.com/ocpsoft/prettytime
Copyright [2011] Lincoln Baxter, III
This product includes software developed at
OCPSoft (http://ocpsoft.org/).
OCPSoft (http://ocpsoft.org/).

mypic 1.1.1
Licensed under Apache 2.0
Available from http://www.openntf.org/internal/home.nsf/project.xsp?action=openDocument&name=mypic
Copyright [2012] ZetaOne Solutions Group, LLC
mypic contains jcrop, which is available from http://deepliquid.com/content/Jcrop.html, and which is under the MIT license.
2 changes: 1 addition & 1 deletion disk-collaborationtoday/.settings/org.eclipse.core.resources.prefs
View file
@@ -1,4 +1,4 @@
#Mon Nov 26 07:09:02 EST 2012
#Wed Dec 19 09:45:05 CET 2012
encoding//Resources/StyleSheets/jquery.Jcrop.css=UTF-8
encoding//Resources/Files/TestWidget.html=UTF-8
encoding//Resources/Files/TestJSONP.html=UTF-8
Expand Down
99 changes: 49 additions & 50 deletions disk-collaborationtoday/AppProperties/database.properties
View file
@@ -1,12 +1,11 @@
<?xml version='1.0' encoding='utf-8'?>
<!DOCTYPE database SYSTEM 'xmlschemas/domino_8_5_3.dtd'>
<database xmlns='http://www.lotus.com/dxl' version='8.5' maintenanceversion='3.0'
replicaid='85257AA6004F5595' path='CN=Arcturus/O=Frost!!ct\ct-jesse-20121029.nsf'
title='Development Collaboration Today' increasemaxfields='true'>
<databaseinfo dbid='85257AA6004F5595' odsversion='51' diskspace='2883584'
percentused='95.9517045454546' numberofdocuments='0'><datamodified><datetime
dst='true'>20121029T102634,44-04</datetime></datamodified><designmodified
><datetime dst='true'>20121029T102936,12-04</datetime></designmodified></databaseinfo>
<database xmlns='http://www.lotus.com/dxl' version='9.0' replicaid='85257AD1004C558E'
path='CN=Telamon/O=Frost!!ct\ct-dev.nsf' title='Development Collaboration Today'
increasemaxfields='true'>
<databaseinfo dbid='85257AD1004C558E' odsversion='51' diskspace='9961472'
percentused='85.9606291118421' numberofdocuments='1202'><datamodified><datetime
>20121219T172603,84-05</datetime></datamodified><designmodified><datetime
>20121221T143146,99-05</datetime></designmodified></databaseinfo>
<acl adminserver='CN=nheidloff-1/O=NHeidloff' maxinternetaccess='editor'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
Expand All @@ -19,36 +18,36 @@
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role></aclentry>
<aclentry name='OtherDomainServers' type='servergroup' level='noaccess' readpublicdocs='false'
writepublicdocs='false'/>
<aclentry name='Jesse Gallagher' type='person' level='editor' deletedocs='true'
createpersonalagents='false' createpersonalviews='false' createsharedviews='false'
createlsjavaagents='false'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role>
<role>[AvatarModerator]</role></aclentry>
<aclentry name='OtherDomainServers' type='servergroup' level='noaccess' readpublicdocs='false'
writepublicdocs='false'/>
<aclentry name='Serdar Basegmez' type='person' level='editor' deletedocs='true'
createpersonalagents='false' createpersonalviews='false' createsharedviews='false'
createlsjavaagents='false'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role></aclentry>
<aclentry name='Per Henrik Lausten' type='person' level='editor' deletedocs='true'
<aclentry name='F van der Linden' type='person' level='editor' deletedocs='true'
createpersonalagents='false' createpersonalviews='false' createsharedviews='false'
createlsjavaagents='false'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role></aclentry>
<aclentry name='F van der Linden' type='person' level='editor' deletedocs='true'
<aclentry name='Per Henrik Lausten' type='person' level='editor' deletedocs='true'
createpersonalagents='false' createpersonalviews='false' createsharedviews='false'
createlsjavaagents='false'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role></aclentry>
<aclentry name='Anonymous' level='noaccess' readpublicdocs='false' writepublicdocs='false'/>
<aclentry name='CN=nheidloff-1/O=NHeidloff' type='server' level='manager'
deletedocs='true'/>
<aclentry name='Anonymous' level='noaccess' readpublicdocs='false' writepublicdocs='false'/>
<aclentry name='CN=Jesse Gallagher/O=Frost' type='person' level='manager'
deletedocs='true'>
<role>[Moderator]</role>
Expand All @@ -63,67 +62,67 @@
<role>[SpotModerator]</role>
<role>[AvatarModerator]</role></aclentry>
<aclentry name='LocalDomainServers' type='servergroup' level='manager' deletedocs='true'/>
<aclentry name='CN=Niklas Heidloff/OU=Germany/O=IBM' type='person' level='manager'
deletedocs='true'>
<aclentry name='CN=Per Henrik Lausten/O=PHL Consult' type='person' level='manager'
deletedocs='false'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role>
<role>[AvatarModerator]</role></aclentry>
<role>[SpotModerator]</role></aclentry>
<aclentry name='CN=Serdar Basegmez/O=developi' type='person' level='manager'
deletedocs='true'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role></aclentry>
<aclentry name='CN=Per Henrik Lausten/O=PHL Consult' type='person' level='manager'
deletedocs='false'>
<aclentry name='CN=Niklas Heidloff/OU=Germany/O=IBM' type='person' level='manager'
deletedocs='true'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role></aclentry>
<role>[SpotModerator]</role>
<role>[AvatarModerator]</role></aclentry>
<aclentry name='CN=Peter Tanner/OU=Boston/OU=Contr/O=IBM' type='person' level='manager'
deletedocs='false'/>
<aclentry name='CN=Bruce Elgort/O=Sharepoint' type='person' level='manager'
<aclentry name='CN=Bruce Elgort/O=NotesOSS' type='person' level='manager'
deletedocs='true'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role>
<role>[AvatarModerator]</role></aclentry>
<aclentry name='CN=Bruce Elgort/O=NotesOSS' type='person' level='manager'
<aclentry name='CN=Bruce Elgort/O=Sharepoint' type='person' level='manager'
deletedocs='true'>
<role>[Moderator]</role>
<role>[TopModerator]</role>
<role>[SpotModerator]</role>
<role>[AvatarModerator]</role></aclentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC updated nheidloff-1/NHeidloff</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Bruce Elgort/Sharepoint</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Bruce Elgort/NotesOSS</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Peter Tanner/Boston/Contr/IBM</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Niklas Heidloff/Germany/IBM</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Serdar Basegmez/developi</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Per Henrik Lausten/PHL Consult</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added LocalDomainServers</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Niklas Heidloff</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Jesse Gallagher/Frost</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added nheidloff-1/NHeidloff</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Anonymous</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Per Henrik Lausten</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added F van der Linden</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Serdar Basegmez</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added OtherDomainServers</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Jesse Gallagher</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC added Frank van der Linden/EOF/EOG</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC updated -Default-</logentry>
<logentry>10/29/2012 10:27:44 AM Jesse Gallagher/MTC updated role [AvatarModerator]</logentry></acl>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost updated nheidloff-1/NHeidloff</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Bruce Elgort/NotesOSS</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Bruce Elgort/Sharepoint</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Peter Tanner/Boston/Contr/IBM</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Per Henrik Lausten/PHL Consult</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Serdar Basegmez/developi</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Niklas Heidloff/Germany/IBM</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added LocalDomainServers</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Niklas Heidloff</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Jesse Gallagher/Frost</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Anonymous</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added nheidloff-1/NHeidloff</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added F van der Linden</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Per Henrik Lausten</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Serdar Basegmez</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Jesse Gallagher</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added OtherDomainServers</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost added Frank van der Linden/EOF/EOG</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost updated -Default-</logentry>
<logentry>12/19/2012 05:09:37 PM Jesse Gallagher/Frost updated role [AvatarModerator]</logentry></acl>

<launchsettings><weblaunch whenopened='openxpage' xpage='home.xsp'/></launchsettings>
<note default='true' class='icon'>
<noteinfo noteid='11e' unid='15B148A1FAD343B285257AA6004F55D0' sequence='8'>
<created><datetime dst='true'>20121029T102633,12-04</datetime></created>
<modified><datetime dst='true'>20121029T102757,45-04</datetime></modified>
<revised><datetime dst='true'>20121029T102757,44-04</datetime></revised>
<lastaccessed><datetime dst='true'>20121029T102757,44-04</datetime></lastaccessed>
<addedtofile><datetime dst='true'>20121029T102633,15-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=MTC</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=MTC</name></wassignedby>
<noteinfo noteid='11e' unid='360496243607DDC485257AD1004C55A1' sequence='16'>
<created><datetime>20121211T085346,57-05</datetime></created>
<modified><datetime>20121219T170938,00-05</datetime></modified>
<revised><datetime>20121219T170937,99-05</datetime></revised>
<lastaccessed><datetime>20121219T170937,99-05</datetime></lastaccessed>
<addedtofile><datetime>20121211T085346,57-05</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name='IconBitmap' summary='true'>
<rawitemdata type='6'>
AiAgAQAA///////wD///gAH//gAAf/wAAD/4AAAf8AAAD+AAAAfgAAAHwAAAA8AAAAPAAAADgAAA
Expand Down
5 changes: 4 additions & 1 deletion disk-collaborationtoday/Code/Java/com/ZetaOne/mypic/Api.java
View file
Expand Up @@ -465,6 +465,9 @@ public String retrieveImage() {

// Don't assume that xspupload is in the data directory
String xspupload = ExtLibUtil.getStringProperty(ExtLibUtil.getXspContext(), "xsp.persistence.dir.xspupload");
if(xspupload == null) {
xspupload = ".";
}

File outputfile = new File(xspupload + File.separator + fileName);
ImageIO.write(dst, "png", outputfile);
Expand All @@ -491,7 +494,7 @@ public String retrieveImage() {
rtItem.embedObject(
EmbeddedObject.EMBED_ATTACHMENT,
"",
xspupload + File.separator + fileName,
outputfile.getAbsolutePath(),
""
);
rtItem.compact();
Expand Down
18 changes: 9 additions & 9 deletions disk-collaborationtoday/Code/Java/com/ZetaOne/mypic/Api.java.metadata
View file
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
<noteinfo noteid="4d2" sequence="1" unid="F351973A81CB665F85257AB6007CE1C2">
<created><datetime>20121114T174402,58-05</datetime></created>
<modified><datetime>20121114T174402,80-05</datetime></modified>
<revised><datetime>20121114T174402,78-05</datetime></revised>
<lastaccessed><datetime>20121114T174402,78-05</datetime></lastaccessed>
<addedtofile><datetime>20121114T174402,78-05</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name><name>CN=Jesse Gallagher/O=MTC</name><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=MTC</name></wassignedby>
<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257AD1004C558E" version="9.0" xmlns="http://www.lotus.com/dxl">
<noteinfo noteid="39a" sequence="12" unid="2EB34D92F17F222C85257AD1004C5CF1">
<created><datetime>20121211T085405,29-05</datetime></created>
<modified><datetime>20121219T172242,56-05</datetime></modified>
<revised><datetime>20121219T172242,54-05</datetime></revised>
<lastaccessed><datetime>20121219T172242,54-05</datetime></lastaccessed>
<addedtofile><datetime>20121211T085405,30-05</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>34567Cg~[</text></item>
<item name="$TITLE"><text>com/ZetaOne/mypic/Api.java</text></item>

Expand Down
21 changes: 8 additions & 13 deletions disk-collaborationtoday/CustomControls/header.xsp.metadata
View file
@@ -1,22 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
<noteinfo noteid="45e" sequence="19" unid="EB29E1F5968A4DDD85257AA6006AAD22">
<created><datetime dst="true">20121029T152511,38-04</datetime></created>
<modified><datetime dst="true">20121029T154403,22-04</datetime></modified>
<revised><datetime dst="true">20121029T154403,21-04</datetime></revised>
<lastaccessed><datetime dst="true">20121029T154403,21-04</datetime></lastaccessed>
<addedtofile><datetime dst="true">20121029T152511,50-04</datetime></addedtofile></noteinfo>
<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="85257AD1004C558E" version="9.0" xmlns="http://www.lotus.com/dxl">
<noteinfo noteid="2fa" sequence="46" unid="022CD416600EDB6385257AD1004C5B77">
<created><datetime>20121211T085401,51-05</datetime></created>
<modified><datetime>20130107T164223,00-05</datetime></modified>
<revised><datetime>20130107T164222,99-05</datetime></revised>
<lastaccessed><datetime>20130107T164222,99-05</datetime></lastaccessed>
<addedtofile><datetime>20121211T085401,52-05</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=Frost</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=Frost</name></wassignedby>
<item name="$Flags"><text>gC~4;</text></item>


<item name="$TITLE" sign="true"><text>header.xsp</text></item>


<item name="$FileNames" sign="true"><text>header.xsp</text></item>
<item name="$DesignerVersion"><text>8.5.3</text></item>




</note>
<item name="$FileNames" sign="true"><text>header.xsp</text></item></note>
18 changes: 9 additions & 9 deletions disk-collaborationtoday/CustomControls/leftColumnLineItems.xsp.metadata
View file
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?><note class="form" maintenanceversion="3.0" replicaid="85257AA6004F5595" version="8.5" xmlns="http://www.lotus.com/dxl">
<noteinfo noteid="2ba" sequence="4" unid="E22D3630A4A4373085257AA6004F6E69">
<created><datetime dst="true">20121029T102736,09-04</datetime></created>
<modified><datetime dst="true">20121029T102736,54-04</datetime></modified>
<revised><datetime dst="true">20121029T102736,53-04</datetime></revised>
<lastaccessed><datetime dst="true">20121029T102736,53-04</datetime></lastaccessed>
<addedtofile><datetime dst="true">20121029T102736,17-04</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Jesse Gallagher/O=MTC</name></updatedby>
<wassignedby><name>CN=Jesse Gallagher/O=MTC</name></wassignedby>
<?xml version="1.0" encoding="UTF-8"?><note class="form" replicaid="86257A780060902F" version="9.0" xmlns="http://www.lotus.com/dxl">
<noteinfo noteid="276" sequence="82" unid="586475E56C4B2345C1257A64002E9211">
<created><datetime dst="true">20120824T102840,49+02</datetime></created>
<modified><datetime>20121219T094502,00+01</datetime></modified>
<revised><datetime>20121219T094501,99+01</datetime></revised>
<lastaccessed><datetime>20121219T094502,00+01</datetime></lastaccessed>
<addedtofile><datetime dst="true">20120914T085927,21+02</datetime></addedtofile></noteinfo>
<updatedby><name>CN=Niklas Heidloff/OU=Germany/O=IBM</name></updatedby>
<wassignedby><name>CN=Niklas Heidloff/OU=Germany/O=IBM</name></wassignedby>
<item name="$Flags"><text>gC~4;</text></item>
<item name="$TITLE"><text>leftColumnLineItems.xsp</text></item>
<item name="$DesignerVersion"><text>8.5.3</text></item>
Expand Down

0 comments on commit c3a5c5a

Please sign in to comment.