Author: markt Date: Fri Feb 15 19:42:52 2013 New Revision: 1446743 URL: http://svn.apache.org/r1446743 Log: Move UriTemplate to server package since that is where it is used.
Added: tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java - copied, changed from r1446738, tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java - copied, changed from r1446738, tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java Removed: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java tomcat/trunk/test/org/apache/tomcat/websocket/pojo/ Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java Modified: tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java?rev=1446743&r1=1446742&r2=1446743&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/ServerContainerImpl.java Fri Feb 15 19:42:52 2013 @@ -36,7 +36,6 @@ import org.apache.tomcat.websocket.WsSes import org.apache.tomcat.websocket.WsWebSocketContainer; import org.apache.tomcat.websocket.pojo.PojoEndpointConfiguration; import org.apache.tomcat.websocket.pojo.PojoMethodMapping; -import org.apache.tomcat.websocket.pojo.UriTemplate; /** * Provides a per class loader (i.e. per web application) instance of a Copied: tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java (from r1446738, tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java&r1=1446738&r2=1446743&rev=1446743&view=diff ============================================================================== --- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/UriTemplate.java (original) +++ tomcat/trunk/java/org/apache/tomcat/websocket/server/UriTemplate.java Fri Feb 15 19:42:52 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomcat.websocket.pojo; +package org.apache.tomcat.websocket.server; import java.util.ArrayList; import java.util.Collections; @@ -32,7 +32,9 @@ import org.apache.tomcat.util.res.String */ public class UriTemplate { - private static StringManager sm = StringManager.getManager(Constants.PACKAGE_NAME); + private static StringManager sm = + StringManager.getManager(Constants.PACKAGE_NAME); + private final String template; private final Pattern pattern; private final List<String> names = new ArrayList<>(); Copied: tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java (from r1446738, tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java) URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java&p1=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java&r1=1446738&r2=1446743&rev=1446743&view=diff ============================================================================== --- tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestUriTemplate.java (original) +++ tomcat/trunk/test/org/apache/tomcat/websocket/server/TestUriTemplate.java Fri Feb 15 19:42:52 2013 @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.tomcat.websocket.pojo; +package org.apache.tomcat.websocket.server; import java.util.Map; --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org