You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by le...@apache.org on 2007/08/31 16:18:35 UTC
svn commit: r571477 - in /felix/sandbox/lenzi: ./ bundleplugin/ pom/
shell.tui/ shell.tui/doc/ shell.tui/src/ shell/ shell/doc/ shell/src/
Author: lenzi
Date: Fri Aug 31 07:18:34 2007
New Revision: 571477
URL: http://svn.apache.org/viewvc?rev=571477&view=rev
Log:
Updated bundleplugin for using Maxime OBR Plugin
Copied shell in order to try to add the JLine
Added:
felix/sandbox/lenzi/build.xml
- copied unchanged from r571233, felix/trunk/build.xml
felix/sandbox/lenzi/build_run.sh
- copied unchanged from r571233, felix/trunk/build_run.sh
felix/sandbox/lenzi/pom/
- copied from r571233, felix/trunk/pom/
felix/sandbox/lenzi/shell/
- copied from r570832, felix/trunk/shell/
felix/sandbox/lenzi/shell.tui/
- copied from r570832, felix/trunk/shell.tui/
felix/sandbox/lenzi/shell.tui/LICENSE
- copied unchanged from r571233, felix/trunk/shell.tui/LICENSE
felix/sandbox/lenzi/shell.tui/NOTICE
- copied unchanged from r571233, felix/trunk/shell.tui/NOTICE
felix/sandbox/lenzi/shell.tui/doc/
- copied from r571233, felix/trunk/shell.tui/doc/
felix/sandbox/lenzi/shell.tui/pom.xml
- copied, changed from r571233, felix/trunk/shell.tui/pom.xml
felix/sandbox/lenzi/shell.tui/src/
- copied from r571233, felix/trunk/shell.tui/src/
felix/sandbox/lenzi/shell/LICENSE
- copied unchanged from r571233, felix/trunk/shell/LICENSE
felix/sandbox/lenzi/shell/NOTICE
- copied unchanged from r571233, felix/trunk/shell/NOTICE
felix/sandbox/lenzi/shell/doc/
- copied from r571233, felix/trunk/shell/doc/
felix/sandbox/lenzi/shell/pom.xml
- copied, changed from r571233, felix/trunk/shell/pom.xml
felix/sandbox/lenzi/shell/src/
- copied from r571233, felix/trunk/shell/src/
Modified:
felix/sandbox/lenzi/bundleplugin/pom.xml
felix/sandbox/lenzi/pom/pom.xml
Modified: felix/sandbox/lenzi/bundleplugin/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/lenzi/bundleplugin/pom.xml?rev=571477&r1=571476&r2=571477&view=diff
==============================================================================
--- felix/sandbox/lenzi/bundleplugin/pom.xml (original)
+++ felix/sandbox/lenzi/bundleplugin/pom.xml Fri Aug 31 07:18:34 2007
@@ -23,13 +23,13 @@
<parent>
<artifactId>felix</artifactId>
<groupId>org.apache.felix</groupId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0+lenzi-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0+obrPlugin-SNAPSHOT</version>
+ <version>1.1.0+lenzi-SNAPSHOT</version>
<packaging>maven-plugin</packaging>
<name>Maven Bundle Plugin</name>
@@ -37,7 +37,7 @@
embedding packages from the classpath (wildcarded). Plus a zillion
other features. See http://www.aqute.biz/php/tools/bnd.php
</description>
-
+
<dependencies>
<dependency>
<groupId>biz.aQute</groupId>
Modified: felix/sandbox/lenzi/pom/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/lenzi/pom/pom.xml?rev=571477&r1=571233&r2=571477&view=diff
==============================================================================
--- felix/sandbox/lenzi/pom/pom.xml (original)
+++ felix/sandbox/lenzi/pom/pom.xml Fri Aug 31 07:18:34 2007
@@ -31,7 +31,7 @@
<artifactId>felix</artifactId>
<packaging>pom</packaging>
<name>Apache Felix</name>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0+lenzi-SNAPSHOT</version>
<url>http://felix.apache.org/</url>
<inceptionYear>2006</inceptionYear>
<description>Apache felix is an OSGi implementation.</description>
@@ -41,6 +41,21 @@
<url>http://issues.apache.org/jira/browse/FELIX</url>
</issueManagement>
+ <repositories>
+ <repository>
+ <id>domoware.isti.cnr.it</id>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
+ <url>http://domoware.isti.cnr.it/maven2/</url>
+ </repository>
+ <repository>
+ <id>snap.domoware.isti.cnr.it</id>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ <url>http://domoware.isti.cnr.it/maven2-snap/</url>
+ </repository>
+ </repositories>
+
<mailingLists>
<mailingList>
<name>Felix Dev</name>
@@ -97,24 +112,6 @@
</activation>
<modules>
<module>../bundleplugin</module>
- <module>../scrplugin</module>
- <module>../tools/maven2/maven-osgi-plugin</module>
- <module>../ipojo/metadata</module>
- <module>../ipojo/manipulator</module>
- <module>../ipojo/plugin</module>
- </modules>
- </profile>
-
- <profile>
- <id>packaging-ipojo-bundle</id>
- <activation>
- <property>
- <name>packaging</name>
- <value>ipojo-bundle</value>
- </property>
- </activation>
- <modules>
- <!--<module>ipojo/arch</module>-->
</modules>
</profile>
@@ -127,59 +124,11 @@
</property>
</activation>
<modules>
- <module>../upnp/extra</module>
- <module>../upnp/basedriver</module>
- <module>../upnp/tester</module>
- <module>../upnp/samples/tv</module>
- <module>../upnp/samples/clock</module>
- <module>../upnp/samples/binarylight</module>
- <module>../org.osgi.foundation</module>
- <module>../javax.servlet</module>
- <module>../org.osgi.core</module>
- <module>../org.osgi.compendium</module>
- <module>../framework</module>
- <module>../main</module>
<module>../shell</module>
<module>../shell.tui</module>
- <module>../shell.gui</module>
- <module>../shell.gui.plugin</module>
- <module>../bundlerepository</module>
- <module>../log</module>
- <module>../eventadmin</module>
- <module>../http.jetty</module>
- <module>../scr</module>
- <module>../configadmin</module>
- <module>../metatype</module>
- <module>../dependencymanager</module>
- <module>../servicebinder</module>
- <module>../wireadmin</module>
- <module>../prefs</module>
-
- <module>../ipojo/core</module>
- <module>../ipojo/arch</module>
-
- <module>../mosgi</module>
-
- <module>../examples</module>
</modules>
</profile>
- <profile>
- <id>packaging-osgi-bundle</id>
- <activation>
- <property>
- <name>packaging</name>
- <value>osgi-bundle</value>
- </property>
- </activation>
- <modules>
- <module>../org.apache.felix.daemon</module>
-
- <!-- <module>tools/mangen</module> -->
-
-
- </modules>
- </profile>
</profiles>
<distributionManagement>
@@ -198,15 +147,21 @@
<pluginRepository>
<id>apache.snapshots</id>
<name>snapshot plugins</name>
- <url>
- http://people.apache.org/repo/m2-snapshot-repository
- </url>
- <releases>
- <enabled>false</enabled>
- </releases>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
+ <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ </pluginRepository>
+ <pluginRepository>
+ <id>domoware.isti.cnr.it</id>
+ <releases><enabled>true</enabled></releases>
+ <snapshots><enabled>false</enabled></snapshots>
+ <url>http://domoware.isti.cnr.it/maven2/</url>
+ </pluginRepository>
+ <pluginRepository>
+ <id>snap.domoware.isti.cnr.it</id>
+ <releases><enabled>false</enabled></releases>
+ <snapshots><enabled>true</enabled></snapshots>
+ <url>http://domoware.isti.cnr.it/maven2-snap/</url>
</pluginRepository>
</pluginRepositories>
@@ -225,6 +180,7 @@
<scope>test</scope>
</dependency>
</dependencies>
+
<build>
<pluginManagement>
<plugins>
Copied: felix/sandbox/lenzi/shell.tui/pom.xml (from r571233, felix/trunk/shell.tui/pom.xml)
URL: http://svn.apache.org/viewvc/felix/sandbox/lenzi/shell.tui/pom.xml?p2=felix/sandbox/lenzi/shell.tui/pom.xml&p1=felix/trunk/shell.tui/pom.xml&r1=571233&r2=571477&rev=571477&view=diff
==============================================================================
--- felix/trunk/shell.tui/pom.xml (original)
+++ felix/sandbox/lenzi/shell.tui/pom.xml Fri Aug 31 07:18:34 2007
@@ -20,14 +20,14 @@
<parent>
<groupId>org.apache.felix</groupId>
<artifactId>felix</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0+lenzi-SNAPSHOT</version>
<relativePath>../pom/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
<name>Apache Felix Shell TUI</name>
<description>A simple textual user interface for Felix' shell service.</description>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.2.0+lenzi-SNAPSHOT</version>
<artifactId>org.apache.felix.shell.tui</artifactId>
<dependencies>
<dependency>
@@ -46,7 +46,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.0+lenzi-SNAPSHOT</version>
<extensions>true</extensions>
<configuration>
<instructions>
Copied: felix/sandbox/lenzi/shell/pom.xml (from r571233, felix/trunk/shell/pom.xml)
URL: http://svn.apache.org/viewvc/felix/sandbox/lenzi/shell/pom.xml?p2=felix/sandbox/lenzi/shell/pom.xml&p1=felix/trunk/shell/pom.xml&r1=571233&r2=571477&rev=571477&view=diff
==============================================================================
--- felix/trunk/shell/pom.xml (original)
+++ felix/sandbox/lenzi/shell/pom.xml Fri Aug 31 07:18:34 2007
@@ -28,6 +28,7 @@
<name>Apache Felix Shell Service</name>
<description>A simple OSGi command shell service.</description>
<artifactId>org.apache.felix.shell</artifactId>
+ <version>1.2.0+lenzi-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>