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 15:25:39 UTC
svn commit: r383324 - in /incubator/felix/sandbox/akarasulu/mavenized: ./
installers/ installers/src/main/installers/ org.apache.felix.framework/
org.apache.felix.framework/src/main/resources/ org.apache.felix.shell.tui/
org.apache.felix.shell/ org.apa...
Author: akarasulu
Date: Sun Mar 5 06:25:37 2006
New Revision: 383324
URL: http://svn.apache.org/viewcvs?rev=383324&view=rev
Log:
removing ungoverned project and merging code back into the shell
Added:
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/src/main/java/org/ungoverned/
- copied from r382978, incubator/felix/sandbox/akarasulu/mavenized/org.ungoverned.osgi.service.shell/src/main/java/org/ungoverned/
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/src/main/java/org/ungoverned/osgi/
- copied from r383323, incubator/felix/sandbox/akarasulu/mavenized/org.ungoverned.osgi.service.shell/src/main/java/org/ungoverned/osgi/
Removed:
incubator/felix/sandbox/akarasulu/mavenized/org.ungoverned.osgi.service.shell/
Modified:
incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml
incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/config.properties
incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/izpack-unix.xml
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/pom.xml
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/src/main/resources/Manifest.mf
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell.tui/pom.xml
incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/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=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/installers/pom.xml Sun Mar 5 06:25:37 2006
@@ -44,12 +44,6 @@
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.ungoverned.osgi.service.shell</artifactId>
- <version>${pom.version}</version>
- </dependency>
-
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>org.osgi</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/config.properties
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/config.properties?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/config.properties (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/config.properties Sun Mar 5 06:25:37 2006
@@ -11,9 +11,8 @@
version=1.4
#felix.cache.profile=foo
felix.auto.start.1= \
- file:bundle/org.apache.felix.shell.jar \
- file:bundle/org.apache.felix.shell.tui.jar \
- file:bundle/org.apache.felix.bundlerepository.jar
+ file:%INSTALL_PATH/bundle/org.apache.felix.shell-${pom.version}.jar \
+ file:%INSTALL_PATH/bundle/org.apache.felix.shell.tui-${pom.version}.jar
felix.startlevel.framework=1
felix.startlevel.bundle=1
#framework.service.urlhandlers=false
Modified: incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/izpack-unix.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/izpack-unix.xml?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/izpack-unix.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/installers/src/main/installers/izpack-unix.xml Sun Mar 5 06:25:37 2006
@@ -79,6 +79,7 @@
<executable os="unix" targetfile="$INSTALL_PATH/bin/${app}" stage="never" keep="true" />
<singlefile os="unix" src="bin/${server.init}" target="/etc/init.d/${app}" />
<parsable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" type="shell" />
+ <parsable os="unix" targetfile="$INSTALL_PATH/conf/config.properties" type="shell" />
<parsable os="unix" targetfile="/etc/init.d/${app}" type="shell" />
<executable os="unix" targetfile="/etc/init.d/${app}" stage="never" keep="true" />
<executable os="unix" targetfile="$INSTALL_PATH/bin/${server.init}" stage="never" keep="true" />
Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/pom.xml?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/pom.xml Sun Mar 5 06:25:37 2006
@@ -11,11 +11,6 @@
<dependencies>
<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>
Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/src/main/resources/Manifest.mf
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/src/main/resources/Manifest.mf?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/src/main/resources/Manifest.mf (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.framework/src/main/resources/Manifest.mf Sun Mar 5 06:25:37 2006
@@ -1,3 +1,6 @@
Main-Class: org.apache.felix.framework.Main
-Class-Path: org.osgi-0.8-SNAPSHOT.jar
- org.apache.felix.moduleloader-0.8-SNAPSHOT.jar
+Class-Path: ../bin/bootstrapper.jar
+ org.osgi-0.8-SNAPSHOT.jar
+ org.apache.felix.moduleloader-0.8-SNAPSHOT.jar
+ org.ungoverned.osgi.service.shell-0.8-SNAPSHOT.jar
+ org.apache.felix.framework-0.8-SNAPSHOT.jar
Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell.tui/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell.tui/pom.xml?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell.tui/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell.tui/pom.xml Sun Mar 5 06:25:37 2006
@@ -11,11 +11,6 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.ungoverned.osgi.service.shell</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>org.osgi</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/pom.xml?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/org.apache.felix.shell/pom.xml Sun Mar 5 06:25:37 2006
@@ -11,11 +11,6 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.ungoverned.osgi.service.shell</artifactId>
- <version>${pom.version}</version>
- </dependency>
- <dependency>
- <groupId>${pom.groupId}</groupId>
<artifactId>org.osgi</artifactId>
<version>${pom.version}</version>
</dependency>
Modified: incubator/felix/sandbox/akarasulu/mavenized/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/felix/sandbox/akarasulu/mavenized/pom.xml?rev=383324&r1=383323&r2=383324&view=diff
==============================================================================
--- incubator/felix/sandbox/akarasulu/mavenized/pom.xml (original)
+++ incubator/felix/sandbox/akarasulu/mavenized/pom.xml Sun Mar 5 06:25:37 2006
@@ -11,7 +11,6 @@
<module>org.osgi</module>
<module>org.apache.felix.framework</module>
<module>org.apache.felix.moduleloader</module>
- <module>org.ungoverned.osgi.service.shell</module>
<module>org.apache.felix.shell</module>
<module>org.apache.felix.shell.tui</module>
</modules>