Skip to content

Update SNAPP for Sakai 11+ #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 57 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
cf6dc7b
Update README.md
steveswinsburg Oct 11, 2016
63dcd4c
Update INSTALL.md
steveswinsburg Oct 11, 2016
0594c31
Update INSTALL.md
steveswinsburg Oct 11, 2016
d7ed01f
Update INSTALL.md
steveswinsburg Oct 11, 2016
f7c4223
Update INSTALL.md
steveswinsburg Oct 11, 2016
3e370eb
Added pom.xml, including all dependencies except snapp44.jar
amiedavis Oct 22, 2016
1626923
Fixed comment. Updated {artifactId} to {project.artifactId} since art…
amiedavis Oct 24, 2016
8c57795
Updated naming in POM
amiedavis Oct 30, 2016
c20d704
Moved all SNAPP files under src/webapp/
amiedavis Oct 30, 2016
3802a5c
Added maven-war-plugin
amiedavis Nov 4, 2016
f3c1ff7
Generated target directory for snapp
amiedavis Nov 10, 2016
cbdd717
Removed comment about snapp44.jar
amiedavis Nov 10, 2016
eab72b5
Started building java servlet based on php file. Not complete, not te…
amiedavis Nov 24, 2016
4b39aac
Merge pull request #1 from amiedavis/feature/add-pom-for-snapp
steveswinsburg Dec 5, 2016
b8a7526
Remove target
steveswinsburg Dec 5, 2016
6db1320
Add eclipse scaffolding
steveswinsburg Dec 5, 2016
16c6aec
Restructured
amiedavis Dec 5, 2016
6981c38
Merge pull request #2 from amiedavis/master
steveswinsburg Dec 5, 2016
2b51356
Add pom for SNAPP Sociogram applet
steveswinsburg Dec 5, 2016
d7f91ba
Updated all poms and added a top level pom to wire all projects together
steveswinsburg Dec 5, 2016
08f3f9a
merged in my master's master and updated a pom pom
amiedavis Dec 5, 2016
7109664
Merge pull request #3 from amiedavis/master
steveswinsburg Dec 5, 2016
529133a
Updated poms
amiedavis Dec 5, 2016
7a102c3
Merge pull request #4 from amiedavis/master
steveswinsburg Dec 5, 2016
55155ef
Updated FileSaver servlet
steveswinsburg Dec 6, 2016
18e446a
Moved stuff and got it building
amiedavis Dec 20, 2016
ae84f22
Merge pull request #5 from amiedavis/master
steveswinsburg Dec 20, 2016
19442cf
Update README.md
steveswinsburg Dec 20, 2016
31177d0
Formatting of code
amiedavis Jan 5, 2017
295217d
Refactored to use booleans instead of yes/no strings.
amiedavis Mar 10, 2017
cd65b2a
Fixed if statement for sakai - no longer uses iFrames
amiedavis Mar 10, 2017
a1f56f9
Fixed indentation for loads.js
amiedavis Mar 10, 2017
fc77aa3
Fixed indentation in snapp_sakai.js
amiedavis Mar 15, 2017
94fded1
Replaced references to iFrames
amiedavis Mar 15, 2017
6a1b583
Fixed the way metadata, forum user and date/time posted are assigned.…
amiedavis Mar 15, 2017
193a5de
Minor formatting changes.
amiedavis Mar 15, 2017
b5fdac9
Fixed capitalisation in ID name
amiedavis Mar 15, 2017
d596853
Fixed metadata variable to contain metadata for all forum posts rathe…
amiedavis Mar 15, 2017
866d088
Changed location of snapp visualisation, since sakai no longer uses i…
amiedavis Mar 15, 2017
b648ba5
Attempt to get JSObject.getWindow() to use plugin.jar
amiedavis Mar 22, 2017
bd597ef
Got snapp working in both Eclipse and browser. Jar files have to be w…
amiedavis Apr 3, 2017
a5000ca
Fixed data scraping to be browser independent. Fixed padding-left cod…
amiedavis Apr 5, 2017
08561ff
Switched from testing data to the data scraped from the forum page.
amiedavis Apr 5, 2017
77ba28c
Added filter for sakai host
amiedavis Apr 5, 2017
13a1c24
Deleted filesaver php file
amiedavis Apr 6, 2017
5f5ab8c
Deleted an array that is never used.
amiedavis Apr 6, 2017
9a25c6a
Fixed references to filesaver. Added comment to pom.
amiedavis Apr 6, 2017
f211a0b
Removed TODO comment
amiedavis Apr 6, 2017
368d251
Changed the way the date scraper works, since the forums page html is…
amiedavis Apr 7, 2017
c7c4ad5
Merge pull request #6 from amiedavis/master
steveswinsburg Apr 18, 2017
843e674
Update error message that is displayed when there is no forum loaded.
amiedavis Apr 18, 2017
7520682
Added a comment explaining the way the posted date is extracted
amiedavis Apr 18, 2017
c4aaf7a
Moved properties file to parent directory.
amiedavis Apr 18, 2017
d05abc8
Updated INSTALL.md and README.md
amiedavis Apr 21, 2017
24d06c3
Merge branch 'master' into master
amiedavis Apr 22, 2017
88fd384
Updated README to remove Internet Explorer as a supported browser.
amiedavis May 7, 2017
d0a4745
Merge pull request #7 from amiedavis/master
steveswinsburg May 8, 2017
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
217 changes: 2 additions & 215 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,215 +1,2 @@
#################
## Eclipse
#################

*.pydevproject
.project
.metadata
bin/
tmp/
*.tmp
*.bak
*.swp
*~.nib
local.properties
.classpath
.settings/
.loadpath

# External tool builders
.externalToolBuilders/

# Locally stored "Eclipse launch configurations"
*.launch

# CDT-specific
.cproject

# PDT-specific
.buildpath


#################
## Visual Studio
#################

## Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.

# User-specific files
*.suo
*.user
*.sln.docstates

# Build results

[Dd]ebug/
[Rr]elease/
x64/
build/
[Bb]in/
[Oo]bj/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*

*_i.c
*_p.c
*.ilk
*.meta
*.obj
*.pch
*.pdb
*.pgc
*.pgd
*.rsp
*.sbr
*.tlb
*.tli
*.tlh
*.tmp
*.tmp_proj
*.log
*.vspscc
*.vssscc
.builds
*.pidb
*.log
*.scc

# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
*.cachefile

# Visual Studio profiler
*.psess
*.vsp
*.vspx

# Guidance Automation Toolkit
*.gpState

# ReSharper is a .NET coding add-in
_ReSharper*/
*.[Rr]e[Ss]harper

# TeamCity is a build add-in
_TeamCity*

# DotCover is a Code Coverage Tool
*.dotCover

# NCrunch
*.ncrunch*
.*crunch*.local.xml

# Installshield output folder
[Ee]xpress/

# DocProject is a documentation generator add-in
DocProject/buildhelp/
DocProject/Help/*.HxT
DocProject/Help/*.HxC
DocProject/Help/*.hhc
DocProject/Help/*.hhk
DocProject/Help/*.hhp
DocProject/Help/Html2
DocProject/Help/html

# Click-Once directory
publish/

# Publish Web Output
*.Publish.xml
*.pubxml

# NuGet Packages Directory
## TODO: If you have NuGet Package Restore enabled, uncomment the next line
#packages/

# Windows Azure Build Output
csx
*.build.csdef

# Windows Store app package directory
AppPackages/

# Others
sql/
*.Cache
ClientBin/
[Ss]tyle[Cc]op.*
~$*
*~
*.dbmdl
*.[Pp]ublish.xml
*.pfx
*.publishsettings

# RIA/Silverlight projects
Generated_Code/

# Backup & report files from converting an old project file to a newer
# Visual Studio version. Backup files are not needed, because we have git ;-)
_UpgradeReport_Files/
Backup*/
UpgradeLog*.XML
UpgradeLog*.htm

# SQL Server files
App_Data/*.mdf
App_Data/*.ldf

#############
## Windows detritus
#############

# Windows image file caches
Thumbs.db
ehthumbs.db

# Folder config file
Desktop.ini

# Recycle Bin used on file shares
$RECYCLE.BIN/

# Mac crap
.DS_Store


#############
## Python
#############

*.py[co]

# Packages
*.egg
*.egg-info
dist/
build/
eggs/
parts/
var/
sdist/
develop-eggs/
.installed.cfg

# Installer logs
pip-log.txt

# Unit test / coverage reports
.coverage
.tox

#Translations
*.mo

#Mr Developer
.mr.developer.cfg
target/
bin/
13 changes: 13 additions & 0 deletions FileSaver/.classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
<classpathentry kind="src" path="src/main/webapp"/>
<classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="var" path="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6.jar" sourcepath="M2_REPO/commons-lang/commons-lang/2.6/commons-lang-2.6-sources.jar">
<attributes>
<attribute name="javadoc_location" value="jar:file:/Users/erkel/.m2/repository/commons-lang/commons-lang/2.6/commons-lang-2.6-javadoc.jar!/"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/classes"/>
</classpath>
14 changes: 14 additions & 0 deletions FileSaver/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>filesaver</name>
<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
5 changes: 5 additions & 0 deletions FileSaver/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#Mon Dec 05 20:34:39 AEDT 2016
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
38 changes: 0 additions & 38 deletions FileSaver/FileSave.php

This file was deleted.

26 changes: 19 additions & 7 deletions FileSaver/index.html
Original file line number Diff line number Diff line change
@@ -1,16 +1,28 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>File Saver Test</title>
</head>
<body>
<h1>File Saver Test</h1>
<form action="http://localhost:8081/FileSaver/FileSave.php" method="post">
<textarea name="imagedata" rows="15" cols="80"> </textarea>
<input type="hidden" name="fileext" value="gexf">
<input type="submit" name="Send" value="Save File">
<form action="http://localhost:8080/filesaver" method="POST" enctype="multipart/form-data">
<div>
<label for="imagedata">Data:</label>
<textarea name="imagedata" rows="15" cols="80"></textarea>
</div>
<div>
<label for="fileext">Type:</label>
<select name="fileext">
<option value="png">png</option>
<option value="jpg">jpg</option>
<option value="vna">vna</option>
<option value="gexf">gexf</option>
<option value="annotations">annotations</option>
</select>
</div>
<div>
<input type="submit" name="Send" value="Save File">
</div>
</form>
</body>
</html>
33 changes: 33 additions & 0 deletions FileSaver/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>

<name>FileSaver</name>

<groupId>org.apereo.learninganalytics</groupId>
<artifactId>filesaver</artifactId>
<packaging>war</packaging>

<parent>
<groupId>org.apereo.learninganalytics</groupId>
<artifactId>snapp-base</artifactId>
<version>1.0</version>
</parent>

<dependencies>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
</dependency>
</dependencies>

<build>
<finalName>${project.artifactId}</finalName>
</build>

</project>
Loading