Fix OSGi namespace

git-svn-id: https://svn.argeo.org/slc/trunk@3999 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product
index 2441fa14c90800ecb1058c0d079e6f93f6b9cd63..ef7a3a3c2bb2bd22ef24a2f9a3cd6371537a88c7 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product
@@ -3,6 +3,7 @@
 
 <product name="SLC" uid="org.argeo.slc.client.rcp.product" id="org.argeo.slc.client.rcp.product" application="org.argeo.slc.client.rcp.application" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">
 
+
    <configIni use="default">
    </configIni>
 
@@ -13,6 +14,7 @@
 
    <windowImages i16="icons/argeo-icon-256.png"/>
 
+
    <launcher>
       <solaris/>
       <win useIco="false">
@@ -20,15 +22,16 @@
       </win>
    </launcher>
 
+
    <vm>
    </vm>
 
+
    <plugins>
       <plugin id="com.ibm.icu"/>
       <plugin id="com.springsource.antlr"/>
       <plugin id="com.springsource.bsh"/>
       <plugin id="com.springsource.com.jcraft.jsch"/>
-      <plugin id="com.springsource.com.jcraft.jzlib"/>
       <plugin id="com.springsource.com.lowagie.text"/>
       <plugin id="com.springsource.com.mysql.jdbc"/>
       <plugin id="com.springsource.com.thoughtworks.xstream"/>
@@ -68,7 +71,6 @@
       <plugin id="com.springsource.org.aopalliance"/>
       <plugin id="com.springsource.org.apache.bsf"/>
       <plugin id="com.springsource.org.apache.commons.beanutils"/>
-      <plugin id="com.springsource.org.apache.commons.cli"/>
       <plugin id="com.springsource.org.apache.commons.codec"/>
       <plugin id="com.springsource.org.apache.commons.collections"/>
       <plugin id="com.springsource.org.apache.commons.dbcp"/>
@@ -121,6 +123,7 @@
       <plugin id="com.springsource.org.jgroups"/>
       <plugin id="com.springsource.org.mortbay.jetty.server"/>
       <plugin id="com.springsource.org.mortbay.util"/>
+      <plugin id="com.springsource.org.objectweb.asm"/>
       <plugin id="com.springsource.org.postgresql.jdbc3"/>
       <plugin id="com.springsource.org.quartz"/>
       <plugin id="com.springsource.org.tmatesoft.svn"/>
@@ -129,8 +132,10 @@
       <plugin id="com.springsource.slf4j.log4j" fragment="true"/>
       <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
       <plugin id="org.argeo.basic.nodeps"/>
+      <plugin id="org.argeo.dep.org.freecompany.redline"/>
       <plugin id="org.argeo.dep.osgi.activemq"/>
       <plugin id="org.argeo.dep.osgi.activemq.optional" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.commons.cli"/>
       <plugin id="org.argeo.dep.osgi.commons.exec"/>
       <plugin id="org.argeo.dep.osgi.directory.shared.asn.codec" fragment="true"/>
       <plugin id="org.argeo.dep.osgi.geoapi"/>
@@ -139,12 +144,10 @@
       <plugin id="org.argeo.dep.osgi.java3d"/>
       <plugin id="org.argeo.dep.osgi.jsr275"/>
       <plugin id="org.argeo.dep.osgi.jts"/>
-      <plugin id="org.argeo.dep.osgi.maven.embedder"/>
       <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.poi"/>
       <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
       <plugin id="org.argeo.eclipse.ui"/>
-      <plugin id="org.argeo.infra.core" fragment=""/>
-      <plugin id="org.argeo.infra.security.services" fragment="true"/>
       <plugin id="org.argeo.security.core"/>
       <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
@@ -158,11 +161,12 @@
       <plugin id="org.argeo.slc.client.agent"/>
       <plugin id="org.argeo.slc.client.commons"/>
       <plugin id="org.argeo.slc.client.core"/>
-      <plugin id="org.argeo.slc.client.gis" fragment=""/>
+      <plugin id="org.argeo.slc.client.gis"/>
       <plugin id="org.argeo.slc.client.hibernate"/>
       <plugin id="org.argeo.slc.client.oxm"/>
       <plugin id="org.argeo.slc.client.rcp"/>
       <plugin id="org.argeo.slc.client.ui"/>
+      <plugin id="org.argeo.slc.client.ui.dist"/>
       <plugin id="org.argeo.slc.core"/>
       <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
       <plugin id="org.argeo.slc.demo.ant"/>
@@ -171,8 +175,8 @@
       <plugin id="org.argeo.slc.detached"/>
       <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
       <plugin id="org.argeo.slc.gis.ext.dbcp" fragment="true"/>
-      <plugin id="org.argeo.slc.gis.position.backend" fragment=""/>
-      <plugin id="org.argeo.slc.gis.position.gpsbabel" fragment=""/>
+      <plugin id="org.argeo.slc.gis.position.backend"/>
+      <plugin id="org.argeo.slc.gis.position.gpsbabel"/>
       <plugin id="org.argeo.slc.server"/>
       <plugin id="org.argeo.slc.server.castor"/>
       <plugin id="org.argeo.slc.server.h2"/>
@@ -184,7 +188,7 @@
       <plugin id="org.argeo.slc.support.castor" fragment="true"/>
       <plugin id="org.argeo.slc.support.gis"/>
       <plugin id="org.argeo.slc.support.hibernate" fragment="true"/>
-      <plugin id="org.argeo.slc.support.maven" fragment="true"/>
+      <plugin id="org.argeo.slc.support.maven"/>
       <plugin id="org.argeo.slc.support.osgi"/>
       <plugin id="org.argeo.slc.support.simple"/>
       <plugin id="org.eclipse.core.commands"/>
@@ -221,6 +225,7 @@
       <plugin id="org.springframework.osgi.extender"/>
       <plugin id="org.springframework.osgi.io"/>
       <plugin id="org.springframework.oxm"/>
+      <plugin id="org.springframework.security.acls" fragment="true"/>
       <plugin id="org.springframework.security.core"/>
       <plugin id="org.springframework.transaction"/>
       <plugin id="org.springframework.web"/>

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchAdvisor.java
index 8cf2253bf9f238399b255cc11a14ffdc2599638f..ae2a6b7d153cc4c948b32d11e73ac51e71374d47 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchAdvisor.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.rcp/src/main/java/org/argeo/slc/client/rcp/ApplicationWorkbenchAdvisor.java
@@ -14,6 +14,7 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
        private static final String PERSPECTIVE_ID = "org.argeo.slc.client.ui.perspectives.slcExecution";
+//     private static final String PERSPECTIVE_ID = "org.argeo.slc.client.ui.dist.distributionPerspective";
 
        public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
                        IWorkbenchWindowConfigurer configurer) {

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
index 736d2ce3677687e8d3eedc673da1d8dc31049219..7652771b18fcff5829041dd283baf55226b7058b 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/META-INF/MANIFEST.MF
@@ -4,4 +4,8 @@ Bundle-Name: Dist
 Bundle-SymbolicName: org.argeo.slc.client.ui.dist;singleton:=true
 Bundle-Version: 1.0.0.qualifier
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.ui;bundle-version="3.6.1"
+Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
+ org.eclipse.core.runtime;bundle-version="3.6.0"
+Bundle-Activator: org.argeo.slc.client.ui.dist.DistPlugin
+Import-Package: org.argeo.eclipse.ui
+Bundle-ActivationPolicy: lazy

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/plugin.xml b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/plugin.xml
index 9933ac1d90083ce8e034c3a6657363824072c7c7..ba72b79923407dcb48cc16231d9de282eb5bf7e7 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/plugin.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/plugin.xml
@@ -10,4 +10,13 @@
             icon="icons/distribution_perspective.gif">
       </perspective>
    </extension>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            class="org.argeo.slc.client.ui.dist.views.ModulesView"
+            id="org.argeo.slc.client.ui.dist.modulesView"
+            name="Modules"
+            restorable="true">
+      </view>
+   </extension>
 </plugin>

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistPlugin.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistPlugin.java
new file mode 100644 (file)
index 0000000..c651aba
--- /dev/null
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistPlugin.java
@@ -0,0 +1,18 @@
+package org.argeo.slc.client.ui.dist;
+
+import org.eclipse.ui.plugin.AbstractUIPlugin;
+import org.osgi.framework.BundleContext;
+
+public class DistPlugin extends AbstractUIPlugin {
+       private static BundleContext bundleContext;
+
+       @Override
+       public void start(BundleContext context) throws Exception {
+               bundleContext = context;
+       }
+
+       public static BundleContext getBundleContext() {
+               return bundleContext;
+       }
+
+}

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
index 55856e84da3617354fcf66f274bcb70fa7dad28d..c31830a2d71370787ea2568c5de0c7c3e483da30 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/DistributionPerspective.java
@@ -1,13 +1,20 @@
 package org.argeo.slc.client.ui.dist;
 
+import org.eclipse.ui.IFolderLayout;
 import org.eclipse.ui.IPageLayout;
 import org.eclipse.ui.IPerspectiveFactory;
 
-public class DistributionPerspective  implements IPerspectiveFactory{
+public class DistributionPerspective implements IPerspectiveFactory {
 
        public void createInitialLayout(IPageLayout layout) {
-               // TODO Auto-generated method stub
-               
+               String editorArea = layout.getEditorArea();
+               layout.setEditorAreaVisible(false);
+               layout.setFixed(false);
+
+               IFolderLayout main = layout.createFolder("main", IPageLayout.RIGHT,
+                               0.3f, editorArea);
+               main.addView("org.argeo.slc.client.ui.dist.modulesView");
+
        }
 
 }

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
new file mode 100644 (file)
index 0000000..6d11904
--- /dev/null
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
@@ -0,0 +1,105 @@
+package org.argeo.slc.client.ui.dist.views;
+
+import java.util.Set;
+import java.util.TreeSet;
+
+import org.argeo.eclipse.ui.TreeParent;
+import org.argeo.slc.client.ui.dist.DistPlugin;
+import org.eclipse.jface.viewers.ITableLabelProvider;
+import org.eclipse.jface.viewers.ITreeContentProvider;
+import org.eclipse.jface.viewers.LabelProvider;
+import org.eclipse.jface.viewers.TreeViewer;
+import org.eclipse.jface.viewers.Viewer;
+import org.eclipse.swt.SWT;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Composite;
+import org.eclipse.ui.part.ViewPart;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+
+public class ModulesView extends ViewPart {
+       private TreeViewer viewer;
+
+       @Override
+       public void createPartControl(Composite parent) {
+               viewer = new TreeViewer(parent, SWT.MULTI | SWT.H_SCROLL | SWT.V_SCROLL);
+               viewer.setContentProvider(new ModulesContentProvider());
+               viewer.setLabelProvider(new ModulesLabelProvider());
+               viewer.setInput(DistPlugin.getBundleContext());
+       }
+
+       @Override
+       public void setFocus() {
+               viewer.getTree().setFocus();
+       }
+
+       private class ModulesContentProvider implements ITreeContentProvider {
+
+               public Object[] getElements(Object inputElement) {
+                       return getChildren(inputElement);
+               }
+
+               public Object[] getChildren(Object parentElement) {
+                       if (parentElement instanceof BundleContext) {
+                               BundleContext bundleContext = (BundleContext) parentElement;
+                               Bundle[] bundles = bundleContext.getBundles();
+                               Set<ModuleNode> moduleNodes = new TreeSet<ModulesView.ModuleNode>();
+                               for (Bundle bundle : bundles) {
+                                       if (bundle.getState() == Bundle.ACTIVE)
+                                               moduleNodes.add(new ModuleNode(bundle));
+                               }
+                               return moduleNodes.toArray();
+                       } else {
+                               return null;
+                       }
+               }
+
+               public Object getParent(Object element) {
+                       // TODO Auto-generated method stub
+                       return null;
+               }
+
+               public boolean hasChildren(Object element) {
+                       return false;
+               }
+
+               public void dispose() {
+                       // TODO Auto-generated method stub
+
+               }
+
+               public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+                       // TODO Auto-generated method stub
+
+               }
+
+       }
+
+       private class ModulesLabelProvider extends LabelProvider implements
+                       ITableLabelProvider {
+
+               public Image getColumnImage(Object element, int columnIndex) {
+                       // TODO Auto-generated method stub
+                       return null;
+               }
+
+               public String getColumnText(Object element, int columnIndex) {
+                       return getText(element);
+               }
+
+       }
+
+       private class ModuleNode extends TreeParent {
+               private final Bundle bundle;
+
+               public ModuleNode(Bundle bundle) {
+                       super(bundle.getSymbolicName());
+                       this.bundle = bundle;
+               }
+
+               public Bundle getBundle() {
+                       return bundle;
+               }
+
+       }
+}

diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/osgi.xml b/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
index bf04793a06132ea6884e292907d21fe5a2d42f19..917cf66ac62c3822c9560818c55dadf3d109ce08 100644 (file)
--- a/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
+++ b/eclipse/plugins/runtime/org.argeo.slc.client.ui/META-INF/spring/osgi.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
+       xmlns:osgi="http://www.springframework.org/schema/osgi"\r
        xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
        http://www.springframework.org/schema/beans   \r