# HG changeset patch # User Ingo Weinzierl # Date 1263285769 0 # Node ID 82f62ef25a8fb2b543bc851972484cc55fcd3d36 # Parent 8b72676698b504f093fb7cabdf862d691ee51b03 Create namespace aware documents for 'create' and 'out' targets. Adapted XPath expressions for this. artifacts/trunk@529 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 8b72676698b5 -r 82f62ef25a8f ChangeLog --- a/ChangeLog Sat Jan 09 16:59:00 2010 +0000 +++ b/ChangeLog Tue Jan 12 08:42:49 2010 +0000 @@ -1,3 +1,9 @@ +2010-01-12 Ingo Weinzierl + + * artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ArtifactOutResource.java, + artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java: + Create document namespace aware and adapted XPath expressions for this. + 2010-01-09 Ingo Weinzierl * artifact-database/src/main/java/de/intevation/artifactdatabase/XMLUtils.java: diff -r 8b72676698b5 -r 82f62ef25a8f artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ArtifactOutResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ArtifactOutResource.java Sat Jan 09 16:59:00 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/ArtifactOutResource.java Tue Jan 12 08:42:49 2010 +0000 @@ -32,7 +32,7 @@ { public static final String PATH = "/artifact/{uuid}/{type}"; - public static final String XPATH_MIME_TYPE = "/action/out/mime-type/@value"; + public static final String XPATH_MIME_TYPE = "/art:action/art:out/art:mime-type/@value"; public static final MediaType DEFAULT_MIME_TYPE = MediaType.APPLICATION_OCTET_STREAM; @@ -45,6 +45,7 @@ Document inputDocument = null; try { DomRepresentation input = new DomRepresentation(requestRepr); + input.setNamespaceAware(true); inputDocument = input.getDocument(); } catch (IOException ioe) { diff -r 8b72676698b5 -r 82f62ef25a8f artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java --- a/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java Sat Jan 09 16:59:00 2010 +0000 +++ b/artifact-database/src/main/java/de/intevation/artifactdatabase/rest/CreateResource.java Tue Jan 12 08:42:49 2010 +0000 @@ -34,7 +34,7 @@ public static final String PATH = "/create"; - public static final String XPATH_FACTORY = "/action/factory/@name"; + public static final String XPATH_FACTORY = "/art:action/art:factory/@name"; public static final String NO_FACTORY_MESSAGE = "No factory given"; @@ -46,6 +46,7 @@ Document inputDocument = null; try { DomRepresentation input = new DomRepresentation(requestRepr); + input.setNamespaceAware(true); inputDocument = input.getDocument(); } catch (IOException ioe) {