Changeset [1c1cbb97bb64ad04bf30813467380882a595e765] by Ben Hood
2011-06-02 18:08:57 UTC
Merge master into 207
https://github.com/lshift/diffa/commit/1c1cbb97bb64ad04bf3081346738...
Committed by Ben Hood
- M agent/src/main/resources/net/lshift/diffa/agent/rest/castorMapping.xml
- M agent/src/main/scala/net/lshift/diffa/agent/rest/ActionsResource.scala
- M agent/src/main/scala/net/lshift/diffa/agent/rest/ConfigurationResource.scala
- M agent/src/main/scala/net/lshift/diffa/agent/rest/DiffaConfigReaderWriter.scala
- M agent/src/main/webapp/css/style.css
- M agent/src/main/webapp/js/graph.js
- M agent/src/test/scala/net/lshift/diffa/agent/itest/CommonActionTests.scala
- M agent/src/test/scala/net/lshift/diffa/agent/itest/support/TestEnvironment.scala
- M agent/src/test/scala/net/lshift/diffa/agent/rest/DiffaConfigReaderWriterTest.scala
- M dist/src/main/assembly/resources/etc/demo.properties
- M json-messaging/src/main/scala/net/lshift/diffa/messaging/json/AbstractRestClient.scala
- M kernel/src/main/resources/net/lshift/diffa/kernel/config/Config.hbm.xml
- M kernel/src/main/scala/net/lshift/diffa/kernel/client/ActionsClient.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/client/ConfigurationClient.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/config/ConfigStore.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/config/HibernateConfigStore.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/frontend/Configuration.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/frontend/DiffaConfig.scala
- M kernel/src/main/scala/net/lshift/diffa/kernel/frontend/wire/ActionsProxy.scala
- M kernel/src/test/scala/net/lshift/diffa/kernel/config/HibernateConfigStoreTest.scala
- M kernel/src/test/scala/net/lshift/diffa/kernel/frontend/ConfigurationTest.scala
- M participants-web/src/main/scala/net/lshift/diffa/participants/web/ParticipantUIController.scala
- M participants-web/src/main/webapp/WEB-INF/applicationContext.xml
- M participants-web/src/main/webapp/WEB-INF/views/home/index.jsp
- M participants-web/src/test/resources/demo.itest.properties
- M tools/src/main/scala/net/lshift/diffa/tools/client/ActionsRestClient.scala
- M tools/src/main/scala/net/lshift/diffa/tools/client/ConfigurationRestClient.scala
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
A Real Time Differencing Tool.