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

Already on GitHub? Sign in to your account

Albums and MediaItems data are now contained in the same json db with ActivityStream Data #28

Open
wants to merge 56 commits into
from

Conversation

Projects
None yet
1 participant
Contributor

vittoso commented Oct 17, 2012

This was done in order to reduce the user profile's paylod size.

It seems, however, that the JWS header is still bigger and the ddb maximum value size (509 bytes): it might be necessary to conceive a different public key distribution system (via torrent?)

vittoso added some commits Oct 17, 2012

Albums and MediaItems information are now container in the same json …
…with

ActivityStream Data

This was done in order to reduce the user profile's paylod size.
Merge remote-tracking branch 'upstream/master'
Conflicts:
	blogracy-web/src/main/java/net/blogracy/controller/DistributedHashTable.java
	blogracy-web/src/main/java/net/blogracy/controller/FileSharing.java
	blogracy-web/src/main/webapp/WEB-INF/web.xml
	blogracy-web/src/main/webapp/user.jsp
FileSharing.java keeping my version of file as it is newer and equiva…
…lent

Updating my pom.xml and adding commons-ui and common-fileupload
Merge remote-tracking branch 'upstream/master'
Merge with rik0's repo

Conflicts:
	blogracy-vuze/src/main/java/net/blogracy/Blogracy.java
	blogracy-vuze/src/main/java/net/blogracy/chat/ChatManager.java
	blogracy-vuze/src/main/java/net/blogracy/services/DownloadService.java
	blogracy-web/src/main/java/net/blogracy/controller/DistributedHashTable.java
	blogracy-web/src/main/java/net/blogracy/controller/FileSharing.java
With this pom.xml the exception j ava.lang.SecurityException: \class
"javax.servlet.FilterRegistration"'s signer information does not match
does not occur any longer

signer information of other classes in the same package
Merge remote-tracking branch 'upstream/master'
Conflicts:
	blogracy-vuze/src/main/java/net/blogracy/Blogracy.java
	blogracy-vuze/src/main/java/net/blogracy/services/DownloadService.java
	blogracy-vuze/src/main/java/net/blogracy/services/LookupService.java
	blogracy-vuze/src/main/java/net/blogracy/services/SeedService.java
	blogracy-web/pom.xml
	blogracy-web/src/main/java/net/blogracy/WebServer.java
	blogracy-web/src/main/java/net/blogracy/config/Configurations.java
	blogracy-web/src/main/java/net/blogracy/controller/ActivitiesController.java
	blogracy-web/src/main/java/net/blogracy/controller/DistributedHashTable.java
	blogracy-web/src/main/java/net/blogracy/controller/FileSharing.java
	blogracy-web/src/main/java/net/blogracy/controller/MediaController.java
	blogracy-web/src/main/java/net/blogracy/model/hashes/Hashes.java
	blogracy-web/src/main/java/net/blogracy/web/FileUpload.java
	blogracy-web/src/main/java/net/blogracy/web/ImageGalleryUploader.java
	blogracy-web/src/main/webapp/chat.jsp
	blogracy-web/src/main/webapp/gallery.jsp
	blogracy-web/src/main/webapp/js/chat.js
	blogracy-web/src/main/webapp/user.jsp
Merge remote-tracking branch 'upstream/master'
Conflicts:
	blogracy-vuze/src/main/java/net/blogracy/Blogracy.java
	blogracy-vuze/src/main/java/net/blogracy/services/DownloadService.java
	blogracy-vuze/src/main/java/net/blogracy/services/LookupService.java
	blogracy-vuze/src/main/java/net/blogracy/services/SeedService.java
	blogracy-web/pom.xml
	blogracy-web/src/main/java/net/blogracy/WebServer.java
	blogracy-web/src/main/java/net/blogracy/config/Configurations.java
	blogracy-web/src/main/java/net/blogracy/controller/ActivitiesController.java
	blogracy-web/src/main/java/net/blogracy/controller/DistributedHashTable.java
	blogracy-web/src/main/java/net/blogracy/controller/FileSharing.java
	blogracy-web/src/main/java/net/blogracy/controller/MediaController.java
	blogracy-web/src/main/java/net/blogracy/model/hashes/Hashes.java
	blogracy-web/src/main/java/net/blogracy/web/FileUpload.java
	blogracy-web/src/main/java/net/blogracy/web/ImageGalleryUploader.java
	blogracy-web/src/main/webapp/chat.jsp
	blogracy-web/src/main/webapp/gallery.jsp
	blogracy-web/src/main/webapp/js/chat.js
	blogracy-web/src/main/webapp/user.jsp
Merge branch 'master' of github.com:vittoso/blogracy
Conflicts:
	blogracy-web/src/main/java/net/blogracy/controller/FileSharing.java
	blogracy-web/src/main/java/net/blogracy/web/ImageGalleryUploader.java
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment