You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ak...@apache.org on 2006/03/05 23:32:00 UTC
svn commit: r383424 - in /incubator/felix/sandbox/akarasulu/mavenized: ./
installers/ org.apache.felix.daemon/
org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/
org.apache.felix.daemon/src/main/manifest/ org.apache.felix.main/
Author: akarasulu
Date: Sun Mar 5 14:31:58 2006
New Revision: 383424
URL: http://svn.apache.org/viewcvs?rev=383424&view=rev
Log:
separated main from daemon code
Added:
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/
- copied from r383421, incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/
Removed:
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/java/org/apache/felix/daemon/Main.java
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/src/main/manifest/
Modified:
incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/pom.xml
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/pom.xml
incubator/felix/sandbox/akarasulu/mavenized/pom.xml
Modified: incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml?rev=383424&r1=383423&r2=383424&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml Sun Mar 5 14:31:58 2006
@@ -32,31 +32,7 @@
<!-- Felix Dependencies -->
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.moduleloader</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.osgi</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.shell</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.shell.tui</artifactId>
+ <artifactId>org.apache.felix.main</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/pom.xml?rev=383424&r1=383423&r2=383424&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.daemon/pom.xml Sun Mar 5 14:31:58 2006
@@ -20,20 +20,4 @@
<version>1.0-RC1</version>
</dependency>
</dependencies>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifestFile>src/main/manifest/Manifest.mf</manifestFile>
- <manifest>
- <mainClass>org.apache.felix.daemon.Main</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- </plugins>
- </build>
</project>
Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/pom.xml?rev=383424&r1=383421&r2=383424&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.main/pom.xml Sun Mar 5 14:31:58 2006
@@ -6,19 +6,14 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
- <name>Apache Felix Daemon</name>
- <artifactId>org.apache.felix.daemon</artifactId>
+ <name>Apache Felix Main</name>
+ <artifactId>org.apache.felix.main</artifactId>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <artifactId>org.apache.felix.daemon</artifactId>
<version>${pom.version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.directory.daemon</groupId>
- <artifactId>daemon-bootstrappers</artifactId>
- <version>1.0-RC1</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -29,7 +24,7 @@
<archive>
<manifestFile>src/main/manifest/Manifest.mf</manifestFile>
<manifest>
- <mainClass>org.apache.felix.daemon.Main</mainClass>
+ <mainClass>org.apache.felix.main.Main</mainClass>
</manifest>
</archive>
</configuration>
Modified: incubator/felix/sandbox/akarasulu/mavenized/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/pom.xml?rev=383424&r1=383423&r2=383424&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/pom.xml Sun Mar 5 14:31:58 2006
@@ -14,6 +14,7 @@
<module>org.apache.felix.shell</module>
<module>org.apache.felix.shell.tui</module>
<module>org.apache.felix.daemon</module>
+ <module>org.apache.felix.main</module>
</modules>
<repositories>