[portal-commits] JBoss Portal SVN: r12311 - in modules/presentation/trunk: portal/src/assemble and 1 other directory.

[portal-commits at lists.jboss.org]

Author: chris.laprun at jboss.com
Date: 2008-11-27 12:16:27 -0500 (Thu, 27 Nov 2008)
New Revision: 12311

Modified:
   modules/presentation/trunk/ajax/pom.xml
   modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml
Log:
- Use gwt-servlet instead of gwt-user.
- Re-add MC kernel that got removed for some reason. Without it, it won't deploy with gwt-servlet. Not sure why it was deploying with gwt-user.

Modified: modules/presentation/trunk/ajax/pom.xml
===================================================================
--- modules/presentation/trunk/ajax/pom.xml	2008-11-27 13:06:10 UTC (rev 12310)
+++ modules/presentation/trunk/ajax/pom.xml	2008-11-27 17:16:27 UTC (rev 12311)
@@ -31,6 +31,11 @@
       </dependency>
 
       <dependency>
+         <groupId>com.google.gwt</groupId>
+         <artifactId>gwt-servlet</artifactId>
+      </dependency>
+
+      <dependency>
          <groupId>org.jboss.portal.common</groupId>
          <artifactId>common-common</artifactId>
       </dependency>
@@ -139,7 +144,7 @@
                   <classifier>${gwt.os}</classifier>
                   <scope>provided</scope>
                </dependency>
-            </dependencies>            
+            </dependencies>
             <executions>
                <execution>
                   <id>package</id>

Modified: modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml
===================================================================
--- modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml	2008-11-27 13:06:10 UTC (rev 12310)
+++ modules/presentation/trunk/portal/src/assemble/presentation-portal-war.xml	2008-11-27 17:16:27 UTC (rev 12311)
@@ -53,15 +53,13 @@
             <include>org.jboss.portal.presentation:presentation-classic</include>
 
             <include>org.jboss.portal.presentation:presentation-ajax</include >
-            <include>com.google.gwt:gwt-user</include>
+            <include>com.google.gwt:gwt-servlet</include>
 
             <include>javax.ccpp:ccpp</include>
             <include>javax.portlet:portlet-api</include>
 
             <include>org.jboss:jboss-common-core</include>
-            <!-- 
             <include>org.jboss.microcontainer:jboss-kernel</include>
-             -->
             <include>org.jboss.microcontainer:jboss-dependency</include>
             <include>org.jboss:jboss-reflect</include>
             <include>org.jboss:jboss-mdr</include>