Google issues: - #1
mathieucarbou wants to merge 4 commits into
Conversation
mathieucarbou
commented
Jan 24, 2011
- http://code.google.com/p/socketio-java/issues/detail?id=7
- http://code.google.com/p/socketio-java/issues/detail?id=8
|
The code changes seem ok, I'll take a closer look tomorrow. There are two problems. One, some of the file relocations didn't get marked as moves, and are instead showing and delete + add. And two, ALL copyright notices have been modified. I have no problem with you claiming copyright to files you created, but I'm not happy with you claiming copyright on files you didn't author. |
|
Hi, For the parent pom you'll also notice that the distribution repository and company has to be changed. Since our fork is deployed into an Ovea repository, this is our "own" config that must be changed. For the add + delete, this is because the Maven structure was already ready in a git repository (which was not a fork) before you imported in github. So to send you pull request, I had to refork and move the new structure with the fork and delete the old structure. This is the first and last time this will happen because now the repo are correctly setup. What I would suggest for the merge is that you checkout our fork in an other folder and move the file in you github acordingly to our structure in our fork. Also, you can comment the maven license plugin. Thus you'll resolve all these issues at one time. I'll take care to improve the MLP configuration to add correct exclusions. Thanks, Mathieu. |
|
I've pushed most of the changes presented in this pull request. Regarding the last change in this pull request, I forked the Socket.IO project and all my changes are mastered there. The socket.io.js file in the Socket.IO-Java project is just a copy of the latest "compiled" version from http://github.com/tadglines/Socket.IO. Please create a push request to that project for the WEB_SOCKET_WSF_LOCATION change and I'll push it there then into this project. |
|
Hi. |