Author: markt
Date: Thu Aug 15 21:46:11 2013
New Revision: 1514510
URL: http://svn.apache.org/r1514510
Log:
Revert 1514505. On reflection, an svn copy is a better way to do this as it
makes the history easier to read.
Removed:
tomcat/tc7.0.x/trunk/java/javax/websocket/
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Reverse-merged /tomcat/trunk:r1412268
Modified: tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml?rev=1514510&r1=1514509&r2=1514510&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml (original)
+++ tomcat/tc7.0.x/trunk/res/checkstyle/javax-import-control.xml Thu Aug 15
21:46:11 2013
@@ -33,10 +33,6 @@
<subpackage name="mail">
<allow pkg="javax.mail"/>
</subpackage>
- <subpackage name="websocket">
- <allow pkg="javax.websocket"/>
- <allow pkg="javax.websocket.extensions"/>
- </subpackage>
<subpackage name="persistence">
<allow pkg="javax.persistence"/>
</subpackage>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
