Return-Path: 
 <ace-commits-return-638-apmail-incubator-ace-commits-archive=incubator.apache.org@incubator.apache.org>
Delivered-To: apmail-incubator-ace-commits-archive@minotaur.apache.org
Received: (qmail 26951 invoked from network); 2 Mar 2011 00:48:01 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3)
  by minotaur.apache.org with SMTP; 2 Mar 2011 00:48:01 -0000
Received: (qmail 34152 invoked by uid 500); 2 Mar 2011 00:48:01 -0000
Delivered-To: apmail-incubator-ace-commits-archive@incubator.apache.org
Received: (qmail 34047 invoked by uid 500); 2 Mar 2011 00:48:01 -0000
Mailing-List: contact ace-commits-help@incubator.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:ace-commits-help@incubator.apache.org>
List-Unsubscribe: <mailto:ace-commits-unsubscribe@incubator.apache.org>
List-Post: <mailto:ace-commits@incubator.apache.org>
List-Id: <ace-commits.incubator.apache.org>
Reply-To: ace-dev@incubator.apache.org
Delivered-To: mailing list ace-commits@incubator.apache.org
Received: (qmail 33914 invoked by uid 99); 2 Mar 2011 00:48:01 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 00:48:01 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Mar 2011 00:48:00 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 3DFF023888E7; Wed,  2 Mar 2011 00:47:40 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1076071 - in /incubator/ace/trunk:
 ace-target-devserver/pom.xml
 pom.xml pom/pom.xml
Date: Wed, 02 Mar 2011 00:47:40 -0000
To: ace-commits@incubator.apache.org
From: marrs@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20110302004740.3DFF023888E7@eris.apache.org>

Author: marrs
Date: Wed Mar  2 00:47:39 2011
New Revision: 1076071

URL: http://svn.apache.org/viewvc?rev=1076071&view=rev
Log:
ACE-132 ACE-94 Quick fixes to at least get something going again.

Modified:
    incubator/ace/trunk/ace-target-devserver/pom.xml
    incubator/ace/trunk/pom.xml
    incubator/ace/trunk/pom/pom.xml

Modified: incubator/ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=1076071&r1=1076070&r2=1076071&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Wed Mar  2 00:47:39 2011
@@ -265,13 +265,6 @@
         </dependency>
         <dependency>
             <groupId>org.apache.ace</groupId>
-            <artifactId>org.apache.ace.webui</artifactId>
-            <type>war</type>
-            <scope>runtime</scope>
-        </dependency>
-        <!-- experimental, please leave this in for now -->
-        <dependency>
-            <groupId>org.apache.ace</groupId>
             <artifactId>org.apache.ace.webui.vaadin</artifactId>
             <scope>runtime</scope>
         </dependency>

Modified: incubator/ace/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom.xml?rev=1076071&r1=1076070&r2=1076071&view=diff
==============================================================================
--- incubator/ace/trunk/pom.xml (original)
+++ incubator/ace/trunk/pom.xml Wed Mar  2 00:47:39 2011
@@ -105,8 +105,6 @@
         <module>ace-gateway-log</module>
         <module>ace-gateway-log-store</module>
 
-        <module>ace-webui</module>
-
         <module>ace-webui-vaadin</module>
 
         <module>ace-managementagent</module>
@@ -120,8 +118,9 @@
         <module>ace-distribution-servlet</module>
         -->
 
+<!--
         <module>ace-integrationtests</module>
-
+-->
     </modules>
 
     <profiles>

Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=1076071&r1=1076070&r2=1076071&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Wed Mar  2 00:47:39 2011
@@ -62,7 +62,7 @@
     </mailingLists>
 
     <prerequisites>
-        <maven>3.0.2</maven>
+        <maven>2.2.1</maven>
     </prerequisites>
 
     <developers>
@@ -139,8 +139,6 @@
         <felix.maven-bundle-plugin.version>2.3.4</felix.maven-bundle-plugin.version>
         <felix.prefs.version>1.0.4</felix.prefs.version>
         <felix.shell.version>1.4.1</felix.shell.version>
-        <gwt.version>2.1.0</gwt.version>
-        <gwt-dnd.version>2.6.5</gwt-dnd.version>
         <junit.version>4.4</junit.version>
         <knopflerfish.version>2.0.2</knopflerfish.version>
         <kxml2.version>2.3.0</kxml2.version>
@@ -760,23 +758,6 @@
                 <version>${xstream.version}</version>
             </dependency>
 
-            <!-- GWT -->
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-user</artifactId>
-                <version>${gwt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.gwt</groupId>
-                <artifactId>gwt-servlet</artifactId>
-                <version>${gwt.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>com.google.code.gwt-dnd</groupId>
-                <artifactId>gwt-dnd</artifactId>
-                <version>${gwt-dnd.version}</version>
-            </dependency>
-
             <!-- Vaadin -->
             <dependency>
                 <groupId>com.vaadin</groupId>