ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbono...@apache.org
Subject svn commit: r1073775 - in /incubator/ace/trunk: ace-integrationtests/pom.xml ace-managementagent/pom.xml ace-target-devserver/pom.xml ace-webui-vaadin/pom.xml pom.xml pom/pom.xml
Date Wed, 23 Feb 2011 15:24:07 GMT
Author: jbonofre
Date: Wed Feb 23 15:24:06 2011
New Revision: 1073775

URL: http://svn.apache.org/viewvc?rev=1073775&view=rev
Log:
In preparation for the release, by default, all modules are now built and considered in the
release.

Modified:
    incubator/ace/trunk/ace-integrationtests/pom.xml
    incubator/ace/trunk/ace-managementagent/pom.xml
    incubator/ace/trunk/ace-target-devserver/pom.xml
    incubator/ace/trunk/ace-webui-vaadin/pom.xml
    incubator/ace/trunk/pom.xml
    incubator/ace/trunk/pom/pom.xml

Modified: incubator/ace/trunk/ace-integrationtests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-integrationtests/pom.xml?rev=1073775&r1=1073774&r2=1073775&view=diff
==============================================================================
--- incubator/ace/trunk/ace-integrationtests/pom.xml (original)
+++ incubator/ace/trunk/ace-integrationtests/pom.xml Wed Feb 23 15:24:06 2011
@@ -85,15 +85,6 @@
         </dependency>
 
         <dependency>
-            <groupId>org.knopflerfish.bundle.useradmin</groupId>
-            <artifactId>useradmin_all</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.knopflerfish.bundle.log</groupId>
-            <artifactId>log_all</artifactId>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.ace</groupId>
             <artifactId>ace-scheduler</artifactId>
             <version>${project.version}</version>

Modified: incubator/ace/trunk/ace-managementagent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-managementagent/pom.xml?rev=1073775&r1=1073774&r2=1073775&view=diff
==============================================================================
--- incubator/ace/trunk/ace-managementagent/pom.xml (original)
+++ incubator/ace/trunk/ace-managementagent/pom.xml Wed Feb 23 15:24:06 2011
@@ -31,7 +31,7 @@
     <artifactId>ace-managementagent</artifactId>
     <packaging>bundle</packaging>
 
-    <name>Apache ACE - Management Agent</name>
+    <name>Apache ACE :: Management Agent</name>
 
     <properties>
         <bundle.symbolicName>${namespace}.managementagent</bundle.symbolicName>

Modified: incubator/ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=1073775&r1=1073774&r2=1073775&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Wed Feb 23 15:24:06 2011
@@ -57,14 +57,6 @@
         </plugins>
     </build>
 
-    <repositories>
-        <!-- for Knopflerfish files -->
-        <repository>
-            <id>okidokiteam-3rdparty</id>
-            <url>http://okidokiteam.com/nexus/content/repositories/thirdparty/</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.ops4j.pax.runner</groupId>
@@ -101,50 +93,6 @@
             <artifactId>org.apache.felix.prefs</artifactId>
             <scope>provided</scope>
         </dependency>
-        <!-- 
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.shell</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.shell.tui</artifactId>
-            <scope>provided</scope>
-        </dependency>
- -->
-
-        <!-- TODO the following artifact names are purely fictional, we need to
-                    check if they actually exist somewhere -->
-
-        <dependency>
-            <groupId>org.knopflerfish.bundle.useradmin</groupId>
-            <artifactId>useradmin_all</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.knopflerfish.bundle.log</groupId>
-            <artifactId>log_all</artifactId>
-            <scope>provided</scope>
-        </dependency>
-
-        <!-- For now, let's include a different implementation found in the
-               maven repository. -->
-        <!-- But not the Eclipse ones, as they all have a weird dependency on some
-               Eclipse specific event manager...
-          <dependency>
-              <groupId>org.eclipse.equinox</groupId>
-              <artifactId>useradmin</artifactId>
-          </dependency>
-
-          <dependency>
-              <groupId>org.eclipse.equinox</groupId>
-              <artifactId>log</artifactId>
-          </dependency>
-          -->
-
 
         <!-- TODO validate if these are the right artifacts -->
         <dependency>

Modified: incubator/ace/trunk/ace-webui-vaadin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-webui-vaadin/pom.xml?rev=1073775&r1=1073774&r2=1073775&view=diff
==============================================================================
--- incubator/ace/trunk/ace-webui-vaadin/pom.xml (original)
+++ incubator/ace/trunk/ace-webui-vaadin/pom.xml Wed Feb 23 15:24:06 2011
@@ -38,13 +38,6 @@
         <bundle.namespace>${namespace}</bundle.namespace>
     </properties>
 
-    <repositories>
-        <repository>
-            <id>ace-repository</id>
-            <url>http://svn.apache.org/repos/asf/incubator/ace/repo</url>
-        </repository>
-    </repositories>
-
     <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>

Modified: incubator/ace/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom.xml?rev=1073775&r1=1073774&r2=1073775&view=diff
==============================================================================
--- incubator/ace/trunk/pom.xml (original)
+++ incubator/ace/trunk/pom.xml Wed Feb 23 15:24:06 2011
@@ -83,7 +83,6 @@
                 <module>ace-deployment-deploymentadmin</module>
                 <module>ace-deployment-task</module>
 
-
                 <module>ace-httplistener</module>
 
                 <module>ace-server-log-store</module>
@@ -111,16 +110,24 @@
 
                 <module>ace-gateway-log</module>
                 <module>ace-gateway-log-store</module>
-				<!--
-				-->
+
                 <module>ace-webui</module>
-				<!-- extras -->
+
                 <module>ace-webui-vaadin</module>
 
+                <module>ace-managementagent</module>
+                <module>ace-launcher</module>
+
+                <module>ace-target-defaults</module>
+                <module>ace-target-devgateway</module>
+                <module>ace-target-devserver</module>
+
 				<!-- not ready yet
                 <module>ace-distribution-servlet</module>
 				-->
 
+                <module>ace-integrationtests</module>
+
             </modules>
         </profile>
         <profile>

Modified: incubator/ace/trunk/pom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom/pom.xml?rev=1073775&r1=1073774&r2=1073775&view=diff
==============================================================================
--- incubator/ace/trunk/pom/pom.xml (original)
+++ incubator/ace/trunk/pom/pom.xml Wed Feb 23 15:24:06 2011
@@ -133,7 +133,6 @@
         <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.0</knopflerfish.version>
         <kxml2.version>2.3.0</kxml2.version>
         <mockito.version>1.8.1</mockito.version>
         <osgi.compendium.version>4.2.0</osgi.compendium.version>
@@ -250,11 +249,46 @@
 
             <!-- OPS4J -->
             <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam</artifactId>
+                <version>${pax.exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-container-default</artifactId>
+                <version>${pax.exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.exam</groupId>
+                <artifactId>pax-exam-junit</artifactId>
+                <version>${pax.exam.version}</version>
+                <scope>test</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.runner</groupId>
+                <artifactId>pax-runner</artifactId>
+                <version>${pax.runner.version}</version>
+            </dependency>
+            <dependency>
                 <groupId>org.ops4j.pax.swissbox</groupId>
                 <artifactId>pax-swissbox-tinybundles</artifactId>
                 <version>${pax.swissbox.version}</version>
                 <scope>provided</scope>
             </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.web</groupId>
+                <artifactId>pax-web-extender-war</artifactId>
+                <version>${pax.web.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.ops4j.pax.web</groupId>
+                <artifactId>pax-web-jetty-bundle</artifactId>
+                <version>${pax.web.version}</version>
+                <scope>provided</scope>
+            </dependency>
 
             <!-- OSGi -->
             <dependency>
@@ -305,6 +339,18 @@
             </dependency>
             <dependency>
                 <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
+                <version>${felix.dependencymanager.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.deploymentadmin</artifactId>
+                <version>${felix.deploymentadmin.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
                 <artifactId>org.apache.felix.eventadmin</artifactId>
                 <version>${felix.eventadmin.version}</version>
                 <scope>provided</scope>
@@ -319,6 +365,18 @@
                     </exclusion>
                 </exclusions>
             </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.framework</artifactId>
+                <version>${felix.framework.version}</version>
+                <scope>provided</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>org.apache.felix.prefs</artifactId>
+                <version>${felix.prefs.version}</version>
+                <scope>provided</scope>
+            </dependency>
 
             <!-- Servlet API -->
             <dependency>



Mime
View raw message