Author: marrs
Date: Sun Jan 31 12:43:10 2010
New Revision: 905018
URL: http://svn.apache.org/viewvc?rev=905018&view=rev
Log:
ACE-68 moving towards a working server target, first trying to get all the required bundles
in place (there are still a few missing).
Modified:
incubator/ace/trunk/ace-server-log-store/pom.xml
incubator/ace/trunk/ace-target-devgateway/pom.xml
incubator/ace/trunk/ace-target-devserver/pom.xml
incubator/ace/trunk/pom.xml
Modified: incubator/ace/trunk/ace-server-log-store/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-server-log-store/pom.xml?rev=905018&r1=905017&r2=905018&view=diff
==============================================================================
--- incubator/ace/trunk/ace-server-log-store/pom.xml (original)
+++ incubator/ace/trunk/ace-server-log-store/pom.xml Sun Jan 31 12:43:10 2010
@@ -29,11 +29,11 @@
</parent>
<groupId>org.apache.ace</groupId>
- <artifactId>ace-log-store</artifactId>
+ <artifactId>ace-server-log-store</artifactId>
<version>0.8.0-SNAPSHOT</version>
<packaging>bundle</packaging>
- <name>Apache ACE - Log Store</name>
+ <name>Apache ACE - Server Log Store</name>
<properties>
<bundle.symbolicName>${namespace}.server.log.store</bundle.symbolicName>
@@ -67,9 +67,5 @@
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager</artifactId>
</dependency>
-
</dependencies>
-
-
-
</project>
\ No newline at end of file
Modified: incubator/ace/trunk/ace-target-devgateway/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devgateway/pom.xml?rev=905018&r1=905017&r2=905018&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devgateway/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devgateway/pom.xml Sun Jan 31 12:43:10 2010
@@ -94,6 +94,7 @@
<artifactId>org.apache.felix.dependencymanager</artifactId>
<scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.dependencymanager.shell</artifactId>
Modified: incubator/ace/trunk/ace-target-devserver/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/ace-target-devserver/pom.xml?rev=905018&r1=905017&r2=905018&view=diff
==============================================================================
--- incubator/ace/trunk/ace-target-devserver/pom.xml (original)
+++ incubator/ace/trunk/ace-target-devserver/pom.xml Sun Jan 31 12:43:10 2010
@@ -97,41 +97,120 @@
<dependency>
<groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.deploymentadmin</artifactId>
+ <artifactId>org.apache.felix.dependencymanager.shell</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.main</artifactId>
+ <version>2.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.prefs</artifactId>
+ <version>1.0.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell</artifactId>
+ <version>1.4.1</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.shell.tui</artifactId>
+ <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 -->
+ <!--
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>bundle-useradmin</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.knopflerfish</groupId>
+ <artifactId>log</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ -->
+ <!-- TODO validate if these are the right artifacts -->
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-extender-war</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.ops4j.pax.web</groupId>
+ <artifactId>pax-web-jetty-bundle</artifactId>
+ <version>0.7.2</version>
+ </dependency>
+
+
+ <dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-consolelogger</artifactId>
+ <artifactId>ace-client-repository</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-client-repository-helper-bundle</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <!-- TODO this next artifact does not seem to exist yet -->
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-client-repository-helper-base</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-configurator</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-log-listener</artifactId>
+ <artifactId>ace-consolelogger</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-gateway-log</artifactId>
+ <artifactId>ace-deployment-provider-repositorybased</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-gateway-log-store</artifactId>
+ <artifactId>ace-deployment-servlet</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-log</artifactId>
+ <artifactId>ace-deployment-streamgenerator</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
@@ -145,7 +224,49 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-identification-property</artifactId>
+ <artifactId>ace-httplistener</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-obr-metadata</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-obr-servlet</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-obr-storage</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-repository-servlet</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-repository</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-resourceprocessor-useradmin</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
@@ -159,21 +280,28 @@
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-configurator</artifactId>
+ <artifactId>ace-server-log-store</artifactId>
+ <version>${project.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>ace-server-log</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-deployment</artifactId>
+ <artifactId>ace-webconsole-plugin</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>ace-deployment-task</artifactId>
+ <artifactId>ace-webui</artifactId>
<version>${project.version}</version>
<scope>runtime</scope>
</dependency>
Modified: incubator/ace/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ace/trunk/pom.xml?rev=905018&r1=905017&r2=905018&view=diff
==============================================================================
--- incubator/ace/trunk/pom.xml (original)
+++ incubator/ace/trunk/pom.xml Sun Jan 31 12:43:10 2010
@@ -113,6 +113,7 @@
<modules>
<!-- Targets (can be used by all Pax Tools) -->
<module>ace-target-devgateway</module>
+ <module>ace-target-devserver</module>
</modules>
</profile>
<profile>
|