[jboss-osgi-commits] JBoss-OSGI SVN: r87429 - in projects/jboss-osgi/trunk: runtime/felix and 4 other directories.

Author: thomas.diesler(a)jboss.com Date: 2009-04-16 10:18:03 -0400 (Thu, 16 Apr 2009) New Revision: 87429 Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37RemoteTestCase.java Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml projects/jboss-osgi/trunk/runtime/felix/pom.xml projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml Log: [FELIX-1040] Bundle may start with unresolved packages Modified: projects/jboss-osgi/trunk/runtime/equinox/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-16 14:15:38 UTC (rev 87428) +++ projects/jboss-osgi/trunk/runtime/equinox/pom.xml 2009-04-16 14:18:03 UTC (rev 87429) @@ -52,8 +52,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/runtime/felix/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-16 14:15:38 UTC (rev 87428) +++ projects/jboss-osgi/trunk/runtime/felix/pom.xml 2009-04-16 14:18:03 UTC (rev 87429) @@ -65,8 +65,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-16 14:15:38 UTC (rev 87428) +++ projects/jboss-osgi/trunk/runtime/knopflerfish/pom.xml 2009-04-16 14:18:03 UTC (rev 87429) @@ -52,8 +52,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 14:15:38 UTC (rev 87428) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-04-16 14:18:03 UTC (rev 87429) @@ -87,8 +87,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> </dependency> </dependencies> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 14:15:38 UTC (rev 87428) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-04-16 14:18:03 UTC (rev 87429) @@ -87,8 +87,8 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> <scope>test</scope> </dependency> </dependencies> @@ -293,6 +293,8 @@ <!-- Exclude tests that require remote access --> <exclude>org/jboss/test/osgi/deployer/**</exclude> <exclude>org/jboss/test/osgi/**/*RemoteTestCase.java</exclude> + <!-- https://issues.apache.org/jira/browse/FELIX-1040 --> + <exclude>org/jboss/test/osgi/jbosgi39/OSGI39TestCase.java</exclude> </excludes> </configuration> </plugin> @@ -326,6 +328,9 @@ <configuration> <!-- argLine>${surefire.security.args}</argLine --> <excludes> + <exclude>org/jboss/test/osgi/jbosgi37/*RemoteTestCase.java</exclude> + <!-- https://issues.apache.org/jira/browse/FELIX-1040 --> + <exclude>org/jboss/test/osgi/jbosgi39/OSGI39RemoteTestCase.java</exclude> </excludes> </configuration> </plugin> Added: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37RemoteTestCase.java =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37RemoteTestCase.java (rev 0) +++ projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37RemoteTestCase.java 2009-04-16 14:18:03 UTC (rev 87429) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.test.osgi.jbosgi37; + +//$Id$ + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.osgi.spi.framework.RemoteBundle; +import org.jboss.osgi.spi.junit.IntegrationTest; +import org.osgi.framework.Bundle; + +/** + * [JBOSGI-37] Prevent creation of deployment unit for nested jars + * + * https://jira.jboss.org/jira/browse/JBOSGI-37 + * + * @author thomas.diesler(a)jboss.com + * @since 09-Apr-2009 + */ +public class OSGI37RemoteTestCase extends IntegrationTest +{ + public void testNestedBundle() throws Exception + { + RemoteBundle bundleA = deployBundle("jbosgi37-bundleA.jar"); + try + { + assertEquals("Bundle started", Bundle.ACTIVE, bundleA.getState()); + + List<String> relevant = new ArrayList<String>(); + for (RemoteBundle bundle : getRemoteFramework().getBundles()) + { + String symbolicName = bundle.getSymbolicName(); + if (symbolicName.startsWith("jbosgi37")) + relevant.add(symbolicName); + } + + assertEquals("No Sub Bundle", 1, relevant.size()); + assertEquals("jbosgi37-bundleA", relevant.get(0)); + } + finally + { + undeployBundle("jbosgi37-bundleA.jar"); + } + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/testsuite/functional/src/test/java/org/jboss/test/osgi/jbosgi37/OSGI37RemoteTestCase.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF