Author: thomas.diesler(a)jboss.com Date: 2009-05-27 02:56:42 -0400 (Wed, 27 May 2009) New Revision: 89456 Added: projects/jboss-osgi/trunk/.project projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LogServiceTracker.java projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SystemLogService.java Modified: projects/jboss-osgi/trunk/ projects/jboss-osgi/trunk/blueprint/impl/.project projects/jboss-osgi/trunk/blueprint/impl/pom.xml projects/jboss-osgi/trunk/blueprint/pom.xml projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/husky/harness/.project projects/jboss-osgi/trunk/husky/harness/pom.xml projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/Extender.java projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java projects/jboss-osgi/trunk/husky/pom.xml projects/jboss-osgi/trunk/husky/testsuite/pom.xml projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/repository/api/pom.xml projects/jboss-osgi/trunk/repository/pom.xml projects/jboss-osgi/trunk/runtime/microcontainer/.project projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/.classpath projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml projects/jboss-osgi/trunk/runtime/microcontainer/pom.xml projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java Log: Cleanup husky dependencies Property changes on: projects/jboss-osgi/trunk ___________________________________________________________________ Name: svn:ignore - .classpath .project autoinstall.xml target + autoinstall.xml target Added: projects/jboss-osgi/trunk/.project =================================================================== --- projects/jboss-osgi/trunk/.project (rev 0) +++ projects/jboss-osgi/trunk/.project 2009-05-27 06:56:42 UTC (rev 89456) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jboss-osgi</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.maven.ide.eclipse.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.maven.ide.eclipse.maven2Nature</nature> + </natures> +</projectDescription> Modified: projects/jboss-osgi/trunk/blueprint/impl/.project =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/.project 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/blueprint/impl/.project 2009-05-27 06:56:42 UTC (rev 89456) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-blueprint-impl</name> + <name>jboss-osgi-blueprint</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/trunk/blueprint/impl/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/blueprint/impl/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -4,12 +4,12 @@ <name>JBossOSGi Blueprint - Implementation</name> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint-impl</artifactId> + <artifactId>jboss-osgi-blueprint</artifactId> <packaging>bundle</packaging> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint</artifactId> + <artifactId>jboss-osgi-blueprint-parent</artifactId> <version>1.0.0.Alpha1</version> </parent> Modified: projects/jboss-osgi/trunk/blueprint/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/blueprint/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -4,7 +4,7 @@ <name>JBossOSGi Blueprint</name> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint</artifactId> + <artifactId>jboss-osgi-blueprint-parent</artifactId> <packaging>pom</packaging> <version>1.0.0.Alpha1</version> Modified: projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/blueprint/testsuite/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint</artifactId> + <artifactId>jboss-osgi-blueprint-parent</artifactId> <version>1.0.0.Alpha1</version> </parent> @@ -28,10 +28,6 @@ <artifactId>jboss-osgi-runtime-felix</artifactId> <scope>test</scope> </dependency> - <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> - </dependency> <!-- OSGi Dependencies --> <dependency> @@ -51,7 +47,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint-impl</artifactId> + <artifactId>jboss-osgi-blueprint</artifactId> <scope>provided</scope> </dependency> <dependency> @@ -71,7 +67,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/blueprint/testsuite/scripts/assembly-bundles.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -16,10 +16,10 @@ <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> <includes> <include>*:jboss-osgi-apache-xerces:jar</include> - <include>*:jboss-osgi-blueprint-impl:jar</include> + <include>*:jboss-osgi-blueprint:jar</include> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-common-core:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-jaxb:jar</include> <include>*:jboss-osgi-jmx:jar</include> <include>*:jboss-osgi-logging:jar</include> Modified: projects/jboss-osgi/trunk/husky/harness/.project =================================================================== --- projects/jboss-osgi/trunk/husky/harness/.project 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/harness/.project 2009-05-27 06:56:42 UTC (rev 89456) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-husky-harness</name> + <name>jboss-osgi-husky</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/trunk/husky/harness/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/harness/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -18,13 +18,13 @@ <name>JBossOSGi Husky - Harness</name> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <packaging>bundle</packaging> <!-- Parent --> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> + <artifactId>jboss-osgi-husky-parent</artifactId> <version>1.0.0</version> </parent> @@ -35,13 +35,6 @@ <artifactId>junit</artifactId> </dependency> - <!-- Bundle Dependencies --> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <scope>provided</scope> - </dependency> - <!-- Provided Dependencies --> <dependency> <groupId>org.osgi</groupId> Added: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LogServiceTracker.java =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LogServiceTracker.java (rev 0) +++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LogServiceTracker.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -0,0 +1,85 @@ +/* + * 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.osgi.husky.internal; + +//$Id$ + +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.log.LogService; +import org.osgi.util.tracker.ServiceTracker; + +/** + * A combined ServiceTracker/LogService that bundles can use to access the registered LogService. + * + * If a LogService is registered, the LogServiceTracker delegates to that LogService. + * If there is no LogService registered, the LogServiceTracker delegates to the {@link SystemLogService} + * + * + * @author thomas.diesler(a)jboss.com + * @since 11-Apr-2009 + */ +public class LogServiceTracker extends ServiceTracker implements LogService +{ + private LogService log; + + public LogServiceTracker(BundleContext context) + { + super(context, LogService.class.getName(), null); + log = new SystemLogService(context); + open(); + } + + @Override + public Object addingService(ServiceReference reference) + { + log = (LogService)super.addingService(reference); + return log; + } + + @Override + public void removedService(ServiceReference reference, Object service) + { + super.removedService(reference, service); + log = new SystemLogService(context); + } + + public void log(int level, String message) + { + log.log(level, message); + } + + public void log(int level, String message, Throwable exception) + { + log.log(level, message, exception); + } + + public void log(ServiceReference sr, int level, String message) + { + log.log(sr, level, message); + } + + public void log(ServiceReference sr, int level, String message, Throwable exception) + { + log.log(sr, level, message, exception); + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/LogServiceTracker.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SystemLogService.java =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SystemLogService.java (rev 0) +++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SystemLogService.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -0,0 +1,115 @@ +/* + * 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.osgi.husky.internal; + +//$Id$ + +import java.text.SimpleDateFormat; +import java.util.Date; + +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.service.log.LogService; + +/** + * A basic LogService that writes to System.out + * + * @author thomas.diesler(a)jboss.com + * @since 11-Apr-2009 + */ +public class SystemLogService implements LogService +{ + private BundleContext context; + + public SystemLogService(BundleContext context) + { + this.context = context; + } + + public void log(int level, String message) + { + logInternal(null, level, message, null); + } + + public void log(int level, String message, Throwable exception) + { + logInternal(null, level, message, exception); + } + + public void log(ServiceReference sr, int level, String message) + { + logInternal(sr, level, message, null); + } + + public void log(ServiceReference sr, int level, String message, Throwable exception) + { + logInternal(sr, level, message, exception); + } + + private void logInternal(ServiceReference sref, int level, String message, Throwable exception) + { + long time = System.currentTimeMillis(); + Bundle bundle = context.getBundle(); + + String bndStr = bundle.getSymbolicName(); + + String srefStr = null; + if (sref != null && sref.getBundle() != null) + srefStr = sref.getBundle().getSymbolicName(); + + String t = new SimpleDateFormat("dd-MMM-yyyy HH:mm.ss.SSS").format(new Date(time)); + String l = " " + logLevel(level); + String s = srefStr != null ? ",sref=" + srefStr : ""; + String b = ",bnd=" + bndStr; + String m = ",msg=" + message; + String e = exception != null ? ",ex=" + exception : ""; + + System.out.println("[" + t + l + b + s + m + e + "]"); + + if (exception != null) + exception.printStackTrace(System.out); + } + + private String logLevel(int level) + { + String logLevel; + switch (level) + { + case LogService.LOG_DEBUG: + logLevel = "DEBUG"; + break; + case LogService.LOG_INFO: + logLevel = "INFO"; + break; + case LogService.LOG_WARNING: + logLevel = "WARN"; + break; + case LogService.LOG_ERROR: + logLevel = "ERROR"; + break; + default: + logLevel = "Level=" + level; + } + return logLevel; + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/internal/SystemLogService.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/Extender.java =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/Extender.java 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/Extender.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -23,7 +23,7 @@ // $Id$ -import org.jboss.osgi.common.log.LogServiceTracker; +import org.jboss.osgi.husky.internal.LogServiceTracker; import org.jboss.osgi.husky.runtime.Connector; import org.jboss.osgi.husky.runtime.junit.JUnitPackageListener; import org.osgi.framework.Bundle; Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/JMXConnector.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -29,8 +29,8 @@ import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.husky.internal.AbstractConnector; +import org.jboss.osgi.husky.internal.LogServiceTracker; import org.jboss.osgi.husky.runtime.Connector; import org.osgi.framework.BundleContext; import org.osgi.framework.ServiceReference; Modified: projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java =================================================================== --- projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/harness/src/main/java/org/jboss/osgi/husky/runtime/osgi/SocketConnector.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -30,8 +30,8 @@ import java.net.Socket; import java.util.Properties; -import org.jboss.osgi.common.log.LogServiceTracker; import org.jboss.osgi.husky.internal.AbstractConnector; +import org.jboss.osgi.husky.internal.LogServiceTracker; import org.jboss.osgi.husky.internal.Util; import org.jboss.osgi.husky.runtime.Connector; import org.osgi.framework.BundleContext; Modified: projects/jboss-osgi/trunk/husky/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -19,7 +19,7 @@ <description>JBoss OSGi Test Support</description> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> + <artifactId>jboss-osgi-husky-parent</artifactId> <packaging>pom</packaging> <version>1.0.0</version> Modified: projects/jboss-osgi/trunk/husky/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/testsuite/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -24,7 +24,7 @@ <!-- Parent --> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky</artifactId> + <artifactId>jboss-osgi-husky-parent</artifactId> <version>1.0.0</version> </parent> @@ -60,7 +60,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <scope>provided</scope> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml =================================================================== --- projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/husky/testsuite/scripts/assembly-bundles.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -17,7 +17,7 @@ <includes> <include>*:jboss-osgi-common:jar</include> <include>*:jboss-osgi-jmx:jar</include> - <include>*:jboss-osgi-husky-harness:jar</include> + <include>*:jboss-osgi-husky:jar</include> <include>*:jboss-osgi-logging:jar</include> <include>*:org.apache.felix.log:jar</include> <include>*:org.osgi.compendium:jar</include> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -79,7 +79,7 @@ <!-- JBoss OSGi Dependencies --> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-blueprint-impl</artifactId> + <artifactId>jboss-osgi-blueprint</artifactId> <version>${version.jboss.osgi.blueprint}</version> </dependency> <dependency> @@ -94,7 +94,7 @@ </dependency> <dependency> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-husky-harness</artifactId> + <artifactId>jboss-osgi-husky</artifactId> <version>${version.jboss.osgi.husky}</version> </dependency> <dependency> Modified: projects/jboss-osgi/trunk/repository/api/pom.xml =================================================================== --- projects/jboss-osgi/trunk/repository/api/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/repository/api/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -7,7 +7,7 @@ <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-repository</artifactId> + <artifactId>jboss-osgi-repository-parent</artifactId> <version>1.0.0.Beta2</version> </parent> Modified: projects/jboss-osgi/trunk/repository/pom.xml =================================================================== --- projects/jboss-osgi/trunk/repository/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/repository/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Repository</name> - <artifactId>jboss-osgi-repository</artifactId> + <artifactId>jboss-osgi-repository-parent</artifactId> <packaging>pom</packaging> <version>1.0.0.Beta2</version> Modified: projects/jboss-osgi/trunk/runtime/microcontainer/.project =================================================================== --- projects/jboss-osgi/trunk/runtime/microcontainer/.project 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/runtime/microcontainer/.project 2009-05-27 06:56:42 UTC (rev 89456) @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>jboss-osgi-microcontainer</name> + <name>jboss-osgi-runtime-microcontainer-parent</name> <comment></comment> <projects> </projects> Modified: projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/.classpath =================================================================== --- projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/.classpath 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/.classpath 2009-05-27 06:56:42 UTC (rev 89456) @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target/classes" path="src/main/java"/> - <classpathentry kind="src" path="src/main/javacc"/> <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> Modified: projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/runtime/microcontainer/osgi-int/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -2,12 +2,12 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Runtime - Microcontainer Facade</name> - <artifactId>jboss-osgi-runtime-microcontainer-facade</artifactId> + <artifactId>jboss-osgi-runtime-microcontainer</artifactId> <packaging>jar</packaging> <parent> <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-runtime-microcontainer</artifactId> + <artifactId>jboss-osgi-runtime-microcontainer-parent</artifactId> <version>1.0.0.Beta2</version> </parent> Modified: projects/jboss-osgi/trunk/runtime/microcontainer/pom.xml =================================================================== --- projects/jboss-osgi/trunk/runtime/microcontainer/pom.xml 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/runtime/microcontainer/pom.xml 2009-05-27 06:56:42 UTC (rev 89456) @@ -2,7 +2,7 @@ <modelVersion>4.0.0</modelVersion> <name>JBossOSGi Runtime - Microcontainer</name> - <artifactId>jboss-osgi-runtime-microcontainer</artifactId> + <artifactId>jboss-osgi-runtime-microcontainer-parent</artifactId> <packaging>pom</packaging> <version>1.0.0.Beta2</version> Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/BlueprintCapability.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -35,6 +35,6 @@ { public BlueprintCapability() { - addBundle("bundles/jboss-osgi-blueprint-impl.jar"); + addBundle("bundles/jboss-osgi-blueprint.jar"); } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java =================================================================== --- projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-05-27 06:47:31 UTC (rev 89455) +++ projects/jboss-osgi/trunk/spi/src/main/java/org/jboss/osgi/spi/testing/HuskyCapability.java 2009-05-27 06:56:42 UTC (rev 89456) @@ -33,6 +33,6 @@ { public HuskyCapability() { - addBundle("bundles/jboss-osgi-husky-harness.jar"); + addBundle("bundles/jboss-osgi-husky.jar"); } } \ No newline at end of file