Author: heiko.braun(a)jboss.com Date: 2007-11-19 10:51:23 -0500 (Mon, 19 Nov 2007) New Revision: 5067 Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceLocator.java stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModelParser.java Log: Fix subresources patterns Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java =================================================================== --- stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java 2007-11-19 15:23:28 UTC (rev 5066) +++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/AbstractRegexResolveable.java 2007-11-19 15:51:23 UTC (rev 5067) @@ -56,6 +56,14 @@ String tok = tokenizer.nextToken(); if(isUriParam(tok)) { + + if(groupIndex>1) + { + // i.e. 'spec/{name}' + patternBuffer.append("(/)"); + groupIndex++; + } + if(handler != null) { // register uri param callback @@ -63,6 +71,7 @@ handler.newUriParam(groupIndex, paramName); } + patternBuffer.append( regexFromUriParam(tok) ); } else Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceLocator.java =================================================================== --- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceLocator.java 2007-11-19 15:23:28 UTC (rev 5066) +++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceLocator.java 2007-11-19 15:51:23 UTC (rev 5067) @@ -100,4 +100,9 @@ { return new OperationBinding(this.invocationTarget); } + + + public String toString() { + return "ResourceLocator{uri="+uriTemplate+", regex="+regexPattern+"}"; + } } Modified: stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModelParser.java =================================================================== --- stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModelParser.java 2007-11-19 15:23:28 UTC (rev 5066) +++ stack/native/branches/rest/src/main/java/org/jboss/rs/model/ResourceModelParser.java 2007-11-19 15:51:23 UTC (rev 5067) @@ -83,6 +83,12 @@ log.debug(rm); } + // log locators methods + for(ResourceLocator loc : resource.getResourceLocator()) + { + log.debug(loc); + } + // freeze sub resource methods for(ResourceMethod srm : resource.getSubResourceMethods()) { @@ -120,7 +126,7 @@ { ResourceModel subResource = new ResourceModel(resource, uri.value(), method.getReturnType()); ResourceLocator locator = new ResourceLocator(method, subResource); - locator.freeze(); + locator.freeze(); resource.addSubResourceLocator(locator); // recursive