Return-Path: Delivered-To: apmail-incubator-abdera-commits-archive@locus.apache.org Received: (qmail 65741 invoked from network); 26 Jan 2008 21:04:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jan 2008 21:04:20 -0000 Received: (qmail 50739 invoked by uid 500); 26 Jan 2008 21:04:11 -0000 Delivered-To: apmail-incubator-abdera-commits-archive@incubator.apache.org Received: (qmail 50720 invoked by uid 500); 26 Jan 2008 21:04:11 -0000 Mailing-List: contact abdera-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: abdera-dev@incubator.apache.org Delivered-To: mailing list abdera-commits@incubator.apache.org Received: (qmail 50711 invoked by uid 99); 26 Jan 2008 21:04:11 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2008 13:04:11 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 26 Jan 2008 21:03:52 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 7C6E31A9832; Sat, 26 Jan 2008 13:03:59 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r615491 - in /incubator/abdera/java/branches/server_refactor_all: examples/src/main/java/org/apache/abdera/examples/appserver/ server/src/main/java/org/apache/abdera/protocol/server/ server/src/main/java/org/apache/abdera/protocol/server/co... Date: Sat, 26 Jan 2008 21:03:58 -0000 To: abdera-commits@incubator.apache.org From: jmsnell@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080126210359.7C6E31A9832@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jmsnell Date: Sat Jan 26 13:03:55 2008 New Revision: 615491 URL: http://svn.apache.org/viewvc?rev=615491&view=rev Log: Rename the resolveIri method to urlFor Modified: incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Provider.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java Modified: incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java (original) +++ incubator/abdera/java/branches/server_refactor_all/examples/src/main/java/org/apache/abdera/examples/appserver/SimpleAdapter.java Sat Jan 26 13:03:55 2008 @@ -82,7 +82,7 @@ private String getFeedBaseUri(RequestContext context) { Map params = new HashMap(); params.put("collection", context.getTarget().getParameter("collection")); - String uri = context.resolveIri(TargetType.TYPE_COLLECTION, params); + String uri = context.urlFor(TargetType.TYPE_COLLECTION, params); return context.getResolvedUri().resolve(uri).toString(); } @@ -189,7 +189,7 @@ Map params = new HashMap(); params.put("collection", request.getTarget().getParameter("collection")); params.put("entry", entryid); - return request.resolveIri(TargetType.TYPE_ENTRY, params); + return request.urlFor(TargetType.TYPE_ENTRY, params); } public ResponseContext putEntry( Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Provider.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Provider.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Provider.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/Provider.java Sat Jan 26 13:03:55 2008 @@ -40,7 +40,7 @@ Target resolveTarget(RequestContext request); - String resolveIri(RequestContext request, Object key, Object param); + String urlFor(RequestContext request, Object key, Object param); ResponseContext process(RequestContext request); Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/RequestContext.java Sat Jan 26 13:03:55 2008 @@ -113,7 +113,7 @@ */ String getTargetBasePath(); - String resolveIri(Object key, Object param); + String urlFor(Object key, Object param); - String resolveAbsoluteIri(Object key, Object param); + String absoluteUrlFor(Object key, Object param); } Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/TargetBuilder.java Sat Jan 26 13:03:55 2008 @@ -9,6 +9,6 @@ */ public interface TargetBuilder { - String resolveIri(RequestContext context, Object key, Object param); + String urlFor(RequestContext context, Object key, Object param); } Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/AbstractRequestContext.java Sat Jan 26 13:03:55 2008 @@ -157,16 +157,16 @@ return setAttribute(Scope.REQUEST, name, value); } - public String resolveIri( + public String urlFor( Object key, Object param) { - return provider.resolveIri(this, key, param); + return provider.urlFor(this, key, param); } - public String resolveAbsoluteIri( + public String absoluteUrlFor( Object key, Object param) { return getResolvedUri().resolve( - resolveIri(key,param)).toString(); + urlFor(key,param)).toString(); } } Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/context/RequestContextWrapper.java Sat Jan 26 13:03:55 2008 @@ -275,19 +275,19 @@ return request.isNoTransform(); } - public String resolveIri(Object key, Object param) { - return getProvider().resolveIri(this, key, param); + public String urlFor(Object key, Object param) { + return getProvider().urlFor(this, key, param); } public String getTargetBasePath() { return request.getTargetBasePath(); } - public String resolveAbsoluteIri( + public String absoluteUrlFor( Object key, Object param) { return request.getResolvedUri().resolve( - resolveIri(key,param)).toString(); + urlFor(key,param)).toString(); } } Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/AbstractProvider.java Sat Jan 26 13:03:55 2008 @@ -86,12 +86,12 @@ targetResolver.resolve(request) : null; } - public String resolveIri( + public String urlFor( RequestContext request, Object key, Object param) { TargetBuilder tm = getTargetBuilder(request); - return tm != null ? tm.resolveIri(request, key, param) : null; + return tm != null ? tm.urlFor(request, key, param) : null; } protected Resolver getSubjectResolver(RequestContext request) { Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/StructuredTargetResolver.java Sat Jan 26 13:03:55 2008 @@ -140,7 +140,7 @@ } } - public String resolveIri( + public String urlFor( RequestContext request, Object key, Object param) { @@ -153,7 +153,7 @@ new StructuredContext( TemplateTargetBuilder.getContext(request, param), collection); - return super.resolveIri(request, key, context); + return super.urlFor(request, key, context); } @SuppressWarnings("unchecked") Modified: incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/main/java/org/apache/abdera/protocol/server/impl/TemplateTargetBuilder.java Sat Jan 26 13:03:55 2008 @@ -68,7 +68,7 @@ return list; } - public String resolveIri( + public String urlFor( RequestContext request, Object key, Object param) { Modified: incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java URL: http://svn.apache.org/viewvc/incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java?rev=615491&r1=615490&r2=615491&view=diff ============================================================================== --- incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java (original) +++ incubator/abdera/java/branches/server_refactor_all/server/src/test/java/org/apache/abdera/protocol/server/test/custom/SimpleAdapter.java Sat Jan 26 13:03:55 2008 @@ -82,7 +82,7 @@ private String getFeedBaseUri(RequestContext context) { Map params = new HashMap(); params.put("collection", context.getTarget().getParameter("collection")); - String uri = context.resolveIri(TargetType.TYPE_COLLECTION, params); + String uri = context.urlFor(TargetType.TYPE_COLLECTION, params); return context.getResolvedUri().resolve(uri).toString(); } @@ -189,7 +189,7 @@ Map params = new HashMap(); params.put("collection", request.getTarget().getParameter("collection")); params.put("entry", entryid); - return request.resolveIri(TargetType.TYPE_ENTRY, params); + return request.urlFor(TargetType.TYPE_ENTRY, params); } public ResponseContext putEntry(