Fix client packaging

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

diff --git a/dep/org.argeo.slc.dep.agent.extras/p2.inf b/dep/org.argeo.slc.dep.agent.extras/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
--- a/dep/org.argeo.slc.dep.agent.extras/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.agent.extras/pom.xml b/dep/org.argeo.slc.dep.agent.extras/pom.xml
deleted file mode 100644 (file)
index c89d132..0000000
--- a/dep/org.argeo.slc.dep.agent.extras/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<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>
-       <parent>
-               <groupId>org.argeo.slc</groupId>
-               <artifactId>dep</artifactId>
-               <version>0.13.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.dep</groupId>
-       <artifactId>org.argeo.slc.dep.agent.extras</artifactId>
-       <packaging>jar</packaging>
-       <name>SLC Agent Extras Dependencies</name>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.maven</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 264460f5a7f326b68981b57409938505798d0969..cc24140d488204bd18ebe30c85aca9d939345dd8 100644 (file)
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -65,6 +65,11 @@
                        <artifactId>org.argeo.slc.launcher</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.maven</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
 
                <!-- Spring -->
                <dependency>

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 674a825a9cd180ff81ba34b7c6d07d03ffce5a4d..2593a73202f19b15510c0bdbe63e940207b3601c 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -11,7 +11,14 @@
        <groupId>org.argeo.slc.dep</groupId>
        <artifactId>org.argeo.slc.backend</artifactId>
        <name>SLC BACKEND Dependencies</name>
-
+<!--   <build>-->
+<!--           <plugins>-->
+<!--                   <plugin>-->
+<!--                           <groupId>org.argeo.maven.plugins</groupId>-->
+<!--                           <artifactId>maven-argeo-osgi-plugin</artifactId>-->
+<!--                   </plugin>-->
+<!--           </plugins>-->
+<!--   </build>-->
        <dependencies>
                <!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
                        by Spring-LDAP while Apache Directory takes 2.1.0 -->
@@ -26,11 +33,6 @@
                        <artifactId>org.argeo.slc.dep.agent</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.agent.extras</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.server</artifactId>

diff --git a/dep/org.argeo.slc.dep.sdk/p2.inf b/dep/org.argeo.slc.dep.sdk/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
--- a/dep/org.argeo.slc.dep.sdk/p2.inf
+++ /dev/null
@@ -1,2 +0,0 @@
-properties.1.name=org.eclipse.equinox.p2.type.category
-properties.1.value=true
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.sdk/pom.xml b/dep/org.argeo.slc.dep.sdk/pom.xml
deleted file mode 100644 (file)
index d589964..0000000
--- a/dep/org.argeo.slc.dep.sdk/pom.xml
+++ /dev/null
@@ -1,144 +0,0 @@
-<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>
-       <parent>
-               <groupId>org.argeo.slc</groupId>
-               <artifactId>dep</artifactId>
-               <version>0.13.1-SNAPSHOT</version>
-               <relativePath>..</relativePath>
-       </parent>
-       <groupId>org.argeo.slc.dep</groupId>
-       <artifactId>org.argeo.slc.dep.sdk</artifactId>
-       <packaging>jar</packaging>
-       <name>SLC SDK Dependencies</name>
-       <dependencies>
-               <!-- HACK because of dependencies pb with Maven: version 2.4.0 is required 
-                       by Spring-LDAP while Apache Directory takes 2.1.0 -->
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.lang</artifactId>
-                       <version>2.4.0</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.agent</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.agent.extras</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.server</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.detached</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.gis</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.eclipse</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <!-- SLC non deps -->
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.unit</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.server</groupId>
-                       <artifactId>org.argeo.slc.ria</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-               <!-- Modules (see profiles below) -->
-
-               <!-- Launcher -->
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.launcher</artifactId>
-                       <version>${project.version}</version>
-                       <type>tar.gz</type>
-                       <classifier>base</classifier>
-               </dependency>
-
-               <!-- Felix -->
-               <dependency>
-                       <groupId>org.apache.felix</groupId>
-                       <artifactId>org.osgi.service.obr</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.felix</groupId>
-                       <artifactId>org.apache.felix.bundlerepository</artifactId>
-               </dependency>
-
-       </dependencies>
-       <profiles>
-               <profile>
-                       <id>sdkWithModules</id>
-                       <activation>
-                               <activeByDefault>true</activeByDefault>
-                       </activation>
-                       <dependencies>
-                               <dependency>
-                                       <groupId>org.argeo.slc.modules</groupId>
-                                       <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-                                       <version>${project.version}</version>
-                                       <type>pom</type>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.slc.modules</groupId>
-                                       <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-                                       <version>${project.version}</version>
-                                       <type>pom</type>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.slc.eclipse</groupId>
-                                       <artifactId>org.argeo.slc.eclipse.plugins.modules.bundles</artifactId>
-                                       <version>${project.version}</version>
-                                       <type>pom</type>
-                               </dependency>
-                       </dependencies>
-               </profile>
-               <profile>
-                       <id>sdkWithoutModules</id>
-               </profile>
-               <profile>
-                       <id>release</id>
-                       <properties>
-                               <argeo.p2.repository>/srv/projects/slc/www/sdk</argeo.p2.repository>
-                       </properties>
-                       <dependencies>
-                               <dependency>
-                                       <groupId>org.argeo.slc.modules</groupId>
-                                       <artifactId>org.argeo.slc.modules.agent.bundles</artifactId>
-                                       <version>${project.version}</version>
-                                       <type>pom</type>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.slc.modules</groupId>
-                                       <artifactId>org.argeo.slc.modules.server.bundles</artifactId>
-                                       <version>${project.version}</version>
-                                       <type>pom</type>
-                               </dependency>
-                               <dependency>
-                                       <groupId>org.argeo.slc.eclipse</groupId>
-                                       <artifactId>org.argeo.slc.eclipse.plugins.modules.bundles</artifactId>
-                                       <version>${project.version}</version>
-                                       <type>pom</type>
-                               </dependency>
-                       </dependencies>
-               </profile>
-       </profiles>
-</project>
\ No newline at end of file

diff --git a/dep/pom.xml b/dep/pom.xml
index 1028867794c58964c60bb241eb78005408f32f4d..ea056d031ee7f1d44ae8368ed9ea43cf65d25c1a 100644 (file)
--- a/dep/pom.xml
+++ b/dep/pom.xml
@@ -12,7 +12,6 @@
        <packaging>pom</packaging>
        <modules>
                <module>org.argeo.slc.dep.agent</module>
-               <module>org.argeo.slc.dep.agent.extras</module>
                <module>org.argeo.slc.dep.server</module>
                <module>org.argeo.slc.dep.detached</module>
                <module>org.argeo.slc.dep.gis</module>
@@ -37,35 +36,6 @@
                                        <useLastCommittedRevision>false</useLastCommittedRevision>
                                </configuration>
                        </plugin>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <version>${version.maven-bundle-plugin}</version>
-                               <configuration>
-                                       <manifestLocation>META-INF</manifestLocation>
-                                       <instructions>
-                                               <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                                               <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version>
-                                       </instructions>
-                               </configuration>
-                               <executions>
-                                       <execution>
-                                               <id>bundle-manifest</id>
-                                               <phase>process-resources</phase>
-                                               <goals>
-                                                       <goal>manifest</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
                </plugins>
                <pluginManagement>
                        <plugins>
@@ -107,18 +77,5 @@
                                </plugin>
                        </plugins>
                </pluginManagement>
-               <!-- TO BE DELETED <plugin> <groupId>org.argeo.maven.plugins</groupId> 
-                       <artifactId>maven-argeo-osgi-plugin</artifactId> <executions> <execution> 
-                       <id>resolve-pde-sources</id> <goals> <goal>pde-sources</goal> </goals> <phase>generate-resources</phase> 
-                       <configuration> <copyArtifacts>true</copyArtifacts> </configuration> </execution> 
-                       <execution> <goals> <goal>descriptors</goal> </goals> <phase>generate-resources</phase> 
-                       </execution> </executions> </plugin> -->
-               <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>build-helper-maven-plugin</artifactId> 
-                       <executions> <execution> <id>attach-artifacts</id> <phase>package</phase> 
-                       <goals> <goal>attach-artifact</goal> </goals> <configuration> <artifacts> 
-                       <artifact> <file>target/classes/modularDistribution.csv</file> <type>csv</type> 
-                       <classifier>modularDistribution</classifier> </artifact> </artifacts> </configuration> 
-                       </execution> </executions> </plugin> -->
-               <!-- </plugins> -->
        </build>
 </project>
\ No newline at end of file

diff --git a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
index 6d1190414657b990d2b08add8e0e771491d68905..013cc15216bcf67ed985912cee1fa16d2b06eb80 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
+++ b/eclipse/plugins/org.argeo.slc.client.ui.dist/src/main/java/org/argeo/slc/client/ui/dist/views/ModulesView.java
@@ -3,6 +3,7 @@ package org.argeo.slc.client.ui.dist.views;
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.argeo.eclipse.ui.TreeObject;
 import org.argeo.eclipse.ui.TreeParent;
 import org.argeo.slc.client.ui.dist.DistPlugin;
 import org.eclipse.jface.viewers.ITableLabelProvider;
@@ -16,6 +17,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.part.ViewPart;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
 
 public class ModulesView extends ViewPart {
        private TreeViewer viewer;
@@ -49,6 +51,8 @@ public class ModulesView extends ViewPart {
                                                moduleNodes.add(new ModuleNode(bundle));
                                }
                                return moduleNodes.toArray();
+                       } else if (parentElement instanceof TreeParent) {
+                               return ((TreeParent) parentElement).getChildren();
                        } else {
                                return null;
                        }
@@ -60,6 +64,9 @@ public class ModulesView extends ViewPart {
                }
 
                public boolean hasChildren(Object element) {
+                       if (element instanceof TreeParent) {
+                               return ((TreeParent) element).hasChildren();
+                       }
                        return false;
                }
 
@@ -89,12 +96,37 @@ public class ModulesView extends ViewPart {
 
        }
 
-       private class ModuleNode extends TreeParent {
+       class ModuleNode extends TreeParent {
                private final Bundle bundle;
 
                public ModuleNode(Bundle bundle) {
                        super(bundle.getSymbolicName());
                        this.bundle = bundle;
+
+                       // Registered services
+                       ServiceReference[] registeredServices = bundle
+                                       .getRegisteredServices();
+                       if (registeredServices != null) {
+                               TreeParent registeredServicesNode = new TreeParent(
+                                               "Registered Services");
+                               addChild(registeredServicesNode);
+                               for (ServiceReference sr : registeredServices) {
+                                       if (sr != null)
+                                               registeredServicesNode
+                                                               .addChild(new ServiceReferenceNode(sr));
+                               }
+                       }
+
+                       // Used services
+                       ServiceReference[] usedServices = bundle.getRegisteredServices();
+                       if (usedServices != null) {
+                               TreeParent usedServicesNode = new TreeParent("Used Services");
+                               addChild(usedServicesNode);
+                               for (ServiceReference sr : usedServices) {
+                                       if (sr != null)
+                                               usedServicesNode.addChild(new ServiceReferenceNode(sr));
+                               }
+                       }
                }
 
                public Bundle getBundle() {
@@ -102,4 +134,37 @@ public class ModulesView extends ViewPart {
                }
 
        }
+
+       class ServiceReferenceNode extends TreeParent {
+               private final ServiceReference serviceReference;
+
+               public ServiceReferenceNode(ServiceReference serviceReference) {
+                       super(serviceReference.toString());
+                       this.serviceReference = serviceReference;
+
+                       Bundle[] usedBundles = serviceReference.getUsingBundles();
+                       if (usedBundles != null) {
+                               TreeParent usingBundles = new TreeParent("Using Bundles");
+                               addChild(usingBundles);
+                               for (Bundle b : usedBundles) {
+                                       if (b != null)
+                                               usingBundles.addChild(new TreeObject(b
+                                                               .getSymbolicName()));
+                               }
+                       }
+
+                       TreeParent properties = new TreeParent("Properties");
+                       addChild(properties);
+                       for (String key : serviceReference.getPropertyKeys()) {
+                               properties.addChild(new TreeObject(key + "="
+                                               + serviceReference.getProperty(key)));
+                       }
+
+               }
+
+               public ServiceReference getServiceReference() {
+                       return serviceReference;
+               }
+
+       }
 }

diff --git a/eclipse/plugins/pom.xml b/eclipse/plugins/pom.xml
index 82c0380b42ccb91b84b5b65c740ffc3ebda19ab4..ce8b8d2c4caee5b2daa231bb0f5b563c99dfb62a 100644 (file)
--- a/eclipse/plugins/pom.xml
+++ b/eclipse/plugins/pom.xml
@@ -27,36 +27,5 @@
                                </includes>
                        </resource>
                </resources>
-               <plugins>
-                       <plugin>
-                               <artifactId>maven-jar-plugin</artifactId>
-                               <configuration>
-                                       <archive>
-                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                       </archive>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-compiler-plugin</artifactId>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-source-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>attach-sources</id>
-                                               <phase>package</phase>
-                                               <goals>
-                                                       <goal>jar</goal>
-                                               </goals>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                       </plugin>
-               </plugins>
        </build>
 </project>

diff --git a/eclipse/runtime/pom.xml b/eclipse/runtime/pom.xml
index 1729d468061ab2ff8890da1043b3daf2c15dc7bb..915131f8852784889ebf727242f49360912c4b29 100644 (file)
--- a/eclipse/runtime/pom.xml
+++ b/eclipse/runtime/pom.xml
@@ -15,4 +15,16 @@
                <module>org.argeo.slc.client.oxm</module>
                <module>org.argeo.slc.client.core</module>
        </modules>
+       <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>plugin.xml</include>
+                                       <include>META-INF/**</include>
+                                       <include>icons/**</include>
+                               </includes>
+                       </resource>
+               </resources>
+       </build>
 </project>