Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Merge branch 'gh-pages' of https://github.com/csc19601128/Phynixx into gh-pages
cleanup
cleanup
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Creating site for 2.0.0-SNAPSHOT
Delete phynixx-doc.iml
Delete PhynixxDoc.iml
Merge branch 'gh-pages' of https://github.com/csc19601128/Phynixx

Conflicts:
	.gitignore
	.idea/copyright/profiles_settings.xml
	.idea/misc.xml
	.idea/workspace.xml
	documentation.html
	getting-started.html
	images/1PhaseCommit.png
	images/1PhaseCommitWithLogData.png
	images/2 PhaseCommitWithLogData.png
	images/2PhaseCommit.png
	index.html
	phynixx-all.iml
	phynixx.html
	phynixx/phynixx-common/install-phynixx-connection.bat
	phynixx/phynixx-common/pom.xml
	phynixx/phynixx-common/src/main/java/org/csc/phynixx/common/logger/Log4jLogger.java
	phynixx/phynixx-common/src/test/java/org/csc/phynixx/common/TestUtils.java
	phynixx/phynixx-common/src/test/java/org/csc/phynixx/common/TmpDirectory.java
	phynixx/phynixx-common/src/test/test-resources/log4j.properties
	phynixx/phynixx-connection/install-phynixx-connection.bat
	phynixx/phynixx-connection/pom.xml
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/AbstractDynaProxyFactory.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnection.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionFactory.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionHandle.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionProxyDecorator.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionProxyFactory.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPooledConnection.java
	phynixx/phynixx-connection/src/site/site.xml
	phynixx/phynixx-connection/src/test/test-resources/log4j.properties
	phynixx/phynixx-doc/phynixx-doc.iml
	phynixx/phynixx-doc/pom.xml
	phynixx/phynixx-doc/src/main/resources/.gitignore
	phynixx/phynixx-doc/src/site/markdown/background.md
	phynixx/phynixx-doc/src/site/markdown/getting-started.md
	phynixx/phynixx-doc/src/site/markdown/references.md
	phynixx/phynixx-doc/src/site/markdown/tutorial.md
	phynixx/phynixx-doc/src/site/resources/images/1PhaseCommit.png
	phynixx/phynixx-doc/src/site/resources/images/1PhaseCommitWithLogData.png
	phynixx/phynixx-doc/src/site/resources/images/2PhaseCommit.png
	phynixx/phynixx-doc/src/site/resources/images/2PhaseCommitWithLogData.png
	phynixx/phynixx-doc/src/site/site.xml
	phynixx/phynixx-howl/pom.xml
	phynixx/phynixx-howl/src/main/java/org/csc/phynixx/loggersystem/howl/HowlLoggerFactory.java
	phynixx/phynixx-howl/src/main/java/org/csc/phynixx/loggersystem/howl/TestReplayListener.java
	phynixx/phynixx-howl/src/main/java/org/objectweb/howl/log/HowlLogger.java
	phynixx/phynixx-howl/src/site/site.xml
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/ChainedMessageReplayListener.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/HowlEvaluateTest.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/LogMessage.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/MessageChunk.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/TestLogEventListener.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/TestReplayListener.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/loggersystem/howl/HowlLoggerSystemTest.java
	phynixx/phynixx-howl/src/test/test-resources/log4j.properties
	phynixx/phynixx-jmx/pom.xml
	phynixx/phynixx-jmx/src/main/java/build.xml
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMe.java
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMeBean.java
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMeBeanMBean.java
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMeFrame.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/connection/jmx/LoggerSystemManagement.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/connection/jmx/LoggerSystemManagementMBean.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchTheWatchdogs.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchTheWatchdogsMBean.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchdogManagement.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchdogManagementMBean.java
	phynixx/phynixx-jmx/src/test/java/org/csc/phynixx/watchdog/jmx/WatchdogMBeanMainTestCase.java
	phynixx/phynixx-jmx/src/test/java/org/csc/phynixx/watchdog/jmx/WatchdogTestCase.java
	phynixx/phynixx-watchdog/pom.xml
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/ITimeoutCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/IWatchdog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/IWatchedCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/NotificationCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/RestartCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/TimeoutCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/Watchdog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/WatchdogInfo.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/WatchdogReference.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/WatchdogRegistry.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/log/CheckConditionFailedLog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/log/ConditionViolatedLog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/log/IWatchdogLog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/objectref/IObjectReference.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/objectref/ObjectReference.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/objectref/WeakObjectReference.java
	phynixx/phynixx-watchdog/src/test/java/org/csc/phynixx/watchdog/WatchdogAware.java
	phynixx/phynixx-watchdog/src/test/java/org/csc/phynixx/watchdog/WatchdogConsole.java
	phynixx/phynixx-watchdog/src/test/java/org/csc/phynixx/watchdog/WatchdogTest.java
	phynixx/phynixx-xa/phynixx-xa.iml
	phynixx/phynixx-xa/pom.xml
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/ConstantsPrinter.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IDGenerator.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IPhynixxXAConnection.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IPhynixxXAResourceListener.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IResourceIDGenerator.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/PhynixxXAResource.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/PhynixxXAResourceEvent.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/IRecoveryManager.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/SampleTransactionResourceManager.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/XARecoveryTest.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/XidWrapper.java
	phynixx/phynixx-xa/src/test/test-resources/conf/jotm.properties
	phynixx/pom.xml
	phynixx/src/site/site.xml
	references.html
	src/site/resources/images/1PhaseCommit.png
	src/site/resources/images/2PhaseCommit.png
	src/site/resources/images/2PhaseCommitWithLogData.png
	tutorial.html
Merge branch 'gh-pages' of https://github.com/csc19601128/Phynixx

Conflicts:
	.gitignore
	.idea/copyright/profiles_settings.xml
	.idea/misc.xml
	.idea/workspace.xml
	documentation.html
	getting-started.html
	images/1PhaseCommit.png
	images/1PhaseCommitWithLogData.png
	images/2 PhaseCommitWithLogData.png
	images/2PhaseCommit.png
	index.html
	phynixx-all.iml
	phynixx.html
	phynixx/phynixx-common/install-phynixx-connection.bat
	phynixx/phynixx-common/pom.xml
	phynixx/phynixx-common/src/main/java/org/csc/phynixx/common/logger/Log4jLogger.java
	phynixx/phynixx-common/src/test/java/org/csc/phynixx/common/TestUtils.java
	phynixx/phynixx-common/src/test/java/org/csc/phynixx/common/TmpDirectory.java
	phynixx/phynixx-common/src/test/test-resources/log4j.properties
	phynixx/phynixx-connection/install-phynixx-connection.bat
	phynixx/phynixx-connection/pom.xml
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/AbstractDynaProxyFactory.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnection.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionFactory.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionHandle.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionProxyDecorator.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPhynixxConnectionProxyFactory.java
	phynixx/phynixx-connection/src/main/java/org/csc/phynixx/connection/IPooledConnection.java
	phynixx/phynixx-connection/src/site/site.xml
	phynixx/phynixx-connection/src/test/test-resources/log4j.properties
	phynixx/phynixx-doc/phynixx-doc.iml
	phynixx/phynixx-doc/pom.xml
	phynixx/phynixx-doc/src/main/resources/.gitignore
	phynixx/phynixx-doc/src/site/markdown/background.md
	phynixx/phynixx-doc/src/site/markdown/getting-started.md
	phynixx/phynixx-doc/src/site/markdown/references.md
	phynixx/phynixx-doc/src/site/markdown/tutorial.md
	phynixx/phynixx-doc/src/site/resources/images/1PhaseCommit.png
	phynixx/phynixx-doc/src/site/resources/images/1PhaseCommitWithLogData.png
	phynixx/phynixx-doc/src/site/resources/images/2PhaseCommit.png
	phynixx/phynixx-doc/src/site/resources/images/2PhaseCommitWithLogData.png
	phynixx/phynixx-doc/src/site/site.xml
	phynixx/phynixx-howl/pom.xml
	phynixx/phynixx-howl/src/main/java/org/csc/phynixx/loggersystem/howl/HowlLoggerFactory.java
	phynixx/phynixx-howl/src/main/java/org/csc/phynixx/loggersystem/howl/TestReplayListener.java
	phynixx/phynixx-howl/src/main/java/org/objectweb/howl/log/HowlLogger.java
	phynixx/phynixx-howl/src/site/site.xml
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/ChainedMessageReplayListener.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/HowlEvaluateTest.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/LogMessage.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/MessageChunk.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/TestLogEventListener.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/evaluation/howl/TestReplayListener.java
	phynixx/phynixx-howl/src/test/java/org/csc/phynixx/loggersystem/howl/HowlLoggerSystemTest.java
	phynixx/phynixx-howl/src/test/test-resources/log4j.properties
	phynixx/phynixx-jmx/pom.xml
	phynixx/phynixx-jmx/src/main/java/build.xml
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMe.java
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMeBean.java
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMeBeanMBean.java
	phynixx/phynixx-jmx/src/main/java/com/builder/uk/watchme/WatchMeFrame.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/connection/jmx/LoggerSystemManagement.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/connection/jmx/LoggerSystemManagementMBean.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchTheWatchdogs.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchTheWatchdogsMBean.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchdogManagement.java
	phynixx/phynixx-jmx/src/main/java/org/csc/phynixx/watchdog/jmx/WatchdogManagementMBean.java
	phynixx/phynixx-jmx/src/test/java/org/csc/phynixx/watchdog/jmx/WatchdogMBeanMainTestCase.java
	phynixx/phynixx-jmx/src/test/java/org/csc/phynixx/watchdog/jmx/WatchdogTestCase.java
	phynixx/phynixx-watchdog/pom.xml
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/ITimeoutCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/IWatchdog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/IWatchedCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/NotificationCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/RestartCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/TimeoutCondition.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/Watchdog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/WatchdogInfo.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/WatchdogReference.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/WatchdogRegistry.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/log/CheckConditionFailedLog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/log/ConditionViolatedLog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/log/IWatchdogLog.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/objectref/IObjectReference.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/objectref/ObjectReference.java
	phynixx/phynixx-watchdog/src/main/java/org/csc/phynixx/watchdog/objectref/WeakObjectReference.java
	phynixx/phynixx-watchdog/src/test/java/org/csc/phynixx/watchdog/WatchdogAware.java
	phynixx/phynixx-watchdog/src/test/java/org/csc/phynixx/watchdog/WatchdogConsole.java
	phynixx/phynixx-watchdog/src/test/java/org/csc/phynixx/watchdog/WatchdogTest.java
	phynixx/phynixx-xa/phynixx-xa.iml
	phynixx/phynixx-xa/pom.xml
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/ConstantsPrinter.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IDGenerator.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IPhynixxXAConnection.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IPhynixxXAResourceListener.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/IResourceIDGenerator.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/PhynixxXAResource.java
	phynixx/phynixx-xa/src/main/java/org/csc/phynixx/xa/PhynixxXAResourceEvent.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/IRecoveryManager.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/SampleTransactionResourceManager.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/XARecoveryTest.java
	phynixx/phynixx-xa/src/test/java/org/csc/phynixx/xa/recovery/XidWrapper.java
	phynixx/phynixx-xa/src/test/test-resources/conf/jotm.properties
	phynixx/pom.xml
	phynixx/src/site/site.xml
	references.html
	src/site/resources/images/1PhaseCommit.png
	src/site/resources/images/2PhaseCommit.png
	src/site/resources/images/2PhaseCommitWithLogData.png
	tutorial.html
gghjghjghj
Merge branch 'master' of https://github.com/csc19601128/Phynixx