[Carbon-dev] svn commit r15887 - in trunk/carbon/org.wso2.carbon.component/src/main: java/org/wso2/carbon/component java/org/wso2/carbon/component/internal resources/META-INF

[svn at wso2.org]

Author: saminda
Date: Mon Apr 21 01:48:43 2008
New Revision: 15887

Log:

changes 


Removed:
   trunk/carbon/org.wso2.carbon.component/src/main/resources/META-INF/
Modified:
   trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/ComponentDeployer.java
   trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/internal/Activator.java

Modified: trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/ComponentDeployer.java
==============================================================================
--- trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/ComponentDeployer.java	(original)
+++ trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/ComponentDeployer.java	Mon Apr 21 01:48:43 2008
@@ -94,7 +94,7 @@
         try {
             // Transform
             for (String templatSuffix : mainTemplateSuffixes) {
-                String xslResourceName = "ui" + templatSuffix + ".xsl";
+                String xslResourceName = "ui/" + templatSuffix + ".xsl";
                 URL xslResource = componentBundle.getResource(xslResourceName);
                 if (xslResource == null) {
                     throw new CarbonException(xslResourceName + " is not avaiable in component bundle");

Modified: trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/internal/Activator.java
==============================================================================
--- trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/internal/Activator.java	(original)
+++ trunk/carbon/org.wso2.carbon.component/src/main/java/org/wso2/carbon/component/internal/Activator.java	Mon Apr 21 01:48:43 2008
@@ -17,14 +17,18 @@
 
 import org.eclipse.equinox.http.helper.BundleEntryHttpContext;
 import org.eclipse.equinox.http.helper.ContextPathServletAdaptor;
-import org.osgi.framework.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleActivator;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 import org.osgi.service.http.HttpContext;
 import org.osgi.service.http.HttpService;
 import org.osgi.service.packageadmin.PackageAdmin;
-import org.osgi.util.tracker.ServiceTrackerCustomizer;
 import org.osgi.util.tracker.ServiceTracker;
+import org.osgi.util.tracker.ServiceTrackerCustomizer;
 import org.wso2.carbon.component.DeploymentEngine;
 import org.wso2.carbon.component.JspServlet;
+import org.wso2.carbon.CarbonException;
 
 import javax.servlet.Servlet;
 import java.util.Dictionary;
@@ -33,7 +37,7 @@
 /**
  * Carbon UI framework activator
  */
-public class Activator implements BundleActivator, ServiceTrackerCustomizer, BundleListener {
+public class Activator implements BundleActivator, ServiceTrackerCustomizer {
 
     /**
      *
@@ -61,7 +65,6 @@
         this.context = context;
         packageAdminTracker = new ServiceTracker(context, PackageAdmin.class.getName(), this);
         packageAdminTracker.open();
-        this.context.addBundleListener(this);
         deploymentEngine = new DeploymentEngine(context.getBundle());
 
         ServiceReference reference = context.getServiceReference(HttpService.class.getName());
@@ -86,11 +89,17 @@
             httpService.registerResources("/main-cmd", "/",
                                           commonContext);
 
-            Servlet adaptedJspServlet = new ContextPathServletAdaptor(
+            Servlet adaptedJspServlet1 = new ContextPathServletAdaptor(
+                    new JspServlet(context.getBundle(), "/web"),
+                    "/main-cmd");
+            httpService.registerServlet("/main-cmd/*.jsp", adaptedJspServlet1, null,
+                                        commonContext);
+            Servlet adaptedJspServlet2 = new ContextPathServletAdaptor(
                     new JspServlet(context.getBundle(), "/web"),
                     "/main-cmd");
-            httpService.registerServlet("/main-cmd/*.jsp", adaptedJspServlet, null,
+            httpService.registerServlet("/main-cmd/*.command", adaptedJspServlet2, null,
                                         commonContext);
+            generateUi();
         } catch (Exception e) {
             // TODO Auto-generated catch block
             e.printStackTrace();
@@ -105,6 +114,7 @@
             httpService.unregister("/init-tiles-servlet"); //$NON-NLS-1$
             httpService.unregister("/main-cmd"); //$NON-NLS-1$
             httpService.unregister("/main-cmd/*.jsp"); //$NON-NLS-1$
+            httpService.unregister("/main-cmd/*.command"); //$NON-NLS-1$
         }
         packageAdminTracker.close();
         packageAdminTracker = null;
@@ -143,15 +153,13 @@
         return packageAdmin.getFragments(bundle);
     }
 
-    public void bundleChanged(BundleEvent event) {
-        Bundle bundle = event.getBundle();
-        switch (event.getType()) {
-            case BundleEvent.STARTED:
+    public void generateUi() throws CarbonException {
+        for (Bundle bundle : context.getBundles()) {
+            if (bundle.getState() == Bundle.ACTIVE) {
                 deploymentEngine.process(bundle);
-                break;
-            case BundleEvent.STOPPED:
-                //TODO write the logic when the bundle is removed or stoped.
-                break;
+            }
         }
+        deploymentEngine.layout();
     }
+
 }