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()