You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by ri...@apache.org on 2010/06/15 16:54:34 UTC
svn commit: r954919 - in /felix/sandbox/rickhall: framework-vb/ vb/
vb/framework-vb/ vb/framework-vb/src/main/java/org/apache/felix/framework/
vb/main-vb/ vb/main.distribution-vb/
Author: rickhall
Date: Tue Jun 15 14:54:34 2010
New Revision: 954919
URL: http://svn.apache.org/viewvc?rev=954919&view=rev
Log:
Branch main file to simplify building the framework branch.
Added:
felix/sandbox/rickhall/vb/
felix/sandbox/rickhall/vb/framework-vb/
- copied from r954915, felix/sandbox/rickhall/framework-vb/
felix/sandbox/rickhall/vb/main-vb/
- copied from r954916, felix/trunk/main/
felix/sandbox/rickhall/vb/main.distribution-vb/
- copied from r954915, felix/trunk/main.distribution/
Removed:
felix/sandbox/rickhall/framework-vb/
Modified:
felix/sandbox/rickhall/vb/framework-vb/pom.xml
felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ExtensionManager.java
felix/sandbox/rickhall/vb/main-vb/pom.xml
felix/sandbox/rickhall/vb/main.distribution-vb/pom.xml
Modified: felix/sandbox/rickhall/vb/framework-vb/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/pom.xml?rev=954919&r1=954915&r2=954919&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb/framework-vb/pom.xml (original)
+++ felix/sandbox/rickhall/vb/framework-vb/pom.xml Tue Jun 15 14:54:34 2010
@@ -25,7 +25,7 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
- <name>Apache Felix Framework</name>
+ <name>Apache Felix Framework VB</name>
<artifactId>org.apache.felix.framework-vb</artifactId>
<version>3.1.0-SNAPSHOT</version>
<dependencies>
@@ -52,10 +52,10 @@
<configuration>
<instructions>
<Bundle-SymbolicName>org.apache.felix.framework</Bundle-SymbolicName>
- <Bundle-Name>Apache Felix Framework</Bundle-Name>
+ <Bundle-Name>Apache Felix Framework VB</Bundle-Name>
<Bundle-Description>OSGi R4 framework implementation.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Export-Package>org.osgi.framework;-split-package:=merge-first,org.osgi.framework.launch,org.osgi.framework.hooks.service,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
+ <Export-Package>org.osgi.framework,org.osgi.framework.launch,org.osgi.framework.hooks.service,org.osgi.service.packageadmin,org.osgi.service.url,org.osgi.service.startlevel,org.osgi.util.tracker</Export-Package>
<Private-Package>org.apache.felix.framework.*</Private-Package>
<Import-Package>!*</Import-Package>
<Include-Resource>META-INF/LICENSE=LICENSE,META-INF/NOTICE=NOTICE,META-INF/DEPENDENCIES=DEPENDENCIES,{src/main/resources/}</Include-Resource>
Modified: felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ExtensionManager.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ExtensionManager.java?rev=954919&r1=954915&r2=954919&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ExtensionManager.java (original)
+++ felix/sandbox/rickhall/vb/framework-vb/src/main/java/org/apache/felix/framework/ExtensionManager.java Tue Jun 15 14:54:34 2010
@@ -165,7 +165,7 @@ class ExtensionManager extends URLStream
felix.getConfig().get(FelixConstants.FELIX_VERSION_PROPERTY));
m_headerMap.put(FelixConstants.BUNDLE_SYMBOLICNAME,
FelixConstants.SYSTEM_BUNDLE_SYMBOLICNAME);
- m_headerMap.put(FelixConstants.BUNDLE_NAME, "System Bundle");
+ m_headerMap.put(FelixConstants.BUNDLE_NAME, "System Bundle VB");
m_headerMap.put(FelixConstants.BUNDLE_DESCRIPTION,
"This bundle is system specific; it implements various system services.");
m_headerMap.put(FelixConstants.EXPORT_SERVICE,
Modified: felix/sandbox/rickhall/vb/main-vb/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/main-vb/pom.xml?rev=954919&r1=954916&r2=954919&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb/main-vb/pom.xml (original)
+++ felix/sandbox/rickhall/vb/main-vb/pom.xml Tue Jun 15 14:54:34 2010
@@ -25,13 +25,13 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>bundle</packaging>
- <name>Apache Felix Main</name>
- <artifactId>org.apache.felix.main</artifactId>
+ <name>Apache Felix Main VB</name>
+ <artifactId>org.apache.felix.main-vb</artifactId>
<version>3.1.0-SNAPSHOT</version>
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.framework</artifactId>
+ <artifactId>org.apache.felix.framework-vb</artifactId>
<version>${framework.version}</version>
</dependency>
</dependencies>
@@ -64,11 +64,11 @@
<instructions>
<_donotcopy>(CVS|.svn|config.properties)</_donotcopy>
<Main-Class>org.apache.felix.main.Main</Main-Class>
- <Bundle-SymbolicName>org.apache.felix.main</Bundle-SymbolicName>
- <Bundle-Name>Apache Felix</Bundle-Name>
+ <Bundle-SymbolicName>org.apache.felix.main-vb</Bundle-SymbolicName>
+ <Bundle-Name>Apache Felix Framework Main VB</Bundle-Name>
<Bundle-Description>OSGi R4 framework.</Bundle-Description>
<Bundle-Vendor>The Apache Software Foundation</Bundle-Vendor>
- <Embed-Dependency>*;artifactId=org.apache.felix.framework;inline=true</Embed-Dependency>
+ <Embed-Dependency>*;artifactId=org.apache.felix.framework-vb;inline=true</Embed-Dependency>
<Private-Package>org.apache.felix.main.*</Private-Package>
<Export-Package>!org.osgi.service.log, !org.osgi.service.obr,org.osgi.*</Export-Package>
<Import-Package>!*</Import-Package>
@@ -151,7 +151,7 @@
<mkdir dir="${basedir}/bin" />
<delete dir="${basedir}/conf" />
<mkdir dir="${basedir}/conf" />
- <copy file="${basedir}/target/org.apache.felix.main-${pom.version}.jar" tofile="${basedir}/bin/felix.jar" />
+ <copy file="${basedir}/target/org.apache.felix.main-vb-${pom.version}.jar" tofile="${basedir}/bin/felix.jar" />
<copy file="${basedir}/target/classes/config.properties" todir="${basedir}/conf" />
</tasks>
</configuration>
Modified: felix/sandbox/rickhall/vb/main.distribution-vb/pom.xml
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/vb/main.distribution-vb/pom.xml?rev=954919&r1=954915&r2=954919&view=diff
==============================================================================
--- felix/sandbox/rickhall/vb/main.distribution-vb/pom.xml (original)
+++ felix/sandbox/rickhall/vb/main.distribution-vb/pom.xml Tue Jun 15 14:54:34 2010
@@ -25,8 +25,8 @@
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>pom</packaging>
- <name>Apache Felix Main Distribution</name>
- <artifactId>org.apache.felix.main.distribution</artifactId>
+ <name>Apache Felix Main Distribution VB</name>
+ <artifactId>org.apache.felix.main.distribution-vb</artifactId>
<version>3.1.0-SNAPSHOT</version>
<properties>
<framework.version>3.1.0-SNAPSHOT</framework.version>
@@ -83,7 +83,7 @@
</artifactItem>
<artifactItem>
<groupId>${pom.groupId}</groupId>
- <artifactId>org.apache.felix.main</artifactId>
+ <artifactId>org.apache.felix.main-vb</artifactId>
<version>${framework.version}</version>
<type>jar</type>
<overWrite>true</overWrite>
@@ -109,7 +109,7 @@
<descriptor>assembly.xml</descriptor>
</descriptors>
<appendAssemblyId>false</appendAssemblyId>
- <finalName>felix-framework-${framework.version}</finalName>
+ <finalName>felix-framework-vb-${framework.version}</finalName>
</configuration>
</execution>
</executions>