[jboss-osgi-commits] JBoss-OSGI SVN: r86735 - in projects/jboss-osgi/trunk: microcontainer/osgi-int and 6 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-03 05:48:37 -0400 (Fri, 03 Apr 2009) New Revision: 86735 Added: projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/repository/api/pom.xml projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/spi/pom.xml Log: Upgrade to org.osgi-r4v41 Added: projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/.settings/org.maven.ide.eclipse.prefs 2009-04-03 09:48:37 UTC (rev 86735) @@ -0,0 +1,9 @@ +#Fri Apr 03 11:35:09 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) @@ -45,9 +45,13 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi_R4_core</artifactId> + <artifactId>org.osgi.core</artifactId> </dependency> <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + </dependency> + <dependency> <groupId>org.jboss.aop</groupId> <artifactId>jboss-aop</artifactId> <exclusions> Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/BundleImpl.java 2009-04-03 09:48:37 UTC (rev 86735) @@ -42,6 +42,7 @@ import org.jboss.virtual.VirtualFile; import org.osgi.framework.AdminPermission; import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; @@ -350,4 +351,22 @@ + unit.getName(), e); } } + + public BundleContext getBundleContext() + { + // TODO Auto-generated method stub + return null; + } + + public void start(int options) throws BundleException + { + // TODO Auto-generated method stub + + } + + public void stop(int options) throws BundleException + { + // TODO Auto-generated method stub + + } } Modified: projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java =================================================================== --- projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/microcontainer/osgi-int/src/main/java/org/jboss/osgi/plugins/facade/ServiceReferenceImpl.java 2009-04-03 09:48:37 UTC (rev 86735) @@ -55,4 +55,10 @@ { return false; //To change body of implemented methods use File | Settings | File Templates. } + + public int compareTo(Object reference) + { + // TODO Auto-generated method stub + return 0; + } } Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) @@ -58,7 +58,7 @@ <version.jboss.microcontainer>2.0.4.GA</version.jboss.microcontainer> <version.junit>4.4</version.junit> <version.log4j>1.2.14</version.log4j> - <version.osgi.r4.core>1.0</version.osgi.r4.core> + <version.osgi>r4v41</version.osgi> <version.org.jboss.test>1.0.5.GA</version.org.jboss.test> </properties> @@ -168,9 +168,14 @@ </dependency> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi_R4_core</artifactId> - <version>${version.osgi.r4.core}</version> + <artifactId>org.osgi.core</artifactId> + <version>${version.osgi}</version> </dependency> + <dependency> + <groupId>org.osgi</groupId> + <artifactId>org.osgi.compendium</artifactId> + <version>${version.osgi}</version> + </dependency> <!-- Felix Dependencies --> <dependency> Added: projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs =================================================================== --- projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs (rev 0) +++ projects/jboss-osgi/trunk/repository/api/.settings/org.maven.ide.eclipse.prefs 2009-04-03 09:48:37 UTC (rev 86735) @@ -0,0 +1,9 @@ +#Fri Apr 03 11:35:09 CEST 2009 +activeProfiles= +eclipse.preferences.version=1 +fullBuildGoals=process-test-resources +includeModules=false +resolveWorkspaceProjects=true +resourceFilterGoals=process-resources resources\:testResources +skipCompilerPlugin=true +version=1 Modified: projects/jboss-osgi/trunk/repository/api/pom.xml =================================================================== --- projects/jboss-osgi/trunk/repository/api/pom.xml 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/repository/api/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) @@ -15,7 +15,7 @@ <dependencies> <dependency> <groupId>org.osgi</groupId> - <artifactId>osgi_R4_core</artifactId> + <artifactId>org.osgi.core</artifactId> </dependency> </dependencies> </project> Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) @@ -32,10 +32,6 @@ <artifactId>osgi</artifactId> <version>3.4.3.R34x_v20081215-1030</version> </dependency> - <dependency> - <groupId>org.apache.felix</groupId> - <artifactId>org.osgi.compendium</artifactId> - </dependency> <!-- Test Dependencies --> <dependency> @@ -225,7 +221,7 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <!-- argLine>${surefire.security.args}</argLine --> + <argLine>${surefire.security.args}</argLine> <excludes> <!-- Exclude all testsuite tests --> <exclude>org/jboss/test/osgi/jbosgi*/**</exclude> Modified: projects/jboss-osgi/trunk/runtime/spi/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-04-03 09:48:13 UTC (rev 86734) +++ projects/jboss-osgi/trunk/runtime/spi/pom.xml 2009-04-03 09:48:37 UTC (rev 86735) @@ -19,8 +19,9 @@ <!-- Dependencies --> <dependencies> <dependency> - <groupId>org.apache.felix</groupId> + <groupId>org.osgi</groupId> <artifactId>org.osgi.core</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.deployers</groupId>