Author: sandervanderburg
Date: Wed Oct 20 15:29:43 2010
New Revision: 24389
URL: https://svn.nixos.org/websvn/nix/?rev=24389&sc=1
Log:
Renamed DisnixService into DisnixWebService to avoid confusion with the
disnix-service component
Added:
disnix/DisnixWebService/
- copied from r24250, disnix/DisnixService/
disnix/DisnixWebService/trunk/src/org/nixos/disnix/service/DisnixWebService.java
- copied, changed from r24250,
disnix/DisnixService/trunk/src/org/nixos/disnix/service/DisnixService.java
Deleted:
disnix/DisnixService/
disnix/DisnixWebService/trunk/src/org/nixos/disnix/service/DisnixService.java
Modified:
disnix/DisnixWebService/trunk/.project
disnix/DisnixWebService/trunk/META-INF/services.xml
disnix/DisnixWebService/trunk/build.xml
disnix/DisnixWebService/trunk/release.nix
Modified: disnix/DisnixWebService/trunk/.project
==============================================================================
--- disnix/DisnixService/trunk/.project Tue Oct 12 20:53:56 2010 (r24250)
+++ disnix/DisnixWebService/trunk/.project Wed Oct 20 15:29:43 2010
(r24389)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>DisnixService</name>
+ <name>DisnixWebService</name>
<comment></comment>
<projects>
</projects>
Modified: disnix/DisnixWebService/trunk/META-INF/services.xml
==============================================================================
--- disnix/DisnixService/trunk/META-INF/services.xml Tue Oct 12 20:53:56
2010 (r24250)
+++ disnix/DisnixWebService/trunk/META-INF/services.xml Wed Oct 20 15:29:43
2010 (r24389)
@@ -1,6 +1,6 @@
-<service name="DisnixService" scope="application">
+<service name="DisnixWebService" scope="application">
<description>
- Disnix Service
+ Disnix Web Service
</description>
<messageReceivers>
<messageReceiver mep="http://www.w3.org/2004/08/wsdl/in-only";
@@ -9,6 +9,6 @@
class="org.apache.axis2.rpc.receivers.RPCInOutAsyncMessageReceiver"/>
</messageReceivers>
<parameter name="ServiceClass">
- org.nixos.disnix.service.DisnixService
+ org.nixos.disnix.service.DisnixWebService
</parameter>
</service>
Modified: disnix/DisnixWebService/trunk/build.xml
==============================================================================
--- disnix/DisnixService/trunk/build.xml Tue Oct 12 20:53:56 2010
(r24250)
+++ disnix/DisnixWebService/trunk/build.xml Wed Oct 20 15:29:43 2010
(r24389)
@@ -1,4 +1,4 @@
-<project name="DisnixService" basedir="." default="compile">
+<project name="DisnixWebService" basedir="." default="compile">
<property name="deploybuild.dir" value="bin" />
<property environment="env"/>
@@ -15,7 +15,7 @@
<isset property="env.DBUS_JAVA_LIB"/>
</condition>
- <condition property="PREFIX" value="${env.PREFIX}"
else="/usr/local/DisnixService">
+ <condition property="PREFIX" value="${env.PREFIX}"
else="/usr/local/DisnixWebService">
<isset property="env.PREFIX"/>
</condition>
@@ -48,7 +48,7 @@
</copy>
<mkdir dir="${deploybuild.dir}/WEB-INF/services" />
- <jar
destfile="${deploybuild.dir}/WEB-INF/services/DisnixService.aar">
+ <jar
destfile="${deploybuild.dir}/WEB-INF/services/DisnixWebService.aar">
<fileset dir="${deploybuild.dir}" includes="META-INF/*
org/nixos/disnix/service/*" />
</jar>
</target>
@@ -77,9 +77,9 @@
</replacefilter>
</replace>
- <war destfile="DisnixService.war" needxmlfile="false">
+ <war destfile="DisnixWebService.war" needxmlfile="false">
<fileset dir="${AXIS2_WEBAPP}"
excludes="WEB-INF/conf/axis2.xml" />
- <fileset dir="${deploybuild.dir}"
includes="WEB-INF/services/DisnixService.aar WEB-INF/conf/axis2.xml" />
+ <fileset dir="${deploybuild.dir}"
includes="WEB-INF/services/DisnixWebService.aar WEB-INF/conf/axis2.xml" />
</war>
</target>
@@ -113,7 +113,7 @@
<mkdir dir="${PREFIX}/share/java" />
<copy toDir="${PREFIX}/webapps" >
- <fileset dir="${basedir}" includes="DisnixService.war"
/>
+ <fileset dir="${basedir}"
includes="DisnixWebService.war" />
</copy>
<copy toDir="${PREFIX}/share/java">
<fileset dir="${basedir}"
includes="DisnixConnection.jar" />
@@ -124,7 +124,7 @@
<target name="clean">
<delete file="DisnixConnection.jar" />
- <delete file="DisnixService.war" />
+ <delete file="DisnixWebService.war" />
<delete file="DisnixClient.jar" />
<delete dir="${deploybuild.dir}" />
</target>
Modified: disnix/DisnixWebService/trunk/release.nix
==============================================================================
--- disnix/DisnixService/trunk/release.nix Tue Oct 12 20:53:56 2010
(r24250)
+++ disnix/DisnixWebService/trunk/release.nix Wed Oct 20 15:29:43 2010
(r24389)
@@ -3,24 +3,24 @@
let
jobs = rec {
tarball =
- { DisnixService ? {outPath = ./.; rev = 1234;}
+ { DisnixWebService ? {outPath = ./.; rev = 1234;}
, officialRelease ? false
}:
with import nixpkgs {};
releaseTools.sourceTarball {
- name = "DisnixService-tarball";
+ name = "DisnixWebService-tarball";
version = builtins.readFile ./version;
- src = DisnixService;
+ src = DisnixWebService;
inherit officialRelease;
distPhase =
''
- mkdir -p ../bin/DisnixService-$version
- cp -av * ../bin/DisnixService-$version
+ mkdir -p ../bin/DisnixWebService-$version
+ cp -av * ../bin/DisnixWebService-$version
cd ../bin
ensureDir $out/tarballs
- tar cfvj $out/tarballs/DisnixService-$version.tar.bz2
DisnixService-$version
+ tar cfvj $out/tarballs/DisnixWebService-$version.tar.bz2
DisnixWebService-$version
'';
};
@@ -32,7 +32,7 @@
with import nixpkgs { inherit system; };
releaseTools.nixBuild {
- name = "disnix";
+ name = "DisnixWebService";
src = tarball;
PREFIX = ''''${env.out}'';
AXIS2_LIB = "${axis2}/lib";
@@ -57,7 +57,7 @@
}:
let
- DisnixService = build { system = "x86_64-linux"; };
+ DisnixWebService = build { system = "x86_64-linux"; };
tests = ./tests;
in
with import "${nixos}/lib/testing.nix" { inherit nixpkgs; system =
"x86_64-linux"; services = null; };
@@ -109,9 +109,9 @@
services.tomcat.enable = true;
services.tomcat.javaOpts =
"-Djava.library.path=${pkgs.libmatthew_java}/lib/jni";
services.tomcat.catalinaOpts = "-Xms64m -Xmx256m";
- services.tomcat.sharedLibs = [
"${DisnixService}/share/java/DisnixConnection.jar"
+ services.tomcat.sharedLibs = [
"${DisnixWebService}/share/java/DisnixConnection.jar"
"${pkgs.dbus_java}/share/java/dbus.jar" ];
- services.tomcat.webapps = [ DisnixService ];
+ services.tomcat.webapps = [ DisnixWebService ];
};
client =
@@ -134,20 +134,20 @@
mount -t aufs -o
dirs=/mnt-store-tmpfs=rw:$targetRoot/nix/store=rr none $targetRoot/nix/store
'';
- environment.systemPackages = [ disnix DisnixService pkgs.stdenv
];
+ environment.systemPackages = [ disnix DisnixWebService
pkgs.stdenv ];
};
};
testScript =
''
startAll;
- # Wait until tomcat is started and the DisnixService is activated
+ # Wait until tomcat is started and the DisnixWebService is
activated
$server->waitForJob("tomcat");
- $server->waitForFile("/var/tomcat/webapps/DisnixService");
+ $server->waitForFile("/var/tomcat/webapps/DisnixWebService");
# Run test-cases
- my $result = $client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --print-invalid
/nix/store/invalid");
+ my $result = $client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --print-invalid
/nix/store/invalid");
if($result =~ /\/nix\/store\/invalid/) {
print "/nix/store/invalid is invalid\n";
@@ -155,20 +155,20 @@
die "/nix/store/invalid should be invalid\n";
}
- #$client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --lock");
- #$client->mustFail("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --lock");
- #$client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --unlock");
- #$client->mustFail("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --unlock");
+ #$client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --lock");
+ #$client->mustFail("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --lock");
+ #$client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --unlock");
+ #$client->mustFail("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --unlock");
#### Test copy closure
my $testService =
$client->mustSucceed("NIXPKGS_ALL=${nixpkgs}/pkgs/top-level/all-packages.nix
nix-build ${tests}/testservice.nix");
$server->mustFail("nix-store --check-validity $testService");
- $client->mustSucceed("disnix-copy-closure --interface
disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --to $testService");
+ $client->mustSucceed("disnix-copy-closure --interface
disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --to
$testService");
$server->mustSucceed("nix-store --check-validity $testService");
- $client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --activate --arguments
foo=foo --arguments bar=bar --type echo $testService");
- $client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixService/services/DisnixService --deactivate
--arguments foo=foo --arguments bar=bar --type echo $testService");
+ $client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --activate
--arguments foo=foo --arguments bar=bar --type echo $testService");
+ $client->mustSucceed("disnix-soap-client --target
http://server:8080/DisnixWebService/services/DisnixWebService --deactivate
--arguments foo=foo --arguments bar=bar --type echo $testService");
'';
};
};
Copied and modified:
disnix/DisnixWebService/trunk/src/org/nixos/disnix/service/DisnixWebService.java
(from r24250,
disnix/DisnixService/trunk/src/org/nixos/disnix/service/DisnixService.java)
==============================================================================
--- disnix/DisnixService/trunk/src/org/nixos/disnix/service/DisnixService.java
Tue Oct 12 20:53:56 2010 (r24250, copy source)
+++
disnix/DisnixWebService/trunk/src/org/nixos/disnix/service/DisnixWebService.java
Wed Oct 20 15:29:43 2010 (r24389)
@@ -29,7 +29,7 @@
/**
* Provides a SOAP interface to operations of the core Disnix service
*/
-public class DisnixService
+public class DisnixWebService
{
/** Interface used to communicate to the core D-Bus service */
private Disnix disnixInterface;
@@ -42,7 +42,7 @@
*
* @throws DBusException If the connection with the D-Bus service fails
*/
- public DisnixService() throws DBusException
+ public DisnixWebService() throws DBusException
{
handler = new DisnixSignalHandler();
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
