You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2012/11/26 11:54:49 UTC
svn commit: r1413550 - in /tomcat/trunk: ./ java/javax/websocket/
java/org/apache/tomcat/websocket/ java/org/apache/websocket/
res/META-INF/tomcat-websocket.jar/
res/META-INF/tomcat-websocket.jar/services/
res/META-INF/websocket-impl.jar/ res/checkstyl...
Author: markt
Date: Mon Nov 26 10:54:46 2012
New Revision: 1413550
URL: http://svn.apache.org/viewvc?rev=1413550&view=rev
Log:
Re-package as per kkolinko's review
Added:
tomcat/trunk/java/org/apache/tomcat/websocket/
- copied from r1413281, tomcat/trunk/java/org/apache/websocket/
tomcat/trunk/res/META-INF/tomcat-websocket.jar/
- copied from r1413281, tomcat/trunk/res/META-INF/websocket-impl.jar/
tomcat/trunk/test/org/apache/tomcat/websocket/
- copied from r1413281, tomcat/trunk/test/org/apache/websocket/
Removed:
tomcat/trunk/java/org/apache/websocket/
tomcat/trunk/res/META-INF/websocket-impl.jar/
tomcat/trunk/test/org/apache/websocket/
Modified:
tomcat/trunk/build.xml
tomcat/trunk/java/javax/websocket/ContainerProvider.java
tomcat/trunk/java/org/apache/tomcat/websocket/ClientContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java
tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java
tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java
tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer
tomcat/trunk/res/checkstyle/org-import-control.xml
tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
Modified: tomcat/trunk/build.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/build.xml?rev=1413550&r1=1413549&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/build.xml (original)
+++ tomcat/trunk/build.xml Mon Nov 26 10:54:46 2012
@@ -89,7 +89,7 @@
<property name="jsp-api.jar" value="${tomcat.build}/lib/jsp-api.jar"/>
<property name="el-api.jar" value="${tomcat.build}/lib/el-api.jar"/>
<property name="websocket-api.jar" value="${tomcat.build}/lib/websocket-api.jar"/>
- <property name="websocket-impl.jar" value="${tomcat.build}/lib/websocket-impl.jar"/>
+ <property name="tomcat-websocket.jar" value="${tomcat.build}/lib/tomcat-websocket.jar"/>
<property name="catalina.jar" value="${tomcat.build}/lib/catalina.jar"/>
<property name="catalina-tribes.jar" value="${tomcat.build}/lib/catalina-tribes.jar"/>
<property name="catalina-ha.jar" value="${tomcat.build}/lib/catalina-ha.jar"/>
@@ -115,7 +115,7 @@
<property name="jsp-api-src.jar" value="${tomcat.src.jars}/jsp-api-src.jar"/>
<property name="el-api-src.jar" value="${tomcat.src.jars}/el-api-src.jar"/>
<property name="websocket-api-src.jar" value="${tomcat.src.jars}/websocket-api-src.jar"/>
- <property name="websocket-impl-src.jar" value="${tomcat.src.jars}/websocket-impl-src.jar"/>
+ <property name="tomcat-websocket-src.jar" value="${tomcat.src.jars}/tomcat-websocket-src.jar"/>
<property name="catalina-src.jar" value="${tomcat.src.jars}/catalina-src.jar"/>
<property name="catalina-tribes-src.jar" value="${tomcat.src.jars}/catalina-tribes-src.jar"/>
<property name="catalina-ha-src.jar" value="${tomcat.src.jars}/catalina-ha-src.jar"/>
@@ -287,8 +287,8 @@
<include name="javax/websocket/**" />
</patternset>
- <patternset id="files.websocket-impl">
- <include name="org/apache/websocket/**" />
+ <patternset id="files.tomcat-websocket">
+ <include name="org/apache/tomcat/websocket/**" />
</patternset>
<patternset id="files.bootstrap">
@@ -382,7 +382,7 @@
<patternset refid="files.el-api" />
<patternset refid="files.servlet-api" />
<patternset refid="files.websocket-api" />
- <patternset refid="files.websocket-impl" />
+ <patternset refid="files.tomcat-websocket" />
<patternset refid="files.tomcat-api" />
<!-- These pattern sets conflict so include files directly
<patternset refid="files.tomcat-coyote" />
@@ -670,10 +670,10 @@
manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
<!-- WebSocket 1.0 implementation JAR File -->
- <jarIt jarfile="${websocket-impl.jar}"
+ <jarIt jarfile="${tomcat-websocket.jar}"
filesDir="${tomcat.classes}"
- filesId="files.websocket-impl"
- meta-inf="${tomcat.manifests}/websocket-impl.jar"/>
+ filesId="files.tomcat-websocket"
+ meta-inf="${tomcat.manifests}/tomcat-websocket.jar"/>
<!-- Bootstrap JAR File -->
<jarIt jarfile="${bootstrap.jar}"
@@ -1723,7 +1723,7 @@ Apache Tomcat ${version} native binaries
<include name="jasper-el.jar"/>
<include name="servlet-api.jar"/>
<include name="websocket-api.jar"/>
- <include name="websocket-impl.jar"/>
+ <include name="tomcat-websocket.jar"/>
<include name="tomcat-coyote.jar"/>
<include name="tomcat-util.jar"/>
</fileset>
@@ -2260,9 +2260,9 @@ Apache Tomcat ${version} native binaries
manifest="${tomcat.manifests}/websocket-api.jar.manifest" />
<!-- WebSocket 1.0 implementation JAR File -->
- <jarIt jarfile="${websocket-impl-src.jar}"
+ <jarIt jarfile="${tomcat-websocket-src.jar}"
filesDir="java"
- filesId="files.websocket-impl" />
+ filesId="files.tomcat-websocket" />
<!-- Bootstrap JAR File -->
<jarIt jarfile="${bootstrap-src.jar}"
Modified: tomcat/trunk/java/javax/websocket/ContainerProvider.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/javax/websocket/ContainerProvider.java?rev=1413550&r1=1413549&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/java/javax/websocket/ContainerProvider.java (original)
+++ tomcat/trunk/java/javax/websocket/ContainerProvider.java Mon Nov 26 10:54:46 2012
@@ -22,7 +22,7 @@ import java.lang.reflect.Method;
public class ContainerProvider {
private static final String CONTAINER_PROVIDER_IMPL =
- "org.apache.websocket.ServerContainerImpl";
+ "org.apache.tomcat.websocket.ServerContainerImpl";
public static ServerContainer getServerContainer() {
// TODO SecurityManager
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/ClientContainerImpl.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/ClientContainerImpl.java?rev=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/ClientContainerImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/ClientContainerImpl.java Mon Nov 26 10:54:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.websocket;
+package org.apache.tomcat.websocket;
import java.net.URI;
import java.util.Set;
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=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/ServerContainerImpl.java Mon Nov 26 10:54:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.websocket;
+package org.apache.tomcat.websocket;
import java.util.Map;
import java.util.WeakHashMap;
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/Util.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/Util.java?rev=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/Util.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/Util.java Mon Nov 26 10:54:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.websocket;
+package org.apache.tomcat.websocket;
class Util {
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java?rev=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsSci.java Mon Nov 26 10:54:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.websocket;
+package org.apache.tomcat.websocket;
import java.util.Set;
Modified: tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java?rev=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/websocket/WsServlet.java Mon Nov 26 10:54:46 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.websocket;
+package org.apache.tomcat.websocket;
public class WsServlet {
Modified: tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer?rev=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer (original)
+++ tomcat/trunk/res/META-INF/tomcat-websocket.jar/services/javax.servlet.ServletContainerInitializer Mon Nov 26 10:54:46 2012
@@ -1 +1 @@
-org.apache.websocket.WsSci
+org.apache.tomcat.websocket.WsSci
Modified: tomcat/trunk/res/checkstyle/org-import-control.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/res/checkstyle/org-import-control.xml?rev=1413550&r1=1413549&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/res/checkstyle/org-import-control.xml (original)
+++ tomcat/trunk/res/checkstyle/org-import-control.xml Mon Nov 26 10:54:46 2012
@@ -137,11 +137,11 @@
<allow pkg="org.apache.tomcat" exact-match="true"/>
</subpackage>
</subpackage>
- </subpackage>
- <subpackage name="websocket">
- <allow pkg="javax.servlet"/>
- <allow pkg="javax.websocket"/>
- <allow pkg="org.apache.juli"/>
- <allow pkg="org.apache.tomcat.util"/>
+ <subpackage name="websocket">
+ <allow pkg="javax.servlet"/>
+ <allow pkg="javax.websocket"/>
+ <allow pkg="org.apache.juli"/>
+ <allow pkg="org.apache.tomcat.util"/>
+ </subpackage>
</subpackage>
</import-control>
\ No newline at end of file
Modified: tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java
URL: http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java?rev=1413550&r1=1413281&r2=1413550&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java (original)
+++ tomcat/trunk/test/org/apache/tomcat/websocket/TestUtil.java Mon Nov 26 10:54:46 2012
@@ -14,10 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.websocket;
-
-import junit.framework.Assert;
+package org.apache.tomcat.websocket;
+import org.junit.Assert;
import org.junit.Test;
public class TestUtil {
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org