Author: sandervanderburg
Date: Sun Nov 21 18:05:34 2010
New Revision: 24798
URL: https://svn.nixos.org/websvn/nix/?rev=24798&sc=1
Log:
Replaced all DisnixService stuff with services.disnix.useWebServiceInterface
Modified:
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm2-mysql.nix
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm3-client.nix
Modified:
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm2-mysql.nix
==============================================================================
---
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm2-mysql.nix
Sun Nov 21 18:03:08 2010 (r24797)
+++
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm2-mysql.nix
Sun Nov 21 18:05:34 2010 (r24798)
@@ -26,6 +26,7 @@
disnix = {
enable = true;
+ useWebServiceInterface = true;
};
mysql = {
@@ -36,14 +37,8 @@
tomcat = {
enable = true;
-
- commonLibs = [ "${pkgs.mysql_jdbc}/share/java/mysql-connector-java.jar"
];
-
- javaOpts = "-Djava.library.path=${pkgs.libmatthew_java}/lib/jni";
+ commonLibs = [ "${pkgs.mysql_jdbc}/share/java/mysql-connector-java.jar"
];
catalinaOpts = "-Xms64m -Xmx256m";
- sharedLibs = [ "${pkgs.DisnixService}/share/java/DisnixConnection.jar"
- "${pkgs.dbus_java}/share/java/dbus.jar" ];
- webapps = [ pkgs.DisnixService ];
};
};
Modified:
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm3-client.nix
==============================================================================
---
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm3-client.nix
Sun Nov 21 18:03:08 2010 (r24797)
+++
disnix/examples/HelloWorldExample/trunk/deployment/configurations/test-vm3-client.nix
Sun Nov 21 18:05:34 2010 (r24798)
@@ -24,10 +24,6 @@
enable = true;
};
- disnix = {
- enable = true;
- };
-
xserver = {
enable = true;
@@ -53,6 +49,7 @@
pkgs.subversion
pkgs.lynx
pkgs.firefox
+ pkgs.disnix
];
};
}
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
