incubator-ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1031267 - in /incubator/ace/trunk: ace-target-devserver/pom.xml pom.xml
Date Thu, 04 Nov 2010 21:37:39 GMT
Author: marrs
Date: Thu Nov  4 21:37:39 2010
New Revision: 1031267

URL: http://svn.apache.org/viewvc?rev=1031267&view=rev
Log:
Added the Vaadin UI.

Modified:
    incubator/ace/trunk/ace-target-devserver/pom.xml
    incubator/ace/trunk/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=1031267&r1=1031266&r2=1031267&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Thu Nov  4 21:37:39 2010
@@ -22,13 +22,14 @@
     <modelVersion>4.0.0</modelVersion>
 
 	<!-- for Knopflerfish files -->
+	<!--
 	<repositories>
 	    <repository>
 	      <id>okidokiteam-3rdparty</id>
 	      <url>http://okidokiteam.com/nexus/content/repositories/thirdparty/</url>
 	    </repository>
 	</repositories>
-	
+	-->
 
     <parent>
         <groupId>org.apache.ace</groupId>
@@ -111,6 +112,7 @@
             <scope>provided</scope>
         </dependency>
 
+        <!-- 
         <dependency>
             <groupId>org.apache.felix</groupId>
             <artifactId>org.apache.felix.shell</artifactId>
@@ -124,7 +126,8 @@
 			<version>1.4.1</version>
             <scope>provided</scope>
         </dependency>
-
+ -->
+ 
 		<!-- TODO the following artifact names are purely fictional, we need to
 		          check if they actually exist somewhere -->
 
@@ -285,15 +288,6 @@
             <scope>runtime</scope>
         </dependency>
 
-		<!--
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>ace-distribution-servlet</artifactId>
-            <version>${project.version}</version>
-            <scope>runtime</scope>
-        </dependency>
-		-->
-
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ace-httplistener</artifactId>
@@ -400,7 +394,7 @@
             <scope>runtime</scope>
         </dependency>
 
-		<!-- experimental, please leave this in for now
+		<!-- experimental, please leave this in for now -->
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>ace-webui-vaadin</artifactId>
@@ -411,9 +405,18 @@
         <dependency>
             <groupId>com.vaadin</groupId>
             <artifactId>vaadin</artifactId>
-            <version>6.4.1</version>
+            <version>6.4.6</version>
+            <scope>runtime</scope>
+        </dependency>
+
+		<!-- work in progress, not done yet
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ace-distribution-servlet</artifactId>
+            <version>${project.version}</version>
             <scope>runtime</scope>
         </dependency>
 		-->
+
     </dependencies>
 </project>
\ No newline at end of file

Modified: incubator/ace/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom.xml?rev=1031267&r1=1031266&r2=1031267&view=diff
==============================================================================
--- incubator/ace/trunk/pom.xml (original)
+++ incubator/ace/trunk/pom.xml Thu Nov  4 21:37:39 2010
@@ -83,9 +83,6 @@
                 <module>ace-deployment-deploymentadmin</module>
                 <module>ace-deployment-task</module>
 
-				<!--
-                <module>ace-distribution-servlet</module>
-				-->
 
                 <module>ace-httplistener</module>
 
@@ -114,7 +111,16 @@
 
                 <module>ace-gateway-log</module>
                 <module>ace-gateway-log-store</module>
+				<!--
                 <module>ace-webui</module>
+				-->
+				<!-- extras -->
+                <module>ace-webui-vaadin</module>
+
+				<!-- not ready yet
+                <module>ace-distribution-servlet</module>
+				-->
+
             </modules>
         </profile>
         <profile>



Mime
View raw message