October 2009 - jboss-osgi-commits

JBoss-OSGI SVN: r95219 - in projects/jboss-osgi/trunk: reactor/blueprint/testsuite and 5 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 18:33:29 -0400 (Tue, 20 Oct 2009) New Revision: 95219 Removed: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml projects/jboss-osgi/trunk/testsuite/example/pom.xml projects/jboss-osgi/trunk/testsuite/functional/pom.xml Log: Felix uses org.osgi.core-4.2.0, we do as well Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -70,7 +70,7 @@ <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding> <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web> - <version.osgi>r4v42</version.osgi> + <version.osgi>4.2.0</version.osgi> </properties>  Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -208,7 +208,7 @@ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-compendium-felix.xml</descriptor> + <descriptor>scripts/assembly-compendium.xml</descriptor> </descriptors> </configuration> </execution> Deleted: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/scripts/assembly-compendium-felix.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -1,25 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.apache.felix:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - - </dependencySets> -</assembly> Modified: projects/jboss-osgi/trunk/testsuite/example/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/testsuite/example/pom.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -226,7 +226,7 @@ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-compendium-felix.xml</descriptor> + <descriptor>scripts/assembly-compendium.xml</descriptor> </descriptors> </configuration> </execution> Deleted: projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/testsuite/example/scripts/assembly-compendium-felix.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -1,26 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - - <id>compendium</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.apache.felix:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - - </dependencySets> -</assembly> Modified: projects/jboss-osgi/trunk/testsuite/functional/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/testsuite/functional/pom.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -196,7 +196,7 @@ <ignoreDirFormatExtensions>true</ignoreDirFormatExtensions> <appendAssemblyId>false</appendAssemblyId> <descriptors> - <descriptor>scripts/assembly-compendium-felix.xml</descriptor> + <descriptor>scripts/assembly-compendium.xml</descriptor> </descriptors> </configuration> </execution> Deleted: projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml 2009-10-20 22:33:05 UTC (rev 95218) +++ projects/jboss-osgi/trunk/testsuite/functional/scripts/assembly-compendium-felix.xml 2009-10-20 22:33:29 UTC (rev 95219) @@ -1,26 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - - <id>compendium</id> - <formats> - <format>dir</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - -  - <dependencySets> - -  - <dependencySet> - <outputDirectory>bundles</outputDirectory> - <outputFileNameMapping>${artifact.artifactId}${dashClassifier?}.${artifact.extension}</outputFileNameMapping> - <includes> - <include>org.apache.felix:org.osgi.compendium:jar</include> - </includes> - <useStrictFiltering>false</useStrictFiltering> - <scope>provided</scope> - <unpack>false</unpack> - </dependencySet> - - </dependencySets> -</assembly>

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95217 - in projects/jboss-osgi/trunk: distribution/installer/src/main/resources/jbossas and 4 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 18:23:13 -0400 (Tue, 20 Oct 2009) New Revision: 95217 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java Log: Fix deployment service in runtime Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-20 22:23:13 UTC (rev 95217) @@ -254,6 +254,7 @@ <singlefile condition="isFelix" src="@{runtime.dir}/server/conf/jboss-osgi-felix-all.properties" target="$INSTALL_PATH/runtime/server/all/conf/jboss-osgi-extra.properties" override="true" /> <fileset condition="isFelix" dir="@{deploy.artifacts.dir}/lib" targetdir="$INSTALL_PATH/runtime/lib" override="true"> + <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-runtime-felix.jar" /> <include name="org.apache.felix.framework.jar" /> </fileset> @@ -314,6 +315,7 @@ <include name="jboss-mdr.jar" /> <include name="jboss-metatype.jar" /> <include name="jboss-osgi-deployers.jar" /> + <include name="jboss-osgi-deployment.jar" /> <include name="jboss-osgi-framework.jar" /> <include name="jboss-reflect.jar" /> <include name="jbossxb.jar" /> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/jbossas/jboss-beans-jbossmc.xml 2009-10-20 22:23:13 UTC (rev 95217) @@ -126,7 +126,7 @@ <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorPluginImpl"> + <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-equinox.properties 2009-10-20 22:23:13 UTC (rev 95217) @@ -93,6 +93,5 @@ # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \ - file://${osgi.home}/server/minimal/deploy/org.apache.felix.eventadmin.jar \ file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \ file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar \ No newline at end of file Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/conf/jboss-osgi-felix.properties 2009-10-20 22:23:13 UTC (rev 95217) @@ -21,7 +21,6 @@ # Bundles that need to be started automatically org.jboss.osgi.spi.framework.autoStart=\ file://${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar \ - file://${osgi.home}/server/minimal/deploy/org.apache.felix.eventadmin.jar \ file://${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar \ file://${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/runtime/server/conf/jboss-osgi-bootstrap.xml 2009-10-20 22:23:13 UTC (rev 95217) @@ -84,7 +84,6 @@ <property name="autoStart"> <list elementClass="java.net.URL"> <value>${osgi.home}/server/minimal/deploy/org.apache.felix.log.jar</value> - <value>${osgi.home}/server/minimal/deploy/org.apache.felix.eventadmin.jar</value> <value>${osgi.home}/server/minimal/deploy/jboss-osgi-common.jar</value> <value>${osgi.home}/server/minimal/deploy/jboss-osgi-hotdeploy.jar</value> </list> @@ -120,7 +119,7 @@ <bean name="DeployerService" class="org.jboss.osgi.framework.service.internal.DeployerServiceImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> - <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorPluginImpl"> + <bean name="LifecycleInterceptorService" class="org.jboss.osgi.framework.service.internal.LifecycleInterceptorServiceImpl"> <constructor><parameter><inject bean="OSGiBundleManager" /></parameter></constructor> </bean> Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/plugins/internal/SystemPackagesPluginImpl.java 2009-10-20 22:23:13 UTC (rev 95217) @@ -88,6 +88,7 @@ allPackages.add("org.jboss.osgi.deployment.common"); allPackages.add("org.jboss.osgi.deployment.deployer"); allPackages.add("org.jboss.osgi.deployment.interceptor"); + allPackages.add("org.jboss.osgi.deployment.scanner"); allPackages.add("org.jboss.osgi.microcontainer"); allPackages.add("org.jboss.virtual"); Modified: projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java =================================================================== --- projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java 2009-10-20 22:17:49 UTC (rev 95216) +++ projects/jboss-osgi/trunk/reactor/framework/src/main/java/org/jboss/osgi/framework/service/internal/DeployerServiceImpl.java 2009-10-20 22:23:13 UTC (rev 95217) @@ -32,7 +32,6 @@ import org.jboss.osgi.framework.bundle.OSGiBundleManager; import org.jboss.osgi.framework.plugins.DeployerServicePlugin; import org.jboss.osgi.framework.plugins.internal.AbstractServicePluginImpl; -import org.jboss.osgi.spi.NotImplementedException; import org.jboss.osgi.spi.util.BundleInfo; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -90,13 +89,50 @@ bundle.uninstall(); } - public void deploy(Deployment[] bundleDeps) throws BundleException + public void deploy(Deployment[] depArr) throws BundleException { - throw new NotImplementedException(); + for (Deployment dep : depArr) + { + try + { + Bundle bundle = bundleManager.install(dep.getRoot()); + dep.addAttachment(Bundle.class, bundle); + } + catch (Exception ex) + { + log.warn("Cannot install bundle: " + dep.getLocation(), ex); + } + } + + for (Deployment dep : depArr) + { + try + { + Bundle bundle = dep.getAttachment(Bundle.class); + if (bundle != null) + bundle.start(); + } + catch (Exception ex) + { + log.warn("Cannot start bundle: " + dep.getLocation(), ex); + } + } } - public void undeploy(Deployment[] bundleDeps) throws BundleException + public void undeploy(Deployment[] depArr) throws BundleException { - throw new NotImplementedException(); + for (Deployment dep : depArr) + { + try + { + Bundle bundle = dep.getAttachment(Bundle.class); + if (bundle != null) + bundle.uninstall(); + } + catch (Exception ex) + { + log.warn("Cannot uninstall bundle: " + dep.getLocation(), ex); + } + } } } \ No newline at end of file

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95216 - projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 18:17:49 -0400 (Tue, 20 Oct 2009) New Revision: 95216 Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java Log: Undeploy only if we have a diff Modified: projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-10-20 22:16:36 UTC (rev 95215) +++ projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerImpl.java 2009-10-20 22:17:49 UTC (rev 95216) @@ -182,15 +182,18 @@ logBundleDeployments("OLD diff", diff); // Undeploy the bundles through the DeployerService - try + if (diff.size() > 0) { - Deployment[] depArr = diff.toArray(new Deployment[diff.size()]); - deployer.undeploy(depArr); + try + { + Deployment[] depArr = diff.toArray(new Deployment[diff.size()]); + deployer.undeploy(depArr); + } + catch (Exception ex) + { + log.error("Cannot undeploy bundles", ex); + } } - catch (Exception ex) - { - log.error("Cannot undeploy bundles", ex); - } return diff.size(); }

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95210 - projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 17:54:22 -0400 (Tue, 20 Oct 2009) New Revision: 95210 Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml Log: Add SLF4J to runtime lib Modified: projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml =================================================================== --- projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-20 21:51:22 UTC (rev 95209) +++ projects/jboss-osgi/trunk/distribution/installer/src/main/resources/installer/install-definition.xml 2009-10-20 21:54:22 UTC (rev 95210) @@ -188,6 +188,8 @@ <include name="jboss-osgi-spi.jar" /> <include name="jboss-vfs.jar" /> <include name="log4j.jar" /> + <include name="slf4j-api.jar" /> + <include name="slf4j-log4j12.jar" /> </fileset>

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95209 - in projects/jboss-osgi/projects/bundles/webapp/trunk: src/main/java/org/jboss/osgi and 1 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 17:51:22 -0400 (Tue, 20 Oct 2009) New Revision: 95209 Added: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java Removed: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/hotdeploy/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java Log: More work on activator Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-20 21:41:28 UTC (rev 95208) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-20 21:51:22 UTC (rev 95209) @@ -89,7 +89,7 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.webapp.internal.WARSuppportActivator</Bundle-Activator> + <Bundle-Activator>org.jboss.osgi.webapp.internal.WebAppActivator</Bundle-Activator> <Private-Package>org.jboss.osgi.webapp.internal</Private-Package> <Import-Package> javax.servlet, Deleted: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java 2009-10-20 21:41:28 UTC (rev 95208) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java 2009-10-20 21:51:22 UTC (rev 95209) @@ -1,44 +0,0 @@ -/* - * 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.webapp.internal; - -//$Id$ - -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; - -/** - * The WebApp support activator - * - * @author thomas.diesler(a)jboss.com - * @since 20-Oct-2009 - */ -public class WARSuppportActivator implements BundleActivator -{ - public void start(BundleContext context) - { - } - - public void stop(BundleContext context) - { - } -} \ No newline at end of file Copied: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java (from rev 95203, projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java) =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java (rev 0) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppActivator.java 2009-10-20 21:51:22 UTC (rev 95209) @@ -0,0 +1,57 @@ +/* + * 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.webapp.internal; + +//$Id$ + +import org.ops4j.pax.web.extender.war.internal.WebAppPublisherExt; +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * The WebApp support activator + * + * @author thomas.diesler(a)jboss.com + * @since 20-Oct-2009 + */ +public class WebAppActivator implements BundleActivator +{ + private WebAppPublisherExt publisher; + private WebAppInterceptor interceptor; + + public void start(BundleContext context) + { + publisher = new WebAppPublisherExt(); + + interceptor = new WebAppInterceptor(context, publisher); + interceptor.start(); + } + + public void stop(BundleContext context) + { + if (interceptor != null) + { + interceptor.stop(); + interceptor = null; + } + } +} \ No newline at end of file Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java 2009-10-20 21:41:28 UTC (rev 95208) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java 2009-10-20 21:51:22 UTC (rev 95209) @@ -51,10 +51,10 @@ private ServiceTracker serviceTracker; private WebAppPublisherExt publisher; - public WebAppInterceptor(BundleContext context) + public WebAppInterceptor(BundleContext context, WebAppPublisherExt publisher) { this.context = context; - this.publisher = new WebAppPublisherExt(); + this.publisher = publisher; } public void start()

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95204 - projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 17:30:27 -0400 (Tue, 20 Oct 2009) New Revision: 95204 Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptorException.java Log: Fix ctors Modified: projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptorException.java =================================================================== --- projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptorException.java 2009-10-20 21:29:46 UTC (rev 95203) +++ projects/jboss-osgi/trunk/reactor/deployment/src/main/java/org/jboss/osgi/deployment/interceptor/LifecycleInterceptorException.java 2009-10-20 21:30:27 UTC (rev 95204) @@ -33,12 +33,12 @@ @SuppressWarnings("serial") public class LifecycleInterceptorException extends RuntimeException { - private LifecycleInterceptorException(String message) + public LifecycleInterceptorException(String message) { super(message); } - private LifecycleInterceptorException(String message, Throwable cause) + public LifecycleInterceptorException(String message, Throwable cause) { super(message, cause); }

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95203 - in projects/jboss-osgi/projects/bundles: webapp and 12 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 17:29:46 -0400 (Tue, 20 Oct 2009) New Revision: 95203 Added: projects/jboss-osgi/projects/bundles/webapp/ projects/jboss-osgi/projects/bundles/webapp/trunk/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/internal/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/internal/WebAppPublisherExt.java Removed: projects/jboss-osgi/projects/bundles/webapp/trunk/ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/ Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml Log: jboss-osgi-webapp first cut Copied: projects/jboss-osgi/projects/bundles/webapp (from rev 94638, projects/jboss-osgi/projects/bundles/hotdeploy) Copied: projects/jboss-osgi/projects/bundles/webapp/trunk (from rev 95188, projects/jboss-osgi/projects/bundles/hotdeploy/trunk) Modified: projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/bundles/hotdeploy/trunk/pom.xml 2009-10-20 16:22:11 UTC (rev 95188) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/pom.xml 2009-10-20 21:29:46 UTC (rev 95203) @@ -14,14 +14,14 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> - <name>JBossOSGi Bundles - HotDeployment</name> - <description>The JBossOSGi Hot Deployment Service</description> + <name>JBossOSGi Bundles - WebApp Support</name> + <description>The JBossOSGi WebApp Support</description> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-hotdeploy</artifactId> + <artifactId>jboss-osgi-webapp</artifactId> <packaging>bundle</packaging> - <version>1.0.3-SNAPSHOT</version> + <version>1.0.0-SNAPSHOT</version>  <parent> @@ -32,36 +32,34 @@  <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> + <connection>scm:svn:http://anonsvn.jboss.org/repos/jbossas/projects/jboss-osgi/projec...</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/jbossas/projects/jboss-osgi/projects/...</developerConnection> <url>http://fisheye.jboss.com/qsearch/JBossOSGi</url> </scm>  <properties> - <version.jboss.osgi.common>1.0.3-SNAPSHOT</version.jboss.osgi.common> <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> - <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> + <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web> <version.osgi>r4v42</version.osgi> </properties>  <dependencies> <dependency> - <groupId>org.jboss.osgi</groupId> - <artifactId>jboss-osgi-spi</artifactId> - <version>${version.jboss.osgi.spi}</version> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-api</artifactId> + <version>${version.ops4j.pax.web}</version> </dependency> + <dependency> + <groupId>org.ops4j.pax.web</groupId> + <artifactId>pax-web-extender-war</artifactId> + <version>${version.ops4j.pax.web}</version> + </dependency>  <dependency> <groupId>org.jboss.osgi.bundles</groupId> - <artifactId>jboss-osgi-common</artifactId> - <version>${version.jboss.osgi.common}</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.osgi.bundles</groupId> <artifactId>jboss-osgi-deployment</artifactId> <version>${version.jboss.osgi.deployment}</version> <scope>provided</scope> @@ -91,21 +89,27 @@ <configuration> <instructions> <Bundle-SymbolicName>${artifactId}</Bundle-SymbolicName> - <Bundle-Activator>org.jboss.osgi.hotdeploy.internal.DeploymentScannerActivator</Bundle-Activator> - <Private-Package>org.jboss.osgi.hotdeploy.internal</Private-Package> + <Bundle-Activator>org.jboss.osgi.webapp.internal.WARSuppportActivator</Bundle-Activator> + <Private-Package>org.jboss.osgi.webapp.internal</Private-Package> <Import-Package> - javax.management, - org.jboss.osgi.common.log;version=1.0, + javax.servlet, + javax.servlet.http, + javax.xml.parsers, org.jboss.osgi.deployment.common;version=1.0, - org.jboss.osgi.deployment.deployer;version=1.0, - org.jboss.osgi.deployment.scanner;version=1.0, - org.jboss.osgi.spi.service;version=1.0, - org.jboss.osgi.spi.util;version=1.0, + org.jboss.osgi.deployment.interceptor;version=1.0, + org.jboss.virtual, + org.osgi.service.http, org.osgi.framework, - org.osgi.service.log, org.osgi.util.tracker, org.slf4j;version=1.5, + org.w3c.dom, + org.xml.sax, </Import-Package> + <Embed-Transitive>true</Embed-Transitive> + <Embed-Dependency> + pax-web-api;inline=false, + pax-web-extender-war;inline=false, + </Embed-Dependency> </instructions> </configuration> </plugin> Copied: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java (from rev 94638, projects/jboss-osgi/projects/bundles/hotdeploy/trunk/src/main/java/org/jboss/osgi/hotdeploy/internal/DeploymentScannerActivator.java) =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java (rev 0) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WARSuppportActivator.java 2009-10-20 21:29:46 UTC (rev 95203) @@ -0,0 +1,44 @@ +/* + * 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.webapp.internal; + +//$Id$ + +import org.osgi.framework.BundleActivator; +import org.osgi.framework.BundleContext; + +/** + * The WebApp support activator + * + * @author thomas.diesler(a)jboss.com + * @since 20-Oct-2009 + */ +public class WARSuppportActivator implements BundleActivator +{ + public void start(BundleContext context) + { + } + + public void stop(BundleContext context) + { + } +} \ No newline at end of file Added: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java (rev 0) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java 2009-10-20 21:29:46 UTC (rev 95203) @@ -0,0 +1,122 @@ +/* + * 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.webapp.internal; + +//$Id$ + +import java.io.IOException; + +import org.jboss.osgi.deployment.common.Deployment; +import org.jboss.osgi.deployment.interceptor.AbstractLifecycleInterceptor; +import org.jboss.osgi.deployment.interceptor.LifecycleInterceptor; +import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorException; +import org.jboss.osgi.deployment.interceptor.LifecycleInterceptorService; +import org.jboss.virtual.VirtualFile; +import org.ops4j.pax.web.extender.war.internal.WebAppPublisherExt; +import org.ops4j.pax.web.extender.war.internal.model.WebApp; +import org.ops4j.pax.web.extender.war.internal.parser.dom.DOMWebXmlParser; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.ServiceReference; +import org.osgi.util.tracker.ServiceTracker; + +/** + * The WebApp lifecycle interceptor. + * + * @author thomas.diesler(a)jboss.com + * @since 20-Oct-2009 + */ +public class WebAppInterceptor extends AbstractLifecycleInterceptor implements LifecycleInterceptor +{ + private BundleContext context; + private ServiceTracker serviceTracker; + private WebAppPublisherExt publisher; + + public WebAppInterceptor(BundleContext context) + { + this.context = context; + this.publisher = new WebAppPublisherExt(); + } + + public void start() + { + final LifecycleInterceptor interceptor = this; + serviceTracker = new ServiceTracker(context, LifecycleInterceptorService.class.getName(), null) + { + @Override + public Object addingService(ServiceReference reference) + { + LifecycleInterceptorService service = (LifecycleInterceptorService)super.addingService(reference); + service.addInterceptor(interceptor); + return service; + } + + @Override + public void removedService(ServiceReference reference, Object service) + { + ((LifecycleInterceptorService)service).removeInterceptor(interceptor); + super.removedService(reference, service); + } + }; + serviceTracker.open(); + } + + public void stop() + { + if (serviceTracker != null) + { + serviceTracker.close(); + serviceTracker = null; + } + } + + public void invoke(int state, Deployment dep) throws LifecycleInterceptorException + { + if (state == Bundle.STARTING) + { + try + { + VirtualFile root = dep.getRoot(); + VirtualFile webXML = root.getChild("/WEB-INF/web.xml"); + if (webXML != null) + { + DOMWebXmlParser parser = new DOMWebXmlParser(); + WebApp webApp = parser.parse(webXML.openStream()); + dep.addAttachment(WebApp.class, webApp); + publisher.publish(webApp); + } + } + catch (IOException ex) + { + throw new LifecycleInterceptorException("Cannot parse web.xml", ex); + } + } + else if (state == Bundle.STOPPING) + { + WebApp webApp = dep.getAttachment(WebApp.class); + if (webApp != null) + { + publisher.unpublish(webApp); + } + } + } +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/jboss/osgi/webapp/internal/WebAppInterceptor.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/internal/WebAppPublisherExt.java =================================================================== --- projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/internal/WebAppPublisherExt.java (rev 0) +++ projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/internal/WebAppPublisherExt.java 2009-10-20 21:29:46 UTC (rev 95203) @@ -0,0 +1,34 @@ +/* + * 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.ops4j.pax.web.extender.war.internal; + +//$Id$ + +/** + * Public visibility for the package protected WebAppPublisher + * + * @author thomas.diesler(a)jboss.com + * @since 20-Oct-2009 + */ +public class WebAppPublisherExt extends WebAppPublisher +{ +} \ No newline at end of file Property changes on: projects/jboss-osgi/projects/bundles/webapp/trunk/src/main/java/org/ops4j/pax/web/extender/war/internal/WebAppPublisherExt.java ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95199 - in projects/jboss-osgi/trunk: testsuite and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 16:21:50 -0400 (Tue, 20 Oct 2009) New Revision: 95199 Modified: projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/testsuite/pom.xml Log: Update felix + pax-web Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-20 20:16:44 UTC (rev 95198) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-20 20:21:50 UTC (rev 95199) @@ -69,8 +69,7 @@ <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole> <version.jboss.osgi.xml.binding>2.0.1.SP1</version.jboss.osgi.xml.binding> - <version.ops4j.pax.base>1.2.1</version.ops4j.pax.base> - <version.ops4j.pax.web>0.7.0</version.ops4j.pax.web> + <version.ops4j.pax.web>0.7.1</version.ops4j.pax.web> <version.osgi>r4v42</version.osgi> </properties> @@ -222,17 +221,8 @@ <version>${version.jboss.osgi.framework}</version> </dependency> -  +  <dependency> -  - <groupId>org.ops4j.base</groupId> - <artifactId>ops4j-base-util-xml</artifactId> - <version>${version.ops4j.pax.base}</version> - </dependency> - <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-extender-war</artifactId> <version>${version.ops4j.pax.web}</version> Modified: projects/jboss-osgi/trunk/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-20 20:16:44 UTC (rev 95198) +++ projects/jboss-osgi/trunk/testsuite/pom.xml 2009-10-20 20:21:50 UTC (rev 95199) @@ -131,11 +131,6 @@  <dependency> - <groupId>org.ops4j.base</groupId> - <artifactId>ops4j-base-util-xml</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.ops4j.pax.web</groupId> <artifactId>pax-web-jetty-bundle</artifactId> <scope>provided</scope>

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95197 - in projects/jboss-osgi: trunk and 1 other directory.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 16:08:33 -0400 (Tue, 20 Oct 2009) New Revision: 95197 Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml projects/jboss-osgi/trunk/pom.xml Log: Update to Felix-2.0.1 Modified: projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-10-20 19:36:52 UTC (rev 95196) +++ projects/jboss-osgi/projects/runtime/felix/trunk/pom.xml 2009-10-20 20:08:33 UTC (rev 95197) @@ -20,7 +20,7 @@ <artifactId>jboss-osgi-runtime-felix</artifactId> <packaging>jar</packaging> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.1-SNAPSHOT</version>  <parent> @@ -37,7 +37,7 @@ </scm> <properties> - <version.felix.framework>2.0.0</version.felix.framework> + <version.felix.framework>2.0.1</version.felix.framework> <version.jboss.osgi.deployment>1.0.0-SNAPSHOT</version.jboss.osgi.deployment> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> </properties> Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-20 19:36:52 UTC (rev 95196) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-20 20:08:33 UTC (rev 95197) @@ -64,7 +64,7 @@ <version.jboss.osgi.microcontainer>1.0.3-SNAPSHOT</version.jboss.osgi.microcontainer> <version.jboss.osgi.runtime.deployers>1.0.2</version.jboss.osgi.runtime.deployers> <version.jboss.osgi.runtime.equinox>3.5</version.jboss.osgi.runtime.equinox> - <version.jboss.osgi.runtime.felix>2.0.0-SNAPSHOT</version.jboss.osgi.runtime.felix> + <version.jboss.osgi.runtime.felix>2.0.1-SNAPSHOT</version.jboss.osgi.runtime.felix> <version.jboss.osgi.runtime.jbossas>1.0.2-SNAPSHOT</version.jboss.osgi.runtime.jbossas> <version.jboss.osgi.spi>1.0.3-SNAPSHOT</version.jboss.osgi.spi> <version.jboss.osgi.webconsole>1.0.2</version.jboss.osgi.webconsole>

16 years, 2 months

1
0
0 / 0

JBoss-OSGI SVN: r95194 - in projects/jboss-osgi: projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix and 2 other directories.

by jboss-osgi-commits＠lists.jboss.org

Author: thomas.diesler(a)jboss.com Date: 2009-10-20 14:43:36 -0400 (Tue, 20 Oct 2009) New Revision: 95194 Modified: projects/jboss-osgi/projects/runtime/felix/trunk/ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java projects/jboss-osgi/trunk/pom.xml projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml Log: Resurect Felix BundleContextWrapper Property changes on: projects/jboss-osgi/projects/runtime/felix/trunk ___________________________________________________________________ Name: svn:mergeinfo - Modified: projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java =================================================================== --- projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java 2009-10-20 18:08:11 UTC (rev 95193) +++ projects/jboss-osgi/projects/runtime/felix/trunk/src/main/java/org/jboss/osgi/felix/FelixBundleContextWrapper.java 2009-10-20 18:43:36 UTC (rev 95194) @@ -23,13 +23,24 @@ //$Id$ +import java.net.MalformedURLException; +import java.net.URL; + import org.jboss.logging.Logger; +import org.jboss.osgi.deployment.deployer.DeployerService; import org.jboss.osgi.spi.framework.BundleContextWrapper; +import org.jboss.osgi.spi.util.BundleInfo; +import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; +import org.osgi.framework.BundleException; +import org.osgi.framework.ServiceReference; +import org.osgi.framework.Version; /** * The FelixBundleContextWrapper wrapps the BundleContext provided by the Felix implemenation. * + * It provides additional functionality on bundle install. + * * @author thomas.diesler(a)jboss.com * @since 15-Oct-2009 */ @@ -42,4 +53,59 @@ { super(context); } + + @Override + public Bundle installBundle(String location) throws BundleException + { + URL url; + try + { + url = new URL(location); + } + catch (MalformedURLException ex) + { + throw new IllegalArgumentException("Invalid bundle location: " + location); + } + + BundleInfo info = BundleInfo.createBundleInfo(url); + String symbolicName = info.getSymbolicName(); + Version version = Version.parseVersion(info.getVersion()); + + Bundle bundle; + + ServiceReference sref = context.getServiceReference(DeployerService.class.getName()); + if (sref != null) + { + DeployerService service = (DeployerService)context.getService(sref); + service.deploy(url); + bundle = getBundle(symbolicName, version, true); + } + else + { + bundle = context.installBundle(location); + } + + return bundle; + } + + private Bundle getBundle(String symbolicName, Version version, boolean mustExist) + { + Bundle bundle = null; + for (Bundle aux : getBundles()) + { + if (aux.getSymbolicName().equals(symbolicName)) + { + if (version == null || version.equals(aux.getVersion())) + { + bundle = aux; + break; + } + } + } + + if (bundle == null && mustExist == true) + throw new IllegalStateException("Cannot obtain bundle: " + symbolicName + "-" + version); + + return bundle; + } } \ No newline at end of file Modified: projects/jboss-osgi/trunk/pom.xml =================================================================== --- projects/jboss-osgi/trunk/pom.xml 2009-10-20 18:08:11 UTC (rev 95193) +++ projects/jboss-osgi/trunk/pom.xml 2009-10-20 18:43:36 UTC (rev 95194) @@ -257,6 +257,20 @@ </dependencies> </dependencyManagement> +  + <dependencies> + <dependency> + <groupId>org.jboss.logging</groupId> + <artifactId>jboss-logging-log4j</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + </dependencies> +  <repositories> <repository> Modified: projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml =================================================================== --- projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-10-20 18:08:11 UTC (rev 95193) +++ projects/jboss-osgi/trunk/reactor/blueprint/testsuite/pom.xml 2009-10-20 18:43:36 UTC (rev 95194) @@ -236,11 +236,6 @@ <artifactId>jboss-osgi-framework</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> <plugins> @@ -280,11 +275,6 @@ <artifactId>jboss-osgi-framework</artifactId> <scope>provided</scope> </dependency> - <dependency> - <groupId>org.jboss.logging</groupId> - <artifactId>jboss-logging-log4j</artifactId> - <scope>provided</scope> - </dependency> </dependencies> <build> <plugins>

16 years, 2 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

jboss-osgi-commits October 2009