Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: dozeo/PusherAS
base: e652f47385
...
head fork: dozeo/PusherAS
compare: 21feca26a0
Checking mergeability… Don't worry, you can still create the pull request.
  • 3 commits
  • 34 files changed
  • 0 commit comments
  • 1 contributor
Commits on Jan 13, 2012
@TilmanGriesel TilmanGriesel re-structured Project && first steps
- added value object for main pusher configuration
- added value object for web socket status storage
- first steps with the socket connection
53faef2
@TilmanGriesel TilmanGriesel Merge branch 'master' of github.com:dozeo/PusherAS
Conflicts:
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/GsoloEncryption/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/GsoloEncryption/.syncinfo.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/.syncinfo.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/.syncinfo.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherASExample/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherASExample/.syncinfo.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/RFC2817Socket/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/RFC2817Socket/.syncinfo.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/WebSocket/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/WebSocket/.syncinfo.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	flash-src/.metadata/.plugins/org.eclipse.core.resources/.snap
	flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
cab3a99
@TilmanGriesel TilmanGriesel file cleanup
deleted bin folder artefact
21feca2
Showing with 40 additions and 1 deletion.
  1. BIN  bin/PusherAS.swc
  2. BIN  flash-src/.metadata/.plugins/com.adobe.flexbuilder.codemodel/SwcCache/PusherAS.swc-1092112799/library.swf
  3. BIN  flash-src/.metadata/.plugins/com.adobe.flexbuilder.codemodel/SwcCache/WebSocket.swc-1635273791/library.swf
  4. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/GsoloEncryption/.markers.snap
  5. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/GsoloEncryption/.syncinfo.snap
  6. BIN  ...ns/org.eclipse.core.resources/.projects/GsoloEncryption/com.adobe.flexbuilder.project/GsoloEncryption.cache
  7. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/.markers.snap
  8. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/.syncinfo.snap
  9. BIN  ....metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/com.adobe.flexbuilder.project/Hurlant.cache
  10. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/.markers.snap
  11. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/.syncinfo.snap
  12. BIN  ...etadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/com.adobe.flexbuilder.project/PusherAS.cache
  13. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherASExample/.syncinfo.snap
  14. BIN  ...ns/org.eclipse.core.resources/.projects/PusherASExample/com.adobe.flexbuilder.project/PusherASExample.cache
  15. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/RFC2817Socket/.markers.snap
  16. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/RFC2817Socket/.syncinfo.snap
  17. BIN  ...lugins/org.eclipse.core.resources/.projects/RFC2817Socket/com.adobe.flexbuilder.project/RFC2817Socket.cache
  18. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/WebSocket/.markers.snap
  19. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/WebSocket/.syncinfo.snap
  20. BIN  ...adata/.plugins/org.eclipse.core.resources/.projects/WebSocket/com.adobe.flexbuilder.project/WebSocket.cache
  21. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
  22. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
  23. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
  24. BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.snap
  25. +2 −1  flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
  26. +11 −0 flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
  27. +3 −0  flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
  28. +24 −0 flash-src/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
  29. BIN  flash-src/GsoloEncryption/bin/GsoloEncryption.swc
  30. BIN  flash-src/Hurlant/bin/Hurlant.swc
  31. BIN  flash-src/PusherAS/bin/PusherAS.swc
  32. BIN  flash-src/PusherASExample/bin-debug/PusherASExample.swf
  33. BIN  flash-src/RFC2817Socket/bin/RFC2817Socket.swc
  34. BIN  flash-src/WebSocket/bin/WebSocket.swc
View
BIN  bin/PusherAS.swc
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/com.adobe.flexbuilder.codemodel/SwcCache/PusherAS.swc-1092112799/library.swf
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/com.adobe.flexbuilder.codemodel/SwcCache/WebSocket.swc-1635273791/library.swf
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/GsoloEncryption/.markers.snap
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/GsoloEncryption/.syncinfo.snap
Binary file not shown
View
BIN  ...org.eclipse.core.resources/.projects/GsoloEncryption/com.adobe.flexbuilder.project/GsoloEncryption.cache
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/.markers.snap
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/.syncinfo.snap
Binary file not shown
View
BIN  ...tadata/.plugins/org.eclipse.core.resources/.projects/Hurlant/com.adobe.flexbuilder.project/Hurlant.cache
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/.markers.snap
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherAS/.syncinfo.snap
Binary file not shown
View
BIN  ...data/.plugins/org.eclipse.core.resources/.projects/PusherAS/com.adobe.flexbuilder.project/PusherAS.cache
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/PusherASExample/.syncinfo.snap
Binary file not shown
View
BIN  ...org.eclipse.core.resources/.projects/PusherASExample/com.adobe.flexbuilder.project/PusherASExample.cache
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/RFC2817Socket/.markers.snap
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/RFC2817Socket/.syncinfo.snap
Binary file not shown
View
BIN  ...ins/org.eclipse.core.resources/.projects/RFC2817Socket/com.adobe.flexbuilder.project/RFC2817Socket.cache
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/WebSocket/.markers.snap
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.projects/WebSocket/.syncinfo.snap
Binary file not shown
View
BIN  ...ta/.plugins/org.eclipse.core.resources/.projects/WebSocket/com.adobe.flexbuilder.project/WebSocket.cache
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.root/.markers.snap
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
Binary file not shown
View
BIN  flash-src/.metadata/.plugins/org.eclipse.core.resources/.snap
Binary file not shown
View
3  flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.core.resources.prefs
@@ -1,4 +1,5 @@
-#Fri Jan 13 19:49:08 CET 2012
+#Fri Jan 13 19:56:48 CET 2012
version=1
eclipse.preferences.version=1
pathvariable.DOCUMENTS=/Users/tgriesel/workspace/dozeo/flash-dev/PusherAS/flash-src
+refresh.enabled=false
View
11 flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,11 @@
+#Fri Jan 13 19:56:48 CET 2012
+org.eclipse.jdt.core.classpathVariable.JRE_SRCROOT=
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.classpathVariable.JRE_LIB=/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.source=1.6
+org.eclipse.jdt.core.classpathVariable.JRE_SRC=
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
View
3  flash-src/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.launching.prefs
@@ -0,0 +1,3 @@
+#Fri Jan 13 19:56:48 CET 2012
+eclipse.preferences.version=1
+org.eclipse.jdt.launching.PREF_VM_XML=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?>\n<vmSettings defaultVM\="52,org.eclipse.jdt.internal.launching.macosx.MacOSXType8,Contents">\n<vmType id\="org.eclipse.jdt.internal.launching.macosx.MacOSXType">\n<vm id\="Contents" javadocURL\="http\://java.sun.com/javase/6/docs/api/" name\="JVM Contents (MacOS X Default)" path\="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"/>\n</vmType>\n</vmSettings>\n
View
24 flash-src/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<libraryInfos>
+<libraryInfo home="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home" version="1.6.0_29">
+<bootpath>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsfd.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/classes.jar"/>
+<entry path="/System/Library/Frameworks/JavaVM.framework/Frameworks/JavaRuntimeSupport.framework/Resources/Java/JavaRuntimeSupport.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/ui.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/laf.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/sunrsasign.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jsse.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/jce.jar"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Classes/charsets.jar"/>
+</bootpath>
+<extensionDirs>
+<entry path="/Library/Java/Extensions"/>
+<entry path="/System/Library/Java/Extensions"/>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/ext"/>
+</extensionDirs>
+<endorsedDirs>
+<entry path="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home/lib/endorsed"/>
+</endorsedDirs>
+</libraryInfo>
+</libraryInfos>
View
BIN  flash-src/GsoloEncryption/bin/GsoloEncryption.swc
Binary file not shown
View
BIN  flash-src/Hurlant/bin/Hurlant.swc
Binary file not shown
View
BIN  flash-src/PusherAS/bin/PusherAS.swc
Binary file not shown
View
BIN  flash-src/PusherASExample/bin-debug/PusherASExample.swf
Binary file not shown
View
BIN  flash-src/RFC2817Socket/bin/RFC2817Socket.swc
Binary file not shown
View
BIN  flash-src/WebSocket/bin/WebSocket.swc
Binary file not shown

No commit comments for this range

Something went wrong with that request. Please try again.