incubator-sling-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r590982 - in /incubator/sling/trunk: content/ content/src/main/java/org/apache/sling/content/jcr/internal/json/ content/src/main/java/org/apache/sling/content/jcr/internal/loader/ content/src/test/java/org/apache/sling/content/jcr/internal/...
Date Thu, 01 Nov 2007 12:43:17 GMT
Author: cziegeler
Date: Thu Nov  1 05:43:13 2007
New Revision: 590982

URL: http://svn.apache.org/viewvc?rev=590982&view=rev
Log:
Use new sling-json library and remove own copies.

Removed:
    incubator/sling/trunk/content/src/main/java/org/apache/sling/content/jcr/internal/json/
    incubator/sling/trunk/webmanager/src/main/java/org/json/
Modified:
    incubator/sling/trunk/content/pom.xml
    incubator/sling/trunk/content/src/main/java/org/apache/sling/content/jcr/internal/loader/JsonReader.java
    incubator/sling/trunk/content/src/test/java/org/apache/sling/content/jcr/internal/loader/JsonReaderTest.java
    incubator/sling/trunk/webmanager/pom.xml
    incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java
    incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxConfigManagerAction.java

Modified: incubator/sling/trunk/content/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/content/pom.xml?rev=590982&r1=590981&r2=590982&view=diff
==============================================================================
--- incubator/sling/trunk/content/pom.xml (original)
+++ incubator/sling/trunk/content/pom.xml Thu Nov  1 05:43:13 2007
@@ -141,6 +141,11 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
+            <artifactId>sling-json</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.sling</groupId>
             <artifactId>sling-jackrabbit-api</artifactId>
             <version>2.0.0-incubator-SNAPSHOT</version>
         </dependency>

Modified: incubator/sling/trunk/content/src/main/java/org/apache/sling/content/jcr/internal/loader/JsonReader.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/content/src/main/java/org/apache/sling/content/jcr/internal/loader/JsonReader.java?rev=590982&r1=590981&r2=590982&view=diff
==============================================================================
--- incubator/sling/trunk/content/src/main/java/org/apache/sling/content/jcr/internal/loader/JsonReader.java
(original)
+++ incubator/sling/trunk/content/src/main/java/org/apache/sling/content/jcr/internal/loader/JsonReader.java
Thu Nov  1 05:43:13 2007
@@ -25,9 +25,9 @@
 import javax.jcr.PropertyType;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.sling.content.jcr.internal.json.JSONArray;
-import org.apache.sling.content.jcr.internal.json.JSONException;
-import org.apache.sling.content.jcr.internal.json.JSONObject;
+import org.apache.sling.json.JSONArray;
+import org.apache.sling.json.JSONException;
+import org.apache.sling.json.JSONObject;
 
 
 /**

Modified: incubator/sling/trunk/content/src/test/java/org/apache/sling/content/jcr/internal/loader/JsonReaderTest.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/content/src/test/java/org/apache/sling/content/jcr/internal/loader/JsonReaderTest.java?rev=590982&r1=590981&r2=590982&view=diff
==============================================================================
--- incubator/sling/trunk/content/src/test/java/org/apache/sling/content/jcr/internal/loader/JsonReaderTest.java
(original)
+++ incubator/sling/trunk/content/src/test/java/org/apache/sling/content/jcr/internal/loader/JsonReaderTest.java
Thu Nov  1 05:43:13 2007
@@ -30,10 +30,9 @@
 
 import junit.framework.TestCase;
 
-import org.apache.sling.content.jcr.internal.json.JSONArray;
-import org.apache.sling.content.jcr.internal.json.JSONException;
-import org.apache.sling.content.jcr.internal.json.JSONObject;
-
+import org.apache.sling.json.JSONArray;
+import org.apache.sling.json.JSONException;
+import org.apache.sling.json.JSONObject;
 
 public class JsonReaderTest extends TestCase {
 

Modified: incubator/sling/trunk/webmanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/webmanager/pom.xml?rev=590982&r1=590981&r2=590982&view=diff
==============================================================================
--- incubator/sling/trunk/webmanager/pom.xml (original)
+++ incubator/sling/trunk/webmanager/pom.xml Thu Nov  1 05:43:13 2007
@@ -66,9 +66,6 @@
                         <Private-Package>
                             org.apache.sling.console.web.*,
                             
-                            <!-- Ajax Data Exchange -->
-                            org.json,
-                            
                             <!-- File Upload functionality -->
                             org.apache.commons.fileupload,
                             org.apache.commons.fileupload.disk,
@@ -114,5 +111,11 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.apache.sling</groupId>
+            <artifactId>sling-json</artifactId>
+            <version>2.0.0-incubator-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 </project>

Modified: incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java?rev=590982&r1=590981&r2=590982&view=diff
==============================================================================
--- incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java
(original)
+++ incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxBundleDetailsAction.java
Thu Nov  1 05:43:13 2007
@@ -24,9 +24,9 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.apache.sling.json.JSONArray;
+import org.apache.sling.json.JSONException;
+import org.apache.sling.json.JSONObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.ServiceReference;
@@ -144,7 +144,7 @@
                         val.append(ep.getName());
                         val.append(",version=").append(ep.getVersion());
                         val.append(" from ");
-                        
+
                         if (ep.getExportingBundle().getSymbolicName() != null) {
                             // list the bundle name if not null
                             val.append(ep.getExportingBundle().getSymbolicName());

Modified: incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxConfigManagerAction.java
URL: http://svn.apache.org/viewvc/incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxConfigManagerAction.java?rev=590982&r1=590981&r2=590982&view=diff
==============================================================================
--- incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxConfigManagerAction.java
(original)
+++ incubator/sling/trunk/webmanager/src/main/java/org/apache/sling/console/web/internal/AjaxConfigManagerAction.java
Thu Nov  1 05:43:13 2007
@@ -34,9 +34,9 @@
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.sling.console.web.Action;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import org.apache.sling.json.JSONArray;
+import org.apache.sling.json.JSONException;
+import org.apache.sling.json.JSONObject;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.Constants;
 import org.osgi.framework.InvalidSyntaxException;



Mime
View raw message