You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2011/06/26 17:17:48 UTC
svn commit: r1139810 [2/2] - in /incubator/isis/trunk/viewer/json: applib/src/main/java/META-INF/ applib/src/main/java/org/apache/isis/viewer/json/ applib/src/main/java/org/apache/isis/viewer/json/applib/ applib/src/main/java/org/apache/isis/viewer/res...

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/resources/services/ServicesResourceImpl.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/resources/services/ServicesResourceImpl.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.resources.services;
+package org.apache.isis.viewer.json.viewer.resources.services;
 
 import java.util.List;
 
@@ -24,11 +24,11 @@ import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
-import org.apache.isis.viewer.restful.applib2.resources.ServicesResource;
-import org.apache.isis.viewer.restful.viewer2.RepContext;
-import org.apache.isis.viewer.restful.viewer2.representations.Representation;
-import org.apache.isis.viewer.restful.viewer2.resources.ResourceAbstract;
-import org.apache.isis.viewer.restful.viewer2.resources.objects.DomainObjectRepBuilder;
+import org.apache.isis.viewer.json.viewer.RepContext;
+import org.apache.isis.viewer.json.viewer.representations.Representation;
+import org.apache.isis.viewer.json.viewer.resources.ResourceAbstract;
+import org.apache.isis.viewer.json.viewer.resources.objects.DomainObjectRepBuilder;
+import org.apache.isis.viewer.xhtml.applib.resources.ServicesResource;
 
 import com.google.common.base.Function;
 import com.google.common.base.Functions;

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ActionUtils.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ActionUtils.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 import java.util.List;
 

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/InputStreamUtil.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/InputStreamUtil.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/InputStreamUtil.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/InputStreamUtil.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/InputStreamUtil.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ListUtils.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ListUtils.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ListUtils.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/ListUtils.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/ListUtils.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 import java.util.ArrayList;
 import java.util.List;

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/OidUtils.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/OidUtils.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/OidUtils.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/OidUtils.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/OidUtils.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.oid.Oid;

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/PathUtils.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/PathUtils.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/PathUtils.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/PathUtils.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/PathUtils.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 import javax.servlet.http.HttpServletRequest;
 

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/StringUtil.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/StringUtil.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/StringUtil.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/StringUtil.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/StringUtil.java Sun Jun 26 15:17:45 2011
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 public final class StringUtil {
 

Copied: incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/UrlDecoderUtils.java (from r1139802, incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java)
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/UrlDecoderUtils.java?p2=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/UrlDecoderUtils.java&p1=incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java&r1=1139802&r2=1139810&rev=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/restful/viewer2/util/UrlDecoderUtils.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/main/java/org/apache/isis/viewer/json/viewer/util/UrlDecoderUtils.java Sun Jun 26 15:17:45 2011
@@ -16,14 +16,14 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
-package org.apache.isis.viewer.restful.viewer2.util;
+package org.apache.isis.viewer.json.viewer.util;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
 import javax.ws.rs.WebApplicationException;
 
-import org.apache.isis.viewer.restful.viewer2.Constants;
+import org.apache.isis.viewer.json.viewer.Constants;
 
 public final class UrlDecoderUtils {
 

Modified: incubator/isis/trunk/viewer/json/viewer/src/test/java/org/apache/isis/viewer/restful/viewer2/RepresentationContextTest_relFor.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/viewer/json/viewer/src/test/java/org/apache/isis/viewer/restful/viewer2/RepresentationContextTest_relFor.java?rev=1139810&r1=1139809&r2=1139810&view=diff
==============================================================================
--- incubator/isis/trunk/viewer/json/viewer/src/test/java/org/apache/isis/viewer/restful/viewer2/RepresentationContextTest_relFor.java (original)
+++ incubator/isis/trunk/viewer/json/viewer/src/test/java/org/apache/isis/viewer/restful/viewer2/RepresentationContextTest_relFor.java Sun Jun 26 15:17:45 2011
@@ -19,6 +19,7 @@ package org.apache.isis.viewer.restful.v
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
 
+import org.apache.isis.viewer.json.viewer.RepContext;
 import org.junit.Test;