incubator-isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject svn commit: r1139828 - in /incubator/isis/trunk/examples/claims: pom.xml quickrun/pom.xml viewer-restful/pom.xml viewer-restful/src/main/webapp/WEB-INF/web.xml
Date Sun, 26 Jun 2011 16:12:53 GMT
Author: danhaywood
Date: Sun Jun 26 16:12:53 2011
New Revision: 1139828

URL: http://svn.apache.org/viewvc?rev=1139828&view=rev
Log:
fixing examples/claims to run with json viewer

Modified:
    incubator/isis/trunk/examples/claims/pom.xml
    incubator/isis/trunk/examples/claims/quickrun/pom.xml
    incubator/isis/trunk/examples/claims/viewer-restful/pom.xml
    incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml

Modified: incubator/isis/trunk/examples/claims/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/pom.xml?rev=1139828&r1=1139827&r2=1139828&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/pom.xml Sun Jun 26 16:12:53 2011
@@ -191,10 +191,16 @@
 
 			<dependency>
 				<groupId>${project.groupId}</groupId>
-				<artifactId>viewer-restful</artifactId>
+				<artifactId>viewer-json</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 
+            <dependency>
+                <groupId>${project.groupId}</groupId>
+                <artifactId>viewer-xhtml</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
 			<dependency>
 				<groupId>${project.groupId}</groupId>
 				<artifactId>tests-bdd</artifactId>
@@ -509,20 +515,37 @@
                 <version>${isis.version}</version>
             </dependency>
 
-            <!-- isis: viewer: restful -->
+            <!-- isis: viewer: json -->
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>json</artifactId>
+                <version>${isis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>json-applib</artifactId>
+                <version>${isis.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.isis.viewer</groupId>
+                <artifactId>json-viewer</artifactId>
+                <version>${isis.version}</version>
+            </dependency>
+
+            <!-- isis: viewer: xhtml -->
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>restful</artifactId>
+                <artifactId>xhtml</artifactId>
                 <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>restful-applib</artifactId>
+                <artifactId>xhtml-applib</artifactId>
                 <version>${isis.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.apache.isis.viewer</groupId>
-                <artifactId>restful-viewer2</artifactId>
+                <artifactId>xhtml-viewer</artifactId>
                 <version>${isis.version}</version>
             </dependency>
 

Modified: incubator/isis/trunk/examples/claims/quickrun/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/quickrun/pom.xml?rev=1139828&r1=1139827&r2=1139828&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/quickrun/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/quickrun/pom.xml Sun Jun 26 16:12:53 2011
@@ -93,7 +93,11 @@
 		</dependency>
         <dependency>
             <groupId>org.apache.isis.viewer</groupId>
-            <artifactId>restful-viewer2</artifactId>
+            <artifactId>json-viewer</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.isis.viewer</groupId>
+            <artifactId>xhtml-viewer</artifactId>
         </dependency>
 
         <!-- JUnit Viewer dependencies -->

Modified: incubator/isis/trunk/examples/claims/viewer-restful/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-restful/pom.xml?rev=1139828&r1=1139827&r2=1139828&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-restful/pom.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-restful/pom.xml Sun Jun 26 16:12:53 2011
@@ -59,7 +59,7 @@
 		<!-- Isis -->
 		<dependency>
 	        <groupId>org.apache.isis.viewer</groupId>
-			<artifactId>restful-viewer2</artifactId>
+			<artifactId>json-viewer</artifactId>
 		</dependency>
 
         <!-- isis runtime -->

Modified: incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml?rev=1139828&r1=1139827&r2=1139828&view=diff
==============================================================================
--- incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml (original)
+++ incubator/isis/trunk/examples/claims/viewer-restful/src/main/webapp/WEB-INF/web.xml Sun
Jun 26 16:12:53 2011
@@ -26,7 +26,7 @@
 
 	<context-param>
 		<param-name>javax.ws.rs.Application</param-name>
-		<param-value>org.apache.isis.viewer.restful.viewer2.RestfulApplication</param-value>
+		<param-value>org.apache.isis.viewer.json.viewer.JsonApplication</param-value>
 	</context-param>
 
 	<filter>
@@ -35,7 +35,7 @@
         <init-param>
             <!-- trusted client, so no authentication required -->
             <param-name>authenticationSessionLookupStrategy</param-name>
-            <param-value>org.apache.isis.viewer.restful.viewer2.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
+            <param-value>org.apache.isis.viewer.json.viewer.authentication.AuthenticationSessionLookupStrategyTrusted</param-value>
         </init-param>
 	</filter>
 



Mime
View raw message