svn commit: r658925 - in /tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json: JSONArray.java JSONObject.java JSONString.java JSONTokener.java json/JSONArray.java json/JSONObject.java json/JSONString.java json/JSONTokener.java

[hlship]

Author: hlship
Date: Wed May 21 16:05:13 2008
New Revision: 658925

URL: http://svn.apache.org/viewvc?rev=658925&view=rev
Log:
TAPESTRY-2421: Allow Tapestry4/Tapestry5 to be deployed in the same WAR

Added:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONArray.java
      - copied unchanged from r658911, 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONArray.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONObject.java
      - copied unchanged from r658911, 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONObject.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONString.java
      - copied unchanged from r658911, 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONString.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/JSONTokener.java
      - copied unchanged from r658911, 
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONTokener.java
Removed:
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONArray.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONObject.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONString.java
    
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/json/json/JSONTokener.java