diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/csadmin')
3 files changed, 14 insertions, 16 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java b/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java index 2317eac47..9d7f2f9ac 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/CMSRestClient.java @@ -275,7 +275,7 @@ public abstract class CMSRestClient { } public <T> T createProxy(Class<T> clazz) throws URISyntaxException { - URI uri = new URI(config.getServerURI()+"/pki"); + URI uri = new URI(config.getServerURI()+"/rest"); return ProxyFactory.create(clazz, uri, executor, providerFactory); } diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationErrorInterceptor.java b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationErrorInterceptor.java index d98d8f93d..63af4101a 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationErrorInterceptor.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/ConfigurationErrorInterceptor.java @@ -41,7 +41,8 @@ public class ConfigurationErrorInterceptor implements ClientErrorInterceptor { String contentType = headers.getFirst("Content-Type"); // handle XML content only - if (!contentType.startsWith(MediaType.TEXT_XML)) return; + System.out.println("Content-type: "+contentType); + if (!contentType.startsWith(MediaType.APPLICATION_XML)) return; CMSException exception; diff --git a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResource.java b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResource.java index ff582561c..2918842c9 100644 --- a/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResource.java +++ b/base/common/src/com/netscape/cms/servlet/csadmin/SystemConfigurationResource.java @@ -14,7 +14,7 @@ // // (C) 2012 Red Hat, Inc. // All rights reserved. -// --- END COPYRIGHT BLOCK --- +// --- END COPYRIGHT BLOCK --- package com.netscape.cms.servlet.csadmin; import javax.ws.rs.Consumes; @@ -33,34 +33,31 @@ import com.netscape.cms.servlet.csadmin.model.InstallTokenRequest; /** * @author alee - * */ -@Path("/installer") +@Path("installer") public interface SystemConfigurationResource { - + @POST @Path("configure") - @Produces({ MediaType.TEXT_XML }) - @Consumes({ MediaType.APPLICATION_FORM_URLENCODED}) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) + @Consumes({ MediaType.APPLICATION_FORM_URLENCODED }) public ConfigurationResponseData configure(MultivaluedMap<String, String> form); - + @POST @Path("configure") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public ConfigurationResponseData configure(ConfigurationData data); - + @POST @Path("installToken") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public InstallToken getInstallToken(InstallTokenRequest data); - + @GET @Path("domainInfo") - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) @Consumes({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON }) public DomainInfo getDomainInfo(); - - } |