Author: markt
Date: Thu Jan 17 21:22:21 2013
New Revision: 1434920
URL: http://svn.apache.org/viewvc?rev=1434920&view=rev
Log:
Move POJO related classes to separate package
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java (with
props)
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
(with props)
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpointConfiguration.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncString.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicPong.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicString.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
- copied, changed from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
- copied, changed from r1434904,
tomcat/trunk/test/org/apache/tomcat/websocket/TestPojoUriTemplate.java
Removed:
tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpointConfiguration.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncString.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBase.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBinary.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicPong.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicString.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java
tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java
tomcat/trunk/test/org/apache/tomcat/websocket/TestPojoUriTemplate.java
Modified:
tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java
tomcat/trunk/res/checkstyle/org-import-control.xml
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java?rev=1434920&r1=1434919&r2=1434920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java Thu
Jan 17 21:22:21 2013
@@ -31,6 +31,8 @@ import javax.websocket.server.ServerEndp
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
import org.apache.tomcat.util.res.StringManager;
+import org.apache.tomcat.websocket.pojo.PojoEndpointConfiguration;
+import org.apache.tomcat.websocket.pojo.PojoMethodMapping;
/**
* Provides a per class loader (i.e. per web application) instance of a
Added: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java?rev=1434920&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java (added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java Thu Jan
17 21:22:21 2013
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.tomcat.websocket.pojo;
+
+/**
+ * Internal implementation constants.
+ */
+public class Constants {
+
+ protected static final String PACKAGE_NAME =
+ Constants.class.getPackage().getName();
+
+
+ private Constants() {
+ // Hide default constructor
+ }
+}
Propchange: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/Constants.java
------------------------------------------------------------------------------
svn:eol-style = native
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties?rev=1434920&view=auto
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
(added)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
Thu Jan 17 21:22:21 2013
@@ -0,0 +1,15 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+pojoUriTemplate.noMatch=The input template [{0}] generated the pattern [{1}]
which did not match the supplied pathInfo [{2}]
Propchange:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/LocalStrings.properties
------------------------------------------------------------------------------
svn:eol-style = native
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java
(from r1434902, tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpoint.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpoint.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpoint.java Thu
Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpointConfiguration.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpointConfiguration.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoEndpointConfiguration.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoEndpointConfiguration.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import javax.websocket.server.DefaultServerConfiguration;
@@ -31,7 +31,7 @@ public class PojoEndpointConfiguration e
private final String pathInfo;
- PojoEndpointConfiguration(Class<?> pojoClass,
+ public PojoEndpointConfiguration(Class<?> pojoClass,
PojoMethodMapping methodMapping, String pathInfo) {
super(PojoEndpoint.class, methodMapping.getWsPath());
this.pojoClass = pojoClass;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBase.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBase.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBinary.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBinary.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncBinary.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncString.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncString.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerAsyncString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerAsyncString.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBase.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBase.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.io.IOException;
import java.lang.reflect.Method;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBase.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBase.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBase.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBase.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBinary.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBinary.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicBinary.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicBinary.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
import java.nio.ByteBuffer;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicPong.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicPong.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicPong.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicPong.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicString.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicString.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/tomcat/websocket/PojoMessageHandlerBasicString.java
(original)
+++
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMessageHandlerBasicString.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.reflect.Method;
Copied:
tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java (from
r1434902, tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoMethodMapping.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoMethodMapping.java
Thu Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.lang.annotation.Annotation;
import java.lang.reflect.Method;
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoPathParam.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoPathParam.java Thu
Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
/**
* Stores the parameter type and name for a parameter that needs to be passed
to
Copied: tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java
(from r1434902,
tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java?p2=tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java&p1=tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java&r1=1434902&r2=1434920&rev=1434920&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/PojoUriTemplate.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/pojo/PojoUriTemplate.java Thu
Jan 17 21:22:21 2013
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.util.ArrayList;
import java.util.HashMap;
@@ -81,7 +81,7 @@ public class PojoUriTemplate {
Matcher m = pattern.matcher(pathInfo);
if (!m.matches()) {
throw new IllegalArgumentException(sm.getString(
- "uriTemplate.noMatch", template, pattern, pathInfo));
+ "pojoUriTemplate.noMatch", template, pattern, pathInfo));
}
int group = 2;
for (String name : names) {
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1434920&r1=1434919&r2=1434920&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Thu Jan 17 21:22:21 2013
@@ -142,6 +142,8 @@
<allow pkg="javax.websocket"/>
<allow pkg="org.apache.juli"/>
<allow pkg="org.apache.tomcat.util"/>
+ <!-- Ideally want to remove this -->
+ <allow pkg="org.apache.tomcat.websocket.pojo"/>
</subpackage>
</subpackage>
</import-control>
\ No newline at end of file
Copied:
tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
(from r1434904,
tomcat/trunk/test/org/apache/tomcat/websocket/TestPojoUriTemplate.java)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java?p2=tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java&p1=tomcat/trunk/test/org/apache/tomcat/websocket/TestPojoUriTemplate.java&r1=1434904&r2=1434920&rev=1434920&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestPojoUriTemplate.java
(original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/pojo/TestPojoUriTemplate.java
Thu Jan 17 21:22:21 2013
@@ -14,12 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.tomcat.websocket;
+package org.apache.tomcat.websocket.pojo;
import java.util.Map;
-import junit.framework.Assert;
-
+import org.junit.Assert;
import org.junit.Test;
public class TestPojoUriTemplate {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
