diff options
Diffstat (limited to 'base/common/src/com/netscape/cms/servlet/profile')
4 files changed, 12 insertions, 76 deletions
diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileResource.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileResource.java index 38f7ee038..e402aeadd 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileResource.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileResource.java @@ -7,8 +7,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType; import com.netscape.cms.servlet.profile.model.ProfileData; +import com.netscape.cms.servlet.profile.model.ProfileDataInfos; -@Path("/profile") +@Path("/profiles") public interface ProfileResource { @GET @@ -16,6 +17,10 @@ public interface ProfileResource { @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) public ProfileData retrieveProfile(@PathParam("id") String id); + @GET + @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) + public ProfileDataInfos listProfiles(); + /** * Used to retrieve a key * diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java b/base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java index a9af6278f..7e8a32424 100644 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java +++ b/base/common/src/com/netscape/cms/servlet/profile/ProfileResourceService.java @@ -21,6 +21,7 @@ package com.netscape.cms.servlet.profile; import com.netscape.cms.servlet.base.CMSResourceService; import com.netscape.cms.servlet.profile.model.ProfileDAO; import com.netscape.cms.servlet.profile.model.ProfileData; +import com.netscape.cms.servlet.profile.model.ProfileDataInfos; /** * @author alee @@ -29,12 +30,14 @@ import com.netscape.cms.servlet.profile.model.ProfileData; public class ProfileResourceService extends CMSResourceService implements ProfileResource { @Override public ProfileData retrieveProfile(String id) { - ProfileData data = null; ProfileDAO dao = new ProfileDAO(); - data = dao.getProfile(id); - return data; } + + public ProfileDataInfos listProfiles() { + ProfileDAO dao = new ProfileDAO(); + return dao.listProfiles(uriInfo); + } } diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfilesResource.java b/base/common/src/com/netscape/cms/servlet/profile/ProfilesResource.java deleted file mode 100644 index 68868ebe8..000000000 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfilesResource.java +++ /dev/null @@ -1,34 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2007 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -package com.netscape.cms.servlet.profile; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -import com.netscape.cms.servlet.profile.model.ProfileDataInfos; - -@Path("/profiles") -public interface ProfilesResource { - - @GET - @Produces({ MediaType.APPLICATION_XML, MediaType.APPLICATION_JSON, MediaType.TEXT_XML }) - public ProfileDataInfos listProfiles(); - -} diff --git a/base/common/src/com/netscape/cms/servlet/profile/ProfilesResourceService.java b/base/common/src/com/netscape/cms/servlet/profile/ProfilesResourceService.java deleted file mode 100644 index f07fbdcc2..000000000 --- a/base/common/src/com/netscape/cms/servlet/profile/ProfilesResourceService.java +++ /dev/null @@ -1,38 +0,0 @@ -// --- BEGIN COPYRIGHT BLOCK --- -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; version 2 of the License. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License along -// with this program; if not, write to the Free Software Foundation, Inc., -// 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -// -// (C) 2011 Red Hat, Inc. -// All rights reserved. -// --- END COPYRIGHT BLOCK --- -/** - * - */ -package com.netscape.cms.servlet.profile; - -import com.netscape.cms.servlet.base.CMSResourceService; -import com.netscape.cms.servlet.profile.model.ProfileDAO; -import com.netscape.cms.servlet.profile.model.ProfileDataInfos; - -/** - * @author alee - * - */ -public class ProfilesResourceService extends CMSResourceService implements ProfilesResource { - - public ProfileDataInfos listProfiles() - { - ProfileDAO dao = new ProfileDAO(); - return dao.listProfiles(uriInfo); - } -} |