]> git.argeo.org Git - gpl/argeo-slc.git/commitdiff
introduction of new architecture for target platforms with sdk.rap and sdk.rcp distin...
authorBruno Sinou <bsinou@argeo.org>
Fri, 11 Feb 2011 19:10:26 +0000 (19:10 +0000)
committerBruno Sinou <bsinou@argeo.org>
Fri, 11 Feb 2011 19:10:26 +0000 (19:10 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@4132 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

70 files changed:
demo/slc_demo_rap.properties [new file with mode: 0644]
dep/org.argeo.slc.dep.agent.extras/pom.xml
dep/org.argeo.slc.dep.agent/pom.xml
dep/org.argeo.slc.dep.backend/p2.inf [new file with mode: 0644]
dep/org.argeo.slc.dep.backend/pom.xml [new file with mode: 0644]
dep/org.argeo.slc.dep.detached/pom.xml
dep/org.argeo.slc.dep.sdk.rap/p2.inf [new file with mode: 0644]
dep/org.argeo.slc.dep.sdk.rap/pom.xml [new file with mode: 0644]
dep/org.argeo.slc.dep.sdk.rcp/p2.inf [new file with mode: 0644]
dep/org.argeo.slc.dep.sdk.rcp/pom.xml [new file with mode: 0644]
dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product [new file with mode: 0644]
dep/org.argeo.slc.dep.sdk.sources/p2.inf [deleted file]
dep/org.argeo.slc.dep.sdk.sources/pom.xml [deleted file]
dep/org.argeo.slc.dep.sdk/pom.xml
dep/org.argeo.slc.dep.server/pom.xml
dep/pom.xml
dist/org.argeo.slc.sdk/pom.xml
eclipse/plugins/org.argeo.slc.client.rap/.classpath [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/.project [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/build.properties [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/plugin.xml [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/rap.properties [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java [deleted file]
eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java [deleted file]
eclipse/plugins/runtime/org.argeo.slc.client.rap/.classpath [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/.project [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/META-INF/MANIFEST.MF [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/build.properties [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/plugin.xml [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java [new file with mode: 0644]
eclipse/plugins/runtime/org.argeo.slc.client.rcp/pom.xml
eclipse/plugins/runtime/org.argeo.slc.client.rcp/slc-client-rcp.product [deleted file]
eclipse/plugins/runtime/org.argeo.slc.client.ui/pom.xml
eclipse/plugins/runtime/pom.xml
integration-tests/org.argeo.slc.it.webapp/pom.xml
pom.xml
runtime/org.argeo.slc.core/pom.xml
runtime/org.argeo.slc.launcher/pom.xml
runtime/org.argeo.slc.lib.detached/pom.xml
runtime/org.argeo.slc.server/pom.xml
runtime/org.argeo.slc.support.activemq/pom.xml
runtime/org.argeo.slc.support.ant/pom.xml
runtime/org.argeo.slc.support.castor/pom.xml
runtime/org.argeo.slc.support.equinox/pom.xml
runtime/org.argeo.slc.support.gis/pom.xml
runtime/org.argeo.slc.support.hibernate/pom.xml
runtime/org.argeo.slc.support.jcr/pom.xml
runtime/org.argeo.slc.support.maven/pom.xml
runtime/org.argeo.slc.support.osgi/pom.xml
runtime/org.argeo.slc.support.simple/pom.xml
runtime/org.argeo.slc.support.ws.client/pom.xml
runtime/org.argeo.slc.unit/pom.xml
server/org.argeo.slc.ria/pom.xml

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
new file mode 100644 (file)
index 0000000..f128e25
--- /dev/null
@@ -0,0 +1,40 @@
+argeo.osgi.start=\
+com.springsource.javax.servlet,\
+org.eclipse.core.runtime,\
+org.eclipse.equinox.common,\
+org.eclipse.equinox.http.jetty,\
+org.eclipse.equinox.http.registry,\
+org.eclipse.equinox.launcher,\
+org.mortbay.jetty.server,\
+org.springframework.osgi.extender,\
+org.argeo.slc.agent,\
+org.argeo.slc.client.agent,\
+org.argeo.slc.client.hibernate,\
+org.argeo.slc.client.oxm,\
+org.argeo.slc.demo.ant,\
+org.argeo.slc.demo.basic,\
+org.argeo.slc.server.castor,\
+org.argeo.slc.server.h2,\
+org.argeo.slc.server.hibernate,\
+org.argeo.slc.server.services,\
+
+#org.argeo.server.ads.server,\
+#org.argeo.security.manager.ldap,\
+#org.argeo.security.services,\
+#org.argeo.security.manager.ldap,\
+
+#org.argeo.security.ui.initialPerspective=com.agfa.sebi.client.ui.consultEbiPerspective
+
+# LDAP
+#argeo.ldap.rootdn=dc=slc,dc=argeo,dc=net
+#argeo.ads.init.ldif=osgibundle:init-slc.ldif
+
+eclipse.ignoreApp=true
+osgi.noShutdown=true
+
+log4j.configuration=file:../../log4j.properties
+
+org.eclipse.equinox.http.jetty.log.stderr.threshold=debug
+org.osgi.service.http.port=9090
+
+# java -Dlog4j.configuration=file:/home/mbaudier/dev/src/agfa-sebi/demo/log4j.properties -Dosgi.framework=lib/org.eclipse.osgi_3.6.1.R36x_v20100806.jar -jar lib/org.eclipse.equinox.launcher_1.1.0.v20100507.jar -console -configuration configuration
\ No newline at end of file
index 1fabd43524dccdfe20a636b93a10f5aa88861d64..c89d132dfab113b8057a861f3c868165d272d9ec 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -14,6 +15,7 @@
                <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
index 362ce164d02b99d139ed3cbd14e420f4dab2570e..264460f5a7f326b68981b57409938505798d0969 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
        <packaging>jar</packaging>
        <name>SLC Agent Dependencies</name>
        <dependencies>
-               <!--  Commons -->
+               <!-- Commons -->
                <dependency>
                        <groupId>org.argeo.commons.osgi</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 
                <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.activemq</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.ant</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.lib.detached</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
-               <!--  Spring -->
+               <!-- Spring -->
                <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.jdbc</artifactId>
                        <groupId>org.postgresql</groupId>
                        <artifactId>com.springsource.org.postgresql.jdbc3</artifactId>
                </dependency>
-               <!--  Required by the Oracle JDBC driver -->
+               <!-- Required by the Oracle JDBC driver -->
                <dependency>
                        <groupId>javax.resource</groupId>
                        <artifactId>com.springsource.javax.resource</artifactId>
                        <groupId>org.argeo.dep.jacob</groupId>
                        <artifactId>org.argeo.dep.jacob</artifactId>
                </dependency>
-               <!--
-                       <dependency> <groupId>org.argeo.dep.jacob</groupId>
-                       <artifactId>org.argeo.dep.jacob.win32.x86</artifactId> </dependency>
-               -->
-               <!--
-                       Languages <dependency> <groupId>org.codehaus.groovy</groupId>
-                       <artifactId>com.springsource.org.codehaus.groovy</artifactId>
-                       </dependency>
-               -->
+               <!-- <dependency> <groupId>org.argeo.dep.jacob</groupId> <artifactId>org.argeo.dep.jacob.win32.x86</artifactId> 
+                       </dependency> -->
+               <!-- Languages <dependency> <groupId>org.codehaus.groovy</groupId> <artifactId>com.springsource.org.codehaus.groovy</artifactId> 
+                       </dependency> -->
                <!-- ASM -->
                <dependency>
                        <groupId>org.objectweb.asm</groupId>
diff --git a/dep/org.argeo.slc.dep.backend/p2.inf b/dep/org.argeo.slc.dep.backend/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+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.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
new file mode 100644 (file)
index 0000000..674a825
--- /dev/null
@@ -0,0 +1,144 @@
+<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.backend</artifactId>
+       <name>SLC BACKEND 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>
+
+               <!-- SLC non deps -->
+               <dependency>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.unit</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+               <!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.dep</groupId> <artifactId>org.argeo.slc.dep.eclipse</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
index e05f416a3a2bde27009c75e26a844c4103fc07f9..6675084492be91918d00db55de0827e0cc380fd1 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jemmy</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <!-- For JDK 1.4 -->
                <dependency>
diff --git a/dep/org.argeo.slc.dep.sdk.rap/p2.inf b/dep/org.argeo.slc.dep.sdk.rap/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+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.rap/pom.xml b/dep/org.argeo.slc.dep.sdk.rap/pom.xml
new file mode 100644 (file)
index 0000000..4f6ca4d
--- /dev/null
@@ -0,0 +1,44 @@
+<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.rap</artifactId>
+       <name>SLC Eclipse RAP Dependencies</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.eclipse</groupId>
+                       <artifactId>org.argeo.slc.client.rap</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+               <!-- Back-end Dependencies -->
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.backend</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+               <!-- <dependency> <groupId>org.argeo.slc.eclipse</groupId> <artifactId>org.argeo.slc.client.ui</artifactId> 
+                       <version>${project.version}</version> </dependency> -->
+
+               <!-- Commons RAP -->
+               <!-- TO BE DELETED <dependency> <groupId>org.argeo.commons.eclipse</groupId> 
+                       <artifactId>org.argeo.eclipse.dep.rap</artifactId> <version>${version.argeo-commons}</version> 
+                       </dependency> -->
+
+       </dependencies>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/p2.inf b/dep/org.argeo.slc.dep.sdk.rcp/p2.inf
new file mode 100644 (file)
index 0000000..0423aa5
--- /dev/null
@@ -0,0 +1,2 @@
+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.rcp/pom.xml b/dep/org.argeo.slc.dep.sdk.rcp/pom.xml
new file mode 100644 (file)
index 0000000..29baea4
--- /dev/null
@@ -0,0 +1,38 @@
+<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.rcp</artifactId>
+       <name>SLC Eclipse RCP Dependencies</name>
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.argeo.maven.plugins</groupId>
+                               <artifactId>maven-argeo-osgi-plugin</artifactId>
+                       </plugin>
+               </plugins>
+       </build>
+       <dependencies>
+               <dependency>
+                       <groupId>org.argeo.slc.eclipse</groupId>
+                       <artifactId>org.argeo.slc.client.rcp</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+               <!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.eclipse</groupId> 
+                       <artifactId>org.argeo.slc.client.ui</artifactId> <version>${project.version}</version> 
+                       </dependency> -->
+
+               <!-- Back-end Dependencies -->
+               <dependency>
+                       <groupId>org.argeo.slc.dep</groupId>
+                       <artifactId>org.argeo.slc.backend</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+       </dependencies>
+</project>
\ No newline at end of file
diff --git a/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product b/dep/org.argeo.slc.dep.sdk.rcp/slc-client-rcp.product
new file mode 100644 (file)
index 0000000..118c232
--- /dev/null
@@ -0,0 +1,258 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?pde version="3.5"?>
+
+<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>
+
+   <launcherArgs>
+      <programArgs>-console</programArgs>
+      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
+   </launcherArgs>
+
+   <windowImages i16="icons/argeo-icon-256.png"/>
+
+   <launcher>
+      <solaris/>
+      <win useIco="false">
+         <bmp/>
+      </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.lowagie.text"/>
+      <plugin id="com.springsource.com.mysql.jdbc"/>
+      <plugin id="com.springsource.com.sun.syndication"/>
+      <plugin id="com.springsource.com.thoughtworks.xstream"/>
+      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
+      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
+      <plugin id="com.springsource.javassist"/>
+      <plugin id="com.springsource.javax.activation"/>
+      <plugin id="com.springsource.javax.annotation"/>
+      <plugin id="com.springsource.javax.ejb"/>
+      <plugin id="com.springsource.javax.el"/>
+      <plugin id="com.springsource.javax.jms"/>
+      <plugin id="com.springsource.javax.mail"/>
+      <plugin id="com.springsource.javax.management.j2ee"/>
+      <plugin id="com.springsource.javax.media.jai.codec"/>
+      <plugin id="com.springsource.javax.media.jai.core"/>
+      <plugin id="com.springsource.javax.persistence"/>
+      <plugin id="com.springsource.javax.resource"/>
+      <plugin id="com.springsource.javax.servlet"/>
+      <plugin id="com.springsource.javax.servlet.jsp"/>
+      <plugin id="com.springsource.javax.servlet.jsp.jstl"/>
+      <plugin id="com.springsource.javax.transaction"/>
+      <plugin id="com.springsource.javax.xml.bind"/>
+      <plugin id="com.springsource.javax.xml.rpc"/>
+      <plugin id="com.springsource.javax.xml.soap"/>
+      <plugin id="com.springsource.javax.xml.stream"/>
+      <plugin id="com.springsource.javax.xml.ws"/>
+      <plugin id="com.springsource.jcifs"/>
+      <plugin id="com.springsource.jdbm"/>
+      <plugin id="com.springsource.json"/>
+      <plugin id="com.springsource.junit"/>
+      <plugin id="com.springsource.jxl"/>
+      <plugin id="com.springsource.net.sf.cglib"/>
+      <plugin id="com.springsource.net.sf.ehcache"/>
+      <plugin id="com.springsource.net.sourceforge.jtds"/>
+      <plugin id="com.springsource.oracle.jdbc" fragment=""/>
+      <plugin id="com.springsource.org.antlr"/>
+      <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.codec"/>
+      <plugin id="com.springsource.org.apache.commons.collections"/>
+      <plugin id="com.springsource.org.apache.commons.compress"/>
+      <plugin id="com.springsource.org.apache.commons.dbcp"/>
+      <plugin id="com.springsource.org.apache.commons.fileupload"/>
+      <plugin id="com.springsource.org.apache.commons.httpclient"/>
+      <plugin id="com.springsource.org.apache.commons.io"/>
+      <plugin id="com.springsource.org.apache.commons.lang"/>
+      <plugin id="com.springsource.org.apache.commons.net"/>
+      <plugin id="com.springsource.org.apache.commons.pool"/>
+      <plugin id="com.springsource.org.apache.commons.vfs"/>
+      <plugin id="com.springsource.org.apache.derby"/>
+      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
+      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
+      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
+      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
+      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
+      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
+      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
+      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
+      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
+      <plugin id="com.springsource.org.apache.log4j"/>
+      <plugin id="com.springsource.org.apache.lucene"/>
+      <plugin id="com.springsource.org.apache.mina"/>
+      <plugin id="com.springsource.org.apache.oro"/>
+      <plugin id="com.springsource.org.apache.regexp"/>
+      <plugin id="com.springsource.org.apache.taglibs.standard"/>
+      <plugin id="com.springsource.org.apache.tools.ant"/>
+      <plugin id="com.springsource.org.apache.tools.ant.launch"/>
+      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
+      <plugin id="com.springsource.org.apache.xalan"/>
+      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>
+      <plugin id="com.springsource.org.apache.xml.resolver"/>
+      <plugin id="com.springsource.org.apache.xml.serializer"/>
+      <plugin id="com.springsource.org.apache.xmlbeans"/>
+      <plugin id="com.springsource.org.apache.xmlcommons"/>
+      <plugin id="com.springsource.org.aspectj.runtime"/>
+      <plugin id="com.springsource.org.aspectj.weaver"/>
+      <plugin id="com.springsource.org.castor"/>
+      <plugin id="com.springsource.org.codehaus.jackson"/>
+      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
+      <plugin id="com.springsource.org.cyberneko.html"/>
+      <plugin id="com.springsource.org.dbunit"/>
+      <plugin id="com.springsource.org.dom4j"/>
+      <plugin id="com.springsource.org.h2"/>
+      <plugin id="com.springsource.org.hibernate"/>
+      <plugin id="com.springsource.org.hsqldb"/>
+      <plugin id="com.springsource.org.jaxen"/>
+      <plugin id="com.springsource.org.jdom"/>
+      <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"/>
+      <plugin id="com.springsource.org.xmlpull"/>
+      <plugin id="com.springsource.slf4j.api"/>
+      <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.aether"/>
+      <plugin id="org.argeo.dep.osgi.boilerpipe"/>
+      <plugin id="org.argeo.dep.osgi.bouncycastle.jdk15"/>
+      <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.drewnoakes.metadata_extractor"/>
+      <plugin id="org.argeo.dep.osgi.geoapi"/>
+      <plugin id="org.argeo.dep.osgi.geotools"/>
+      <plugin id="org.argeo.dep.osgi.jackrabbit"/>
+      <plugin id="org.argeo.dep.osgi.jai.imageio"/>
+      <plugin id="org.argeo.dep.osgi.java3d"/>
+      <plugin id="org.argeo.dep.osgi.jcr"/>
+      <plugin id="org.argeo.dep.osgi.jsr275"/>
+      <plugin id="org.argeo.dep.osgi.jts"/>
+      <plugin id="org.argeo.dep.osgi.mina.filter.ssl" fragment="true"/>
+      <plugin id="org.argeo.dep.osgi.netcdf"/>
+      <plugin id="org.argeo.dep.osgi.pdfbox"/>
+      <plugin id="org.argeo.dep.osgi.poi"/>
+      <plugin id="org.argeo.dep.osgi.springframework.ldap"/>
+      <plugin id="org.argeo.dep.osgi.tagsoup"/>
+      <plugin id="org.argeo.dep.osgi.tika"/>
+      <plugin id="org.argeo.eclipse.ui"/>
+      <plugin id="org.argeo.security.core"/>
+      <plugin id="org.argeo.security.manager.ldap"/>
+      <plugin id="org.argeo.security.services"/>
+      <plugin id="org.argeo.server.core"/>
+      <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.server.jdbc" fragment="true"/>
+      <plugin id="org.argeo.server.json"/>
+      <plugin id="org.argeo.server.tika.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.slc.agent"/>
+      <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
+      <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
+      <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
+      <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.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.core"/>
+      <plugin id="org.argeo.slc.demo.agent" fragment="true"/>
+      <plugin id="org.argeo.slc.demo.ant" fragment=""/>
+      <plugin id="org.argeo.slc.demo.basic"/>
+      <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
+      <plugin id="org.argeo.slc.detached"/>
+      <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>
+      <plugin id="org.argeo.slc.server"/>
+      <plugin id="org.argeo.slc.server.castor"/>
+      <plugin id="org.argeo.slc.server.h2"/>
+      <plugin id="org.argeo.slc.server.hibernate"/>
+      <plugin id="org.argeo.slc.server.services"/>
+      <plugin id="org.argeo.slc.specs"/>
+      <plugin id="org.argeo.slc.support.activemq"/>
+      <plugin id="org.argeo.slc.support.ant"/>
+      <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"/>
+      <plugin id="org.argeo.slc.support.osgi"/>
+      <plugin id="org.argeo.slc.support.simple"/>
+      <plugin id="org.eclipse.core.commands"/>
+      <plugin id="org.eclipse.core.contenttype"/>
+      <plugin id="org.eclipse.core.databinding"/>
+      <plugin id="org.eclipse.core.databinding.observable"/>
+      <plugin id="org.eclipse.core.databinding.property"/>
+      <plugin id="org.eclipse.core.expressions"/>
+      <plugin id="org.eclipse.core.jobs"/>
+      <plugin id="org.eclipse.core.runtime"/>
+      <plugin id="org.eclipse.equinox.app"/>
+      <plugin id="org.eclipse.equinox.common"/>
+      <plugin id="org.eclipse.equinox.preferences"/>
+      <plugin id="org.eclipse.equinox.registry"/>
+      <plugin id="org.eclipse.help"/>
+      <plugin id="org.eclipse.jface"/>
+      <plugin id="org.eclipse.jface.databinding"/>
+      <plugin id="org.eclipse.osgi"/>
+      <plugin id="org.eclipse.swt"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
+      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
+      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
+      <plugin id="org.eclipse.ui"/>
+      <plugin id="org.eclipse.ui.workbench"/>
+      <plugin id="org.springframework.aop"/>
+      <plugin id="org.springframework.beans"/>
+      <plugin id="org.springframework.context"/>
+      <plugin id="org.springframework.context.support"/>
+      <plugin id="org.springframework.core"/>
+      <plugin id="org.springframework.jdbc"/>
+      <plugin id="org.springframework.jms"/>
+      <plugin id="org.springframework.orm"/>
+      <plugin id="org.springframework.osgi.core"/>
+      <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"/>
+      <plugin id="org.springframework.web.servlet"/>
+      <plugin id="org.springframework.xml"/>
+   </plugins>
+
+   <configurations>
+      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.demo.ant" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.castor" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.h2" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.hibernate" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />
+      <plugin id="org.springframework.osgi.extender" autoStart="true" startLevel="0" />
+   </configurations>
+
+</product>
diff --git a/dep/org.argeo.slc.dep.sdk.sources/p2.inf b/dep/org.argeo.slc.dep.sdk.sources/p2.inf
deleted file mode 100644 (file)
index 0423aa5..0000000
+++ /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.sources/pom.xml b/dep/org.argeo.slc.dep.sdk.sources/pom.xml
deleted file mode 100644 (file)
index 8674dd7..0000000
+++ /dev/null
@@ -1,52 +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.sources</artifactId>
-       <packaging>jar</packaging>
-       <name>SLC SDK Sources</name>
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
-                               <executions>
-                                       <execution>
-                                               <id>pde-source</id>
-                                               <phase>initialize</phase>
-                                               <goals>
-                                                       <goal>pde-sources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <!--
-                                                               <outputDirectory>${project.build.directory}</outputDirectory>
-                                                       -->
-                                               </configuration>
-                                       </execution>
-                                       <execution>
-                                               <goals>
-                                                       <goal>descriptors</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                               <configuration>
-                                                       <jarDirectory>${project.build.directory}/libsrc</jarDirectory>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
-       <dependencies>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.sdk</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-       </dependencies>
-</project>
\ No newline at end of file
index 96caf9415f50c163985d704f9f75ad0d37ca9030..d589964d6d1bb02005e1ea5698c2f8e98b2f4ea1 100644 (file)
@@ -59,6 +59,7 @@
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>
                        <artifactId>org.argeo.slc.ria</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <!-- Modules (see profiles below) -->
index e8dd1f23b9538bcaef2d12c9d7fa7ee9dfb8d9c4..590784f712eaf6d3ed7b1b4931ade731e5a99b2d 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.server</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.hibernate</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.jcr</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <groupId>org.argeo.commons.security</groupId>
                        <artifactId>org.argeo.security.dep.ads</artifactId>
                        <type>pom</type>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.ads</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 
                <!-- Jackrabbit -->
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.dep.jackrabbit.server</artifactId>
                        <type>pom</type>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.server</groupId>
                        <artifactId>org.argeo.server.jackrabbit</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 
                <!-- Required in JDK 1.5 -->
index 92183d7c8a3080aa2b796e1955a0cdd4b59ce074..1028867794c58964c60bb241eb78005408f32f4d 100644 (file)
@@ -7,19 +7,18 @@
                <version>0.13.1-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
-       <groupId>org.argeo.slc</groupId>
        <artifactId>dep</artifactId>
-       <packaging>pom</packaging>
        <name>SLC Dependencies</name>
+       <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>
-               <module>org.argeo.slc.dep.eclipse</module>
-               <module>org.argeo.slc.dep.sdk</module>
-               <module>org.argeo.slc.dep.sdk.sources</module>
+               <module>org.argeo.slc.dep.backend</module>
+               <module>org.argeo.slc.dep.sdk.rcp</module>
+               <module>org.argeo.slc.dep.sdk.rap</module>
        </modules>
        <build>
                <resources>
                                        </execution>
                                </executions>
                        </plugin>
-                       <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>
+               <pluginManagement>
+                       <plugins>
+                               <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>false</copyArtifacts>
+                                                       </configuration>
+                                               </execution>
+                                               <execution>
+                                                       <id>generate-descriptors</id>
+                                                       <goals>
+                                                               <goal>descriptors</goal>
+                                                       </goals>
+                                                       <phase>generate-resources</phase>
+                                               </execution>
+                                               <execution>
+                                                       <id>check-osgi</id>
+                                                       <phase>test</phase>
+                                                       <goals>
+                                                               <goal>equinox</goal>
+                                                       </goals>
+                                                       <configuration>
+                                                               <onlyCheck>true</onlyCheck>
+                                                               <argsToAppend>
+                                                                       <arg>-clean</arg>
+                                                               </argsToAppend>
+                                                       </configuration>
+                                               </execution>
+                                       </executions>
+                               </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
index 879b206b8531f216333a7a521f82b96c5d561937..5b9ab28492c99d6808f5dfb498f197f2234ecbc7 100644 (file)
                                        </execution>
                                </executions>
                        </plugin>
-<!--                   <plugin>-->
-<!--                           <groupId>org.apache.maven.plugins</groupId>-->
-<!--                           <artifactId>maven-assembly-plugin</artifactId>-->
-<!--                           <configuration>-->
-<!--                                   <descriptors>-->
-<!--                                           <descriptor>src/assembly/dist.xml</descriptor>-->
-<!--                                           <descriptor>src/assembly/devel.xml</descriptor>-->
-<!--                                   </descriptors>-->
-<!--                           </configuration>-->
-<!--                           <executions>-->
-<!--                                   <execution>-->
-<!--                                           <id>attach-assembly</id>-->
-<!--                                           <phase>package</phase>-->
-<!--                                           <goals>-->
-<!--                                                   <goal>single</goal>-->
-<!--                                           </goals>-->
-<!--                                   </execution>-->
-<!--                           </executions>-->
-<!--                   </plugin>-->
+                       <!-- <plugin> -->
+                       <!-- <groupId>org.apache.maven.plugins</groupId> -->
+                       <!-- <artifactId>maven-assembly-plugin</artifactId> -->
+                       <!-- <configuration> -->
+                       <!-- <descriptors> -->
+                       <!-- <descriptor>src/assembly/dist.xml</descriptor> -->
+                       <!-- <descriptor>src/assembly/devel.xml</descriptor> -->
+                       <!-- </descriptors> -->
+                       <!-- </configuration> -->
+                       <!-- <executions> -->
+                       <!-- <execution> -->
+                       <!-- <id>attach-assembly</id> -->
+                       <!-- <phase>package</phase> -->
+                       <!-- <goals> -->
+                       <!-- <goal>single</goal> -->
+                       <!-- </goals> -->
+                       <!-- </execution> -->
+                       <!-- </executions> -->
+                       <!-- </plugin> -->
                        <!-- <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> 
                                <version>1.1</version> <executions> <execution> <id>create-repository</id> 
                                <phase>deploy</phase> <goals> <goal>exec</goal> </goals> </execution> </executions> 
        <dependencies>
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.sdk</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.dep</groupId>
-                       <artifactId>org.argeo.slc.dep.sdk.sources</artifactId>
+                       <artifactId>org.argeo.slc.dep.sdk.rcp</artifactId>
                        <version>${project.version}</version>
                </dependency>
+               <!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.dep</groupId> <artifactId>org.argeo.slc.dep.sdk.sources</artifactId> 
+                       <version>${project.version}</version> </dependency> -->
        </dependencies>
        <profiles>
                <profile>
                                                                        </mappings>
                                                                        <requires>
                                                                                <require>org.argeo.slc.sdk</require>
+                                                                               <!-- <require> org.argeo.slc.dep.sdk.rcp</require> -->
                                                                        </requires>
                                                                </configuration>
                                                        </execution>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.classpath b/eclipse/plugins/org.argeo.slc.client.rap/.classpath
deleted file mode 100644 (file)
index eff0df6..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
-       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
-       <classpathentry kind="src" path="src/main/java"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.project b/eclipse/plugins/org.argeo.slc.client.rap/.project
deleted file mode 100644 (file)
index 9b82af4..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>org.argeo.slc.client.rap</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.ManifestBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.eclipse.pde.SchemaBuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.pde.PluginNature</nature>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index fd3794f..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-#Wed Nov 24 21:23:34 CET 2010\r
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
deleted file mode 100644 (file)
index eedcc6e..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Rap Client for SLC
-Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true
-Bundle-Version: 0.13.1.SNAPSHOT
-Bundle-Activator: org.argeo.slc.client.rap.SlcClientRapPlugin
-Bundle-Vendor: Argeo SASU
-Require-Bundle: org.eclipse.rap.ui;resolution:=optional
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.servlet;version="2.4.0",
- javax.servlet.http;version="2.4.0",
- org.argeo.slc.client.ui.perspectives
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/build.properties b/eclipse/plugins/org.argeo.slc.client.rap/build.properties
deleted file mode 100644 (file)
index 5dd830c..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/main/java/\r
-output.. = target/classes/\r
-bin.includes = plugin.xml,\\r
-               META-INF/,\\r
-               .\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif b/eclipse/plugins/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif
deleted file mode 100644 (file)
index b8ca14a..0000000
Binary files a/eclipse/plugins/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif and /dev/null differ
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch b/eclipse/plugins/org.argeo.slc.client.rap/org.argeo.slc.client.rap.launch
deleted file mode 100644 (file)
index 7332096..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.rap.ui.launch.RAPLauncher">
-<setAttribute key="additional_plugins"/>
-<booleanAttribute key="append.args" value="true"/>
-<booleanAttribute key="automaticAdd" value="false"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/org.argeo.slc.client.rap"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="default_auto_start" value="false"/>
-<intAttribute key="default_start_level" value="4"/>
-<stringAttribute key="featureDefaultLocation" value="workspace"/>
-<stringAttribute key="featurePluginResolution" value="workspace"/>
-<booleanAttribute key="includeOptional" value="false"/>
-<booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -console -consolelog"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dorg.eclipse.rwt.compression=true -Dorg.eclipse.equinox.http.jetty.log.stderr.threshold=info -Dargeo.osgi.data.dir=C:/Tmp"/>
-<stringAttribute key="org.eclipse.rap.launch.browserMode" value="EXTERNAL"/>
-<stringAttribute key="org.eclipse.rap.launch.entryPoint" value="home"/>
-<stringAttribute key="org.eclipse.rap.launch.libraryVariant" value="STANDARD"/>
-<stringAttribute key="org.eclipse.rap.launch.logLevel" value="OFF"/>
-<booleanAttribute key="org.eclipse.rap.launch.openBrowser" value="true"/>
-<intAttribute key="org.eclipse.rap.launch.port" value="1081"/>
-<stringAttribute key="org.eclipse.rap.launch.servletName" value="rap"/>
-<intAttribute key="org.eclipse.rap.launch.sessionTimeout" value="0"/>
-<booleanAttribute key="org.eclipse.rap.launch.terminatePrevious" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useManualPort" value="true"/>
-<booleanAttribute key="org.eclipse.rap.launch.useSessionTimeout" value="false"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<setAttribute key="selected_features">
-<setEntry value="org.eclipse.rap.runtime.sdk:default"/>
-</setAttribute>
-<booleanAttribute key="show_selected_only" value="false"/>
-<stringAttribute key="target_bundles" value="org.springframework.jdbc@default:default,com.springsource.org.objectweb.asm@default:default,org.argeo.dep.osgi.postgis.jdbc@default:default,org.argeo.server.core@default:default,org.argeo.slc.client.core@default:true,org.eclipse.rap.jface@default:true,com.springsource.org.objectweb.asm.attrs@default:default,org.eclipse.rap.junit@default:default,org.eclipse.jface.databinding@default:default,org.springframework.osgi.web.extender@default:default,org.springframework.transaction@default:default,com.springsource.javax.annotation@default:default,org.argeo.server.jdbc@default:false,com.springsource.org.apache.commons.dbcp@default:default,org.argeo.dep.osgi.catalina.start@default:default,com.springsource.net.sourceforge.jtds@default:default,com.springsource.mx4j@default:default,org.argeo.dep.osgi.commons.cli@default:default,com.springsource.org.apache.derby@default:default,org.argeo.dep.osgi.java3d@default:default,com.springsource.edu.emory.mathcs.backport@default:default,com.springsource.org.apache.lucene@default:default,com.springsource.org.xmlpull@default:default,org.eclipse.rap.ui.views@default:true,org.argeo.slc.agent@default:true,org.springframework.beans@default:default,com.springsource.com.thoughtworks.xstream@default:default,org.argeo.security.core@default:default,com.ibm.icu@default:default,com.springsource.org.apache.directory.server.protocol.shared@default:default,org.eclipse.rap.demo.databinding@default:default,com.springsource.org.h2@default:default,com.springsource.org.aspectj.runtime@default:default,org.eclipse.swt.gtk.linux.x86@default:false,org.argeo.slc.client.agent@default:true,com.springsource.javax.resource@default:default,org.argeo.server.ext.jackrabbit@default:false,org.argeo.slc.dep.detached@default:default,org.springframework.web.servlet@default:default,org.argeo.slc.server.castor@default:true,org.argeo.dep.osgi.springframework.ldap@default:default,org.argeo.server.ads.server@default:default,com.springsource.javax.persistence@default:default,com.springsource.org.apache.directory.server.ldap@default:default,org.eclipse.rap.rwt.q07@default:false,org.argeo.slc.support.equinox@default:default,com.springsource.org.apache.directory.server.core@default:false,org.eclipse.equinox.launcher.gtk.linux.x86@default:false,com.springsource.org.jgroups@default:default,com.springsource.org.apache.commons.vfs@default:default,com.springsource.org.mortbay.util@default:default,org.eclipse.equinox.http.registry@default:true,org.argeo.server.activemq.broker@default:default,com.springsource.org.apache.bcel@default:default,com.springsource.net.sf.cglib@default:default,org.argeo.slc.dep.agent@default:default,com.springsource.org.apache.ws.commons.schema@default:default,com.springsource.org.dom4j@default:default,org.argeo.server.hsqldb@default:default,com.springsource.javax.xml.stream@default:default,com.springsource.javax.xml.bind@default:default,com.springsource.jxl@default:default,org.argeo.dep.osgi.geotools@default:default,com.springsource.javax.xml.ws@default:default,org.argeo.dep.jemmy.nb61@default:default,com.springsource.org.apache.commons.fileupload@default:default,com.springsource.javassist@default:default,com.springsource.javax.jms@default:default,org.eclipse.equinox.http.servlet@default:default,org.argeo.slc.server.services@default:true,com.springsource.javax.xml.rpc@default:default,org.springframework.context@default:default,com.springsource.org.apache.commons.collections@default:default,org.argeo.slc.lib.detached@default:default,com.springsource.javax.ejb@default:default,org.junit@default:default,org.argeo.slc.agent.jmx@default:default,com.springsource.oracle.jdbc@default:default,com.springsource.org.jaxen@default:default,org.argeo.slc.client.oxm@default:true,com.springsource.org.apache.jasper@default:false,org.argeo.slc.ria@default:default,org.argeo.slc.support.activemq@default:default,com.springsource.org.hibernate@default:default,org.eclipse.rap.ui.cheatsheets@default:true,org.argeo.slc.server.jms@default:default,org.springframework.oxm@default:default,org.argeo.slc.support.simple@default:default,org.argeo.slc.agent.ext.jdbc@default:false,org.argeo.dep.osgi.jsr275@default:default,org.springframework.context.support@default:default,org.argeo.slc.agent.ext.bsf@default:false,org.eclipse.equinox.registry@default:default,com.springsource.org.apache.coyote@default:false,org.argeo.dep.osgi.jai.imageio@default:default,org.eclipse.rap.ui.forms@default:true,com.springsource.org.apache.oro@default:default,org.argeo.slc.support.castor@default:false,org.argeo.security.services@default:true,org.eclipse.equinox.preferences@default:default,org.argeo.slc.support.gis@default:default,org.argeo.slc.unit@default:default,com.springsource.org.apache.commons.beanutils@default:default,com.springsource.org.apache.log4j@default:default,org.argeo.slc.server.jcr@default:default,com.springsource.javax.media.jai.core@default:default,org.eclipse.osgi@-1:true,org.argeo.server.tomcat@default:false,com.springsource.org.apache.juli.extras@default:default,com.ibm.icu.base@default:true,org.argeo.slc.support.hibernate@default:false,org.argeo.server.jackrabbit.repo@default:default,com.springsource.org.apache.directory.server.changepw@default:default,org.argeo.server.mysql@default:default,org.argeo.dep.osgi.activemq@default:default,com.springsource.org.apache.jasper.org.eclipse.jdt@default:default,com.springsource.org.apache.directory.shared.asn1@default:default,com.springsource.slf4j.api@default:default,com.springsource.com.sun.xml.messaging.saaj@default:default,com.springsource.javax.xml.soap@default:default,org.argeo.slc.agent.ext.xalan@default:false,com.springsource.javax.servlet.jsp@default:default,com.springsource.org.apache.commons.lang@default:default,com.springsource.org.codehaus.jackson.mapper@default:default,org.argeo.dep.osgi.geoapi@default:default,org.argeo.dep.osgi.directory.shared.asn.codec@default:false,org.eclipse.jface@default:default,org.springframework.security.core@default:default,org.argeo.slc.server.jackrabbit.derby@default:default,org.argeo.slc.support.jcr@default:default,com.springsource.org.apache.commons.pool@default:default,org.argeo.server.catalina@default:false,com.springsource.org.codehaus.jackson@default:default,com.springsource.org.aopalliance@default:default,com.springsource.org.apache.directory.server.kerberos.shared@default:default,com.springsource.org.apache.activemq.pool@default:default,com.springsource.org.apache.commons.httpclient@default:default,org.argeo.server.json@default:default,org.argeo.dep.osgi.mina.filter.ssl@default:false,com.springsource.com.mysql.jdbc@default:default,com.springsource.org.apache.xalan@default:default,com.springsource.org.hsqldb@default:default,org.argeo.slc.server.h2@default:true,org.springframework.osgi.io@default:default,com.springsource.org.antlr@default:default,org.argeo.slc.dep.agent.extras@default:default,com.springsource.net.sf.ehcache@default:default,com.springsource.jcifs@default:default,com.springsource.org.apache.xerces@default:false,com.springsource.org.apache.xmlbeans@default:default,org.argeo.dep.osgi.jcr@default:default,com.springsource.javax.servlet.jsp.jstl@default:default,com.springsource.junit@default:default,com.springsource.slf4j.org.apache.commons.logging@default:default,org.springframework.orm@default:default,com.springsource.org.apache.el@default:default,org.argeo.slc.dep.gis@default:default,org.mortbay.jetty.util@default:true,org.springframework.aop@default:default,org.eclipse.rap.jface.databinding@default:true,com.springsource.org.dbunit@default:default,org.argeo.slc.ext.activemq@default:false,org.springframework.osgi.web@default:default,org.eclipse.rap.junit.runtime@default:default,com.springsource.org.apache.taglibs.standard@default:default,org.argeo.osgi.boot@default:default,org.argeo.slc.server.agentproxy@default:default,com.springsource.org.castor@default:default,org.eclipse.swt.gtk.linux.x86_64@default:false,com.springsource.org.apache.commons.net@default:default,com.springsource.org.apache.regexp@default:default,org.springframework.jms@default:default,org.argeo.security.webapp@default:default,org.argeo.slc.server.main.rap@default:false,org.eclipse.rap.design.example@default:default,com.springsource.jdbm@default:default,org.eclipse.core.jobs@default:default,org.argeo.server.jcr@default:default,org.eclipse.equinox.app@default:default,com.springsource.org.apache.tools.ant@default:default,com.springsource.org.apache.catalina@default:default,com.springsource.org.apache.directory.server.kerberos@default:default,com.springsource.org.apache.directory.server.core.shared@default:default,org.argeo.dep.osgi.commons.exec@default:default,org.mortbay.jetty.server@default:true,org.argeo.slc.support.osgi@default:default,org.argeo.slc.support.ant@default:default,org.argeo.slc.server.activemq@default:default,org.argeo.slc.webapp@default:default,org.argeo.slc.support.maven@default:false,org.springframework.security.acls@default:false,org.eclipse.osgi.services@default:true,com.springsource.com.lowagie.text@default:default,org.argeo.slc.core@default:default,com.springsource.org.mortbay.jetty.server@default:default,org.argeo.slc.specs@default:default,org.argeo.slc.dep.eclipse@default:default,org.argeo.dep.osgi.activemq.optional@default:false,org.springframework.web@default:default,com.springsource.antlr@default:default,com.springsource.javax.el@default:default,org.eclipse.swt@default:default,com.springsource.org.apache.bsf@default:default,com.springsource.slf4j.log4j@default:false,org.argeo.server.ads@default:default,org.argeo.slc.dep.sdk@default:default,org.eclipse.core.databinding.beans@default:true,org.argeo.slc.server.mysql@default:default,com.springsource.javax.management.j2ee@default:default,org.argeo.slc.client.hibernate@default:true,org.argeo.slc.client.ui@default:true,org.argeo.dep.osgi.hibernatespatial@default:default,org.argeo.server.jackrabbit@default:false,com.springsource.org.apache.directory.shared.ldap@default:default,org.eclipse.rap.ui.workbench@default:true,org.eclipse.rap.rwt@default:true,org.eclipse.core.expressions@default:default,org.eclipse.rap.demo@default:false,org.argeo.dep.osgi.jackrabbit@default:default,org.eclipse.core.databinding.observable@default:default,org.springframework.osgi.core@default:default,org.eclipse.equinox.launcher@default:default,com.springsource.javax.activation@default:default,com.springsource.org.apache.tools.ant.launch@default:default,org.eclipse.equinox.launcher.win32.win32.x86@default:false,com.springsource.com.jcraft.jsch@default:default,com.springsource.org.aspectj.weaver@default:default,org.argeo.server.jackrabbit.webdav@default:default,org.argeo.dep.org.freecompany.redline@default:default,com.springsource.org.quartz@default:default,com.springsource.javax.media.jai.codec@default:default,org.eclipse.rap.ui@default:true,org.eclipse.core.commands@default:true,org.springframework.core@default:default,org.argeo.dep.osgi.jts@default:default,org.eclipse.jdt.junit.runtime@default:default,org.eclipse.help@default:default,org.argeo.slc.client.commons@default:true,com.springsource.javax.servlet@default:true,com.springsource.org.tmatesoft.svn@default:default,org.eclipse.core.databinding@default:default,com.springsource.org.apache.directory.server.ntp@default:default,com.springsource.javax.mail@default:default,org.argeo.slc.agent.jms@default:default,com.springsource.org.jdom@default:default,org.eclipse.core.databinding.property@default:default,org.springframework.security.taglibs@default:default,org.eclipse.equinox.http.jetty@default:true,org.argeo.server.webextender@default:false,javax.servlet@default:default,com.springsource.org.apache.mina@default:default,com.springsource.org.apache.xml.serializer@default:default,org.springframework.osgi.extender@default:true,org.springframework.xml@default:default,com.springsource.javax.jcr@default:default,com.springsource.edu.oswego.cs.dl.util.concurrent@default:default,com.springsource.org.custommonkey.xmlunit@default:default,org.eclipse.core.runtime@default:true,org.argeo.slc.support.jemmy@default:default,com.springsource.org.apache.xmlcommons@default:default,org.argeo.dep.jacob@default:default,com.springsource.json@default:default,org.argeo.security.mvc@default:default,org.eclipse.swt.win32.win32.x86@default:false,com.springsource.javax.transaction@default:default,org.argeo.eclipse.ui@default:true,org.eclipse.equinox.launcher.gtk.linux.x86_64@default:false,org.argeo.security.manager.ldap@default:true,org.eclipse.core.contenttype@default:default,com.springsource.org.apache.commons.io@default:default,com.springsource.org.apache.commons.codec@default:default,org.argeo.slc.server@default:default,com.springsource.bsh@default:default,com.springsource.org.apache.directory.server.jndi@default:default,com.springsource.org.postgresql.jdbc3@default:default,org.argeo.slc.server.hibernate@default:true,org.argeo.slc.detached@default:default,org.argeo.slc.dep.server@default:default,org.argeo.basic.nodeps@default:default,org.argeo.slc.launcher@default:default,org.eclipse.equinox.common@2:true,org.argeo.slc.server.hsqldb@default:default,com.springsource.org.apache.xml.resolver@default:default,org.argeo.slc.dep.sdk.sources@default:default"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfigArea" value="true"/>
-<stringAttribute key="workspace_bundles" value="org.argeo.slc.server.main.rap@default:false,org.argeo.slc.demo.log4j@default:false,org.argeo.slc.demo.basic@default:true,org.argeo.slc.demo.minimal@default:true,org.argeo.slc.client.rap@default:true,org.argeo.slc.demo.agent@default:false"/>
-</launchConfiguration>
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml b/eclipse/plugins/org.argeo.slc.client.rap/plugin.xml
deleted file mode 100644 (file)
index 436597f..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?eclipse version="3.4"?>\r
-<plugin>\r
-\r
-   <extension\r
-         point="org.eclipse.rap.ui.entrypoint">\r
-      <entrypoint\r
-            class="org.argeo.slc.client.rap.SlcClientRapApplication"\r
-            parameter="home"\r
-            id="org.argeo.slc.client.rap.SlcClientRapApplication">\r
-      </entrypoint>\r
-   </extension>\r
-     \r
-   <extension\r
-         point="org.eclipse.ui.perspectives">\r
-      <perspective\r
-            name="Slc Execution"\r
-            class="org.argeo.slc.client.ui.perspectives.SlcExecution"\r
-                       id="org.argeo.slc.client.ui.perspectives.slcExecution"\r
-            icon="icons/slc_execution_perspective.gif">\r
-      </perspective>\r
-   </extension>\r
-       <extension\r
-         point="org.eclipse.ui.menus">\r
-      <menuContribution\r
-            locationURI="menu:org.eclipse.ui.main.menu">\r
-         <menu\r
-               id="fileMenu"\r
-               label="File">\r
-            <command\r
-                  id="exitCommand"\r
-                  commandId="org.eclipse.ui.file.exit"\r
-                  label="Exit"\r
-                  style="push"\r
-                  tooltip="Exits the application">\r
-            </command>\r
-         </menu>\r
-      </menuContribution>\r
-   </extension>\r
-  <!-- <extension\r
-         point="org.eclipse.ui.commands">\r
-      <command\r
-            defaultHandler="org.eclipse.ui.internal.handlers.QuitHandler"\r
-            id="org.eclipse.ui.file.exit"\r
-            name="Exit">\r
-      </command> \r
-   </extension> -->\r
-   <extension\r
-         id="product"\r
-         point="org.eclipse.core.runtime.products">\r
-      <product\r
-            application="org.eclipse.ui.ide.workbench"\r
-            name="SLC">\r
-         <property\r
-               name="windowImages"\r
-               value="icons/argeo-icon-256.png">\r
-         </property>\r
-         <property\r
-               name="appName"\r
-               value="SLC">\r
-         </property>\r
-      </product>\r
-   </extension>\r
-</plugin>\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/rap.properties b/eclipse/plugins/org.argeo.slc.client.rap/rap.properties
deleted file mode 100644 (file)
index e8e3e42..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-# Question : which are the bundles that must be listed here,
-# Which are the bundles that are started because of dependency, what is the rule ?
-argeo.osgi.start=\
-org.springframework.osgi.extender,\
-org.argeo.server.ads.server,\
-org.argeo.slc.server.h2,\
-org.argeo.slc.server.hibernate,\
-org.argeo.slc.server.main.rap,\
-org.argeo.slc.client.rap,\
-org.argeo.slc.client.ui,\
-org.argeo.slc.client.commons,\
-org.argeo.slc.client.core,\
-org.argeo.slc.client.hibernate,\
-org.argeo.slc.client.oxm,\
-org.eclipse.equinox.http.jetty
-# incoming port for the server
-org.osgi.service.http.port=1068
-# do not run an eclipse application
-eclipse.ignoreApp=true 
-# don t shutdown osgi after exiting (or not running) the application 
-#osgi.noShutdown=true
\ No newline at end of file
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product b/eclipse/plugins/org.argeo.slc.client.rap/slc-client-rap.product
deleted file mode 100644 (file)
index 7b0d9a2..0000000
+++ /dev/null
@@ -1,275 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<?pde version="3.5"?>\r
-\r
-<product name="SLC Rap UI" uid="org.argeo.slc.client.rap" id="org.argeo.slc.client.rap.product" application="org.eclipse.ui.ide.workbench" version="1.0.0.qualifier" useFeatures="false" includeLaunchers="true">\r
-\r
-\r
-   <configIni use="default">\r
-   </configIni>\r
-\r
-   <launcherArgs>\r
-      <programArgs>-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog -console</programArgs>\r
-      <vmArgs>-Declipse.ignoreApp=true -Dosgi.noShutdown=true -Dargeo.osgi.data.dir=C:/Tmp</vmArgs>\r
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>\r
-   </launcherArgs>\r
-\r
-   <windowImages i16="icons/argeo-icon-256.png"/>\r
-\r
-\r
-   <launcher>\r
-      <solaris/>\r
-      <win useIco="false">\r
-         <bmp/>\r
-      </win>\r
-   </launcher>\r
-\r
-\r
-   <vm>\r
-   </vm>\r
-\r
-\r
-   <plugins>\r
-      <plugin id="com.ibm.icu"/>\r
-      <plugin id="com.springsource.antlr"/>\r
-      <plugin id="com.springsource.bsh"/>\r
-      <plugin id="com.springsource.com.jcraft.jsch"/>\r
-      <plugin id="com.springsource.com.lowagie.text"/>\r
-      <plugin id="com.springsource.com.mysql.jdbc"/>\r
-      <plugin id="com.springsource.com.thoughtworks.xstream"/>\r
-      <plugin id="com.springsource.edu.emory.mathcs.backport"/>\r
-      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>\r
-      <plugin id="com.springsource.javassist"/>\r
-      <plugin id="com.springsource.javax.activation"/>\r
-      <plugin id="com.springsource.javax.annotation"/>\r
-      <plugin id="com.springsource.javax.ejb"/>\r
-      <plugin id="com.springsource.javax.el"/>\r
-      <plugin id="com.springsource.javax.jms"/>\r
-      <plugin id="com.springsource.javax.management.j2ee"/>\r
-      <plugin id="com.springsource.javax.persistence"/>\r
-      <plugin id="com.springsource.javax.resource"/>\r
-      <plugin id="com.springsource.javax.servlet"/>\r
-      <plugin id="com.springsource.javax.servlet.jsp"/>\r
-      <plugin id="com.springsource.javax.servlet.jsp.jstl"/>\r
-      <plugin id="com.springsource.javax.transaction"/>\r
-      <plugin id="com.springsource.javax.xml.bind"/>\r
-      <plugin id="com.springsource.javax.xml.rpc"/>\r
-      <plugin id="com.springsource.javax.xml.stream"/>\r
-      <plugin id="com.springsource.javax.xml.ws"/>\r
-      <plugin id="com.springsource.jcifs"/>\r
-      <plugin id="com.springsource.jdbm"/>\r
-      <plugin id="com.springsource.json"/>\r
-      <plugin id="com.springsource.junit"/>\r
-      <plugin id="com.springsource.jxl"/>\r
-      <plugin id="com.springsource.net.sf.cglib"/>\r
-      <plugin id="com.springsource.net.sf.ehcache"/>\r
-      <plugin id="com.springsource.net.sourceforge.jtds"/>\r
-      <plugin id="com.springsource.org.antlr"/>\r
-      <plugin id="com.springsource.org.aopalliance"/>\r
-      <plugin id="com.springsource.org.apache.activemq.pool"/>\r
-      <plugin id="com.springsource.org.apache.bsf"/>\r
-      <plugin id="com.springsource.org.apache.catalina"/>\r
-      <plugin id="com.springsource.org.apache.commons.beanutils"/>\r
-      <plugin id="com.springsource.org.apache.commons.cli"/>\r
-      <plugin id="com.springsource.org.apache.commons.codec"/>\r
-      <plugin id="com.springsource.org.apache.commons.collections"/>\r
-      <plugin id="com.springsource.org.apache.commons.dbcp"/>\r
-      <plugin id="com.springsource.org.apache.commons.fileupload"/>\r
-      <plugin id="com.springsource.org.apache.commons.httpclient"/>\r
-      <plugin id="com.springsource.org.apache.commons.io"/>\r
-      <plugin id="com.springsource.org.apache.commons.lang"/>\r
-      <plugin id="com.springsource.org.apache.commons.net"/>\r
-      <plugin id="com.springsource.org.apache.commons.pool"/>\r
-      <plugin id="com.springsource.org.apache.commons.vfs"/>\r
-      <plugin id="com.springsource.org.apache.coyote" fragment="true"/>\r
-      <plugin id="com.springsource.org.apache.derby"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.changepw"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.jndi"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.ldap"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.ntp"/>\r
-      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>\r
-      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>\r
-      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>\r
-      <plugin id="com.springsource.org.apache.log4j"/>\r
-      <plugin id="com.springsource.org.apache.lucene"/>\r
-      <plugin id="com.springsource.org.apache.mina"/>\r
-      <plugin id="com.springsource.org.apache.oro"/>\r
-      <plugin id="com.springsource.org.apache.regexp"/>\r
-      <plugin id="com.springsource.org.apache.taglibs.standard"/>\r
-      <plugin id="com.springsource.org.apache.tools.ant"/>\r
-      <plugin id="com.springsource.org.apache.tools.ant.launch"/>\r
-      <plugin id="com.springsource.org.apache.ws.commons.schema"/>\r
-      <plugin id="com.springsource.org.apache.xalan"/>\r
-      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>\r
-      <plugin id="com.springsource.org.apache.xml.resolver"/>\r
-      <plugin id="com.springsource.org.apache.xml.serializer"/>\r
-      <plugin id="com.springsource.org.apache.xmlbeans"/>\r
-      <plugin id="com.springsource.org.apache.xmlcommons"/>\r
-      <plugin id="com.springsource.org.aspectj.runtime"/>\r
-      <plugin id="com.springsource.org.aspectj.weaver"/>\r
-      <plugin id="com.springsource.org.castor"/>\r
-      <plugin id="com.springsource.org.codehaus.jackson"/>\r
-      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>\r
-      <plugin id="com.springsource.org.dbunit"/>\r
-      <plugin id="com.springsource.org.dom4j"/>\r
-      <plugin id="com.springsource.org.h2"/>\r
-      <plugin id="com.springsource.org.hibernate"/>\r
-      <plugin id="com.springsource.org.hsqldb"/>\r
-      <plugin id="com.springsource.org.jgroups"/>\r
-      <plugin id="com.springsource.org.mortbay.jetty.server"/>\r
-      <plugin id="com.springsource.org.mortbay.util"/>\r
-      <plugin id="com.springsource.org.postgresql.jdbc3"/>\r
-      <plugin id="com.springsource.org.quartz"/>\r
-      <plugin id="com.springsource.org.tmatesoft.svn"/>\r
-      <plugin id="com.springsource.org.xmlpull"/>\r
-      <plugin id="com.springsource.slf4j.api"/>\r
-      <plugin id="com.springsource.slf4j.log4j" fragment="true"/>\r
-      <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>\r
-      <plugin id="org.argeo.basic.nodeps"/>\r
-      <plugin id="org.argeo.dep.osgi.activemq"/>\r
-      <plugin id="org.argeo.dep.osgi.activemq.optional" fragment="true"/>\r
-      <plugin id="org.argeo.dep.osgi.commons.cli"/>\r
-      <plugin id="org.argeo.dep.osgi.commons.exec"/>\r
-      <plugin id="org.argeo.osgi.boot"/>\r
-      <plugin id="org.argeo.security.core"/>\r
-      <plugin id="org.argeo.security.manager.ldap"/>\r
-      <plugin id="org.argeo.security.mvc"/>\r
-      <plugin id="org.argeo.security.services"/>\r
-      <plugin id="org.argeo.security.webapp"/>\r
-      <plugin id="org.argeo.server.activemq.broker"/>\r
-      <plugin id="org.argeo.server.ads"/>\r
-      <plugin id="org.argeo.server.ads.server"/>\r
-      <plugin id="org.argeo.server.catalina" fragment="true"/>\r
-      <plugin id="org.argeo.server.core"/>\r
-      <plugin id="org.argeo.server.jdbc" fragment="true"/>\r
-      <plugin id="org.argeo.server.json"/>\r
-      <plugin id="org.argeo.server.tomcat" fragment="true"/>\r
-      <plugin id="org.argeo.server.webextender" fragment="true"/>\r
-      <plugin id="org.argeo.slc.agent"/>\r
-      <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>\r
-      <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>\r
-      <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>\r
-      <plugin id="org.argeo.slc.agent.jms"/>\r
-      <plugin id="org.argeo.slc.client.agent"/>\r
-      <plugin id="org.argeo.slc.client.commons"/>\r
-      <plugin id="org.argeo.slc.client.core"/>\r
-      <plugin id="org.argeo.slc.client.hibernate"/>\r
-      <plugin id="org.argeo.slc.client.oxm"/>\r
-      <plugin id="org.argeo.slc.client.rap"/>\r
-      <plugin id="org.argeo.slc.client.ui"/>\r
-      <plugin id="org.argeo.slc.core"/>\r
-      <plugin id="org.argeo.slc.demo.agent" fragment="true"/>\r
-      <plugin id="org.argeo.slc.demo.ant"/>\r
-      <plugin id="org.argeo.slc.demo.basic"/>\r
-      <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>\r
-      <plugin id="org.argeo.slc.ext.activemq" fragment="true"/>\r
-      <plugin id="org.argeo.slc.server"/>\r
-      <plugin id="org.argeo.slc.server.activemq"/>\r
-      <plugin id="org.argeo.slc.server.castor"/>\r
-      <plugin id="org.argeo.slc.server.h2"/>\r
-      <plugin id="org.argeo.slc.server.hibernate"/>\r
-      <plugin id="org.argeo.slc.server.main.rap"/>\r
-      <plugin id="org.argeo.slc.server.services"/>\r
-      <plugin id="org.argeo.slc.specs"/>\r
-      <plugin id="org.argeo.slc.support.activemq"/>\r
-      <plugin id="org.argeo.slc.support.ant"/>\r
-      <plugin id="org.argeo.slc.support.castor" fragment="true"/>\r
-      <plugin id="org.argeo.slc.support.equinox"/>\r
-      <plugin id="org.argeo.slc.support.hibernate" fragment="true"/>\r
-      <plugin id="org.argeo.slc.support.maven" fragment="true"/>\r
-      <plugin id="org.argeo.slc.support.osgi"/>\r
-      <plugin id="org.argeo.slc.support.simple"/>\r
-      <plugin id="org.eclipse.core.commands"/>\r
-      <plugin id="org.eclipse.core.contenttype"/>\r
-      <plugin id="org.eclipse.core.databinding"/>\r
-      <plugin id="org.eclipse.core.databinding.beans"/>\r
-      <plugin id="org.eclipse.core.databinding.observable"/>\r
-      <plugin id="org.eclipse.core.databinding.property"/>\r
-      <plugin id="org.eclipse.core.databinding.source"/>\r
-      <plugin id="org.eclipse.core.expressions"/>\r
-      <plugin id="org.eclipse.core.jobs"/>\r
-      <plugin id="org.eclipse.core.runtime"/>\r
-      <plugin id="org.eclipse.equinox.app"/>\r
-      <plugin id="org.eclipse.equinox.common"/>\r
-      <plugin id="org.eclipse.equinox.http.jetty"/>\r
-      <plugin id="org.eclipse.equinox.http.registry"/>\r
-      <plugin id="org.eclipse.equinox.http.servlet"/>\r
-      <plugin id="org.eclipse.equinox.launcher"/>\r
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.equinox.launcher.gtk.linux.x86_64" fragment="true"/>\r
-      <plugin id="org.eclipse.equinox.launcher.source"/>\r
-      <plugin id="org.eclipse.equinox.launcher.win32.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.equinox.preferences"/>\r
-      <plugin id="org.eclipse.equinox.registry"/>\r
-      <plugin id="org.eclipse.help"/>\r
-      <plugin id="org.eclipse.jdt.junit.runtime"/>\r
-      <plugin id="org.eclipse.jface"/>\r
-      <plugin id="org.eclipse.jface.databinding"/>\r
-      <plugin id="org.eclipse.osgi"/>\r
-      <plugin id="org.eclipse.osgi.services"/>\r
-      <plugin id="org.eclipse.rap.demo"/>\r
-      <plugin id="org.eclipse.rap.demo.databinding"/>\r
-      <plugin id="org.eclipse.rap.jface"/>\r
-      <plugin id="org.eclipse.rap.jface.databinding"/>\r
-      <plugin id="org.eclipse.rap.junit"/>\r
-      <plugin id="org.eclipse.rap.junit.runtime"/>\r
-      <plugin id="org.eclipse.rap.rwt"/>\r
-      <plugin id="org.eclipse.rap.rwt.q07" fragment="true"/>\r
-      <plugin id="org.eclipse.rap.ui"/>\r
-      <plugin id="org.eclipse.rap.ui.cheatsheets"/>\r
-      <plugin id="org.eclipse.rap.ui.forms"/>\r
-      <plugin id="org.eclipse.rap.ui.views"/>\r
-      <plugin id="org.eclipse.rap.ui.workbench"/>\r
-      <plugin id="org.eclipse.swt"/>\r
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>\r
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>\r
-      <plugin id="org.eclipse.ui"/>\r
-      <plugin id="org.eclipse.ui.workbench"/>\r
-      <plugin id="org.junit"/>\r
-      <plugin id="org.mortbay.jetty.server"/>\r
-      <plugin id="org.mortbay.jetty.util"/>\r
-      <plugin id="org.springframework.aop"/>\r
-      <plugin id="org.springframework.beans"/>\r
-      <plugin id="org.springframework.context"/>\r
-      <plugin id="org.springframework.context.support"/>\r
-      <plugin id="org.springframework.core"/>\r
-      <plugin id="org.springframework.jdbc"/>\r
-      <plugin id="org.springframework.jms"/>\r
-      <plugin id="org.springframework.jms.source"/>\r
-      <plugin id="org.springframework.orm"/>\r
-      <plugin id="org.springframework.osgi.core"/>\r
-      <plugin id="org.springframework.osgi.extender"/>\r
-      <plugin id="org.springframework.osgi.io"/>\r
-      <plugin id="org.springframework.osgi.web"/>\r
-      <plugin id="org.springframework.osgi.web.extender"/>\r
-      <plugin id="org.springframework.oxm"/>\r
-      <plugin id="org.springframework.security.acls" fragment="true"/>\r
-      <plugin id="org.springframework.security.core"/>\r
-      <plugin id="org.springframework.security.taglibs"/>\r
-      <plugin id="org.springframework.transaction"/>\r
-      <plugin id="org.springframework.web"/>\r
-      <plugin id="org.springframework.web.servlet"/>\r
-      <plugin id="org.springframework.xml"/>\r
-   </plugins>\r
-\r
-   <configurations>\r
-      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.client.ui" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.server.castor" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.server.h2" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.server.hibernate" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />\r
-      <plugin id="org.argeo.slc.support.osgi" autoStart="true" startLevel="0" />\r
-   </configurations>\r
-\r
-</product>\r
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java
deleted file mode 100644 (file)
index 62904be..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.jface.action.IMenuManager;
-import org.eclipse.ui.IWorkbenchWindow;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-
-/**
- * Creates, adds and disposes actions for the menus and action bars of
- * each workbench window.
- */
-public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
-
-    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
-        super(configurer);
-    }
-
-    protected void makeActions(IWorkbenchWindow window) {
-    }
-
-    protected void fillMenuBar(IMenuManager menuBar) {
-    }
-    
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java
deleted file mode 100644 (file)
index d3d0581..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/**
- * This workbench advisor creates the window advisor, and specifies
- * the perspective id for the initial window.
- */
-public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
-
-       private static final String PERSPECTIVE_ID = "org.argeo.slc.client.ui.perspectives.slcExecution";
-
-    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
-        return new ApplicationWorkbenchWindowAdvisor(configurer);
-    }
-
-       public String getInitialWindowPerspectiveId() {
-               return PERSPECTIVE_ID;
-       }
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java
deleted file mode 100644 (file)
index 58ef8af..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.swt.graphics.Point;
-import org.eclipse.ui.application.ActionBarAdvisor;
-import org.eclipse.ui.application.IActionBarConfigurer;
-import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
-import org.eclipse.ui.application.WorkbenchWindowAdvisor;
-
-/**
- * Configures the initial size and appearance of a workbench window.
- */
-public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
-
-       public ApplicationWorkbenchWindowAdvisor(
-                       IWorkbenchWindowConfigurer configurer) {
-               super(configurer);
-       }
-
-       public ActionBarAdvisor createActionBarAdvisor(
-                       IActionBarConfigurer configurer) {
-               return new ApplicationActionBarAdvisor(configurer);
-       }
-
-       public void preWindowOpen() {
-               IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
-               configurer.setInitialSize(new Point(1200, 900));
-               configurer.setShowCoolBar(false);
-               configurer.setShowStatusLine(false);
-       }
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java
deleted file mode 100644 (file)
index 51c0f24..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.ui.IPageLayout;
-import org.eclipse.ui.IPerspectiveFactory;
-
-/**
- * Configures the perspective layout. This class is contributed 
- * through the plugin.xml.
- */
-public class Perspective implements IPerspectiveFactory {
-
-       public void createInitialLayout(IPageLayout layout) {
-       }
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java
deleted file mode 100644 (file)
index 5b7fc5f..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-package org.argeo.slc.client.rap;
-
-import org.eclipse.rwt.lifecycle.IEntryPoint;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.application.WorkbenchAdvisor;
-
-/**
- * This class controls all aspects of the application's execution
- * and is contributed through the plugin.xml.
- */
-public class SlcClientRapApplication implements IEntryPoint {
-
-       public int createUI() {
-               Display display = PlatformUI.createDisplay();
-               WorkbenchAdvisor advisor = new ApplicationWorkbenchAdvisor();
-               return PlatformUI.createAndRunWorkbench( display, advisor );
-       }
-}
diff --git a/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java b/eclipse/plugins/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java
deleted file mode 100644 (file)
index 60ca364..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-package org.argeo.slc.client.rap;\r
-\r
-import org.eclipse.jface.resource.ImageDescriptor;\r
-import org.eclipse.ui.plugin.AbstractUIPlugin;\r
-import org.osgi.framework.BundleContext;\r
-\r
-/**\r
- * The activator class controls the plug-in life cycle\r
- */\r
-public class SlcClientRapPlugin extends AbstractUIPlugin {\r
-\r
-       // The plug-in ID\r
-       public static final String PLUGIN_ID = "org.argeo.slc.client.rap"; //$NON-NLS-1$\r
-\r
-       // The shared instance\r
-       private static SlcClientRapPlugin plugin;\r
-\r
-       /**\r
-        * The constructor\r
-        */\r
-       public SlcClientRapPlugin() {\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see\r
-        * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext\r
-        * )\r
-        */\r
-       public void start(BundleContext context) throws Exception {\r
-               super.start(context);\r
-               plugin = this;\r
-       }\r
-\r
-       /*\r
-        * (non-Javadoc)\r
-        * \r
-        * @see\r
-        * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext\r
-        * )\r
-        */\r
-       public void stop(BundleContext context) throws Exception {\r
-               plugin = null;\r
-               super.stop(context);\r
-       }\r
-\r
-       /**\r
-        * Returns the shared instance\r
-        * \r
-        * @return the shared instance\r
-        */\r
-       public static SlcClientRapPlugin getDefault() {\r
-               return plugin;\r
-       }\r
-\r
-       /**\r
-        * Returns an image descriptor for the image file at the given plug-in\r
-        * relative path\r
-        * \r
-        * @param path\r
-        *            the path\r
-        * @return the image descriptor\r
-        */\r
-       public static ImageDescriptor getImageDescriptor(String path) {\r
-               return imageDescriptorFromPlugin(PLUGIN_ID, path);\r
-       }\r
-}\r
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/.classpath b/eclipse/plugins/runtime/org.argeo.slc.client.rap/.classpath
new file mode 100644 (file)
index 0000000..eff0df6
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>\r
+       <classpathentry kind="src" path="src/main/java"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/.project b/eclipse/plugins/runtime/org.argeo.slc.client.rap/.project
new file mode 100644 (file)
index 0000000..9b82af4
--- /dev/null
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.argeo.slc.client.rap</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.ManifestBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.eclipse.pde.SchemaBuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.eclipse.pde.PluginNature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs b/eclipse/plugins/runtime/org.argeo.slc.client.rap/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..fd3794f
--- /dev/null
@@ -0,0 +1,8 @@
+#Wed Nov 24 21:23:34 CET 2010\r
+eclipse.preferences.version=1\r
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
+org.eclipse.jdt.core.compiler.compliance=1.6\r
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
+org.eclipse.jdt.core.compiler.source=1.6\r
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/META-INF/MANIFEST.MF b/eclipse/plugins/runtime/org.argeo.slc.client.rap/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..eedcc6e
--- /dev/null
@@ -0,0 +1,13 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Rap Client for SLC
+Bundle-SymbolicName: org.argeo.slc.client.rap;singleton:=true
+Bundle-Version: 0.13.1.SNAPSHOT
+Bundle-Activator: org.argeo.slc.client.rap.SlcClientRapPlugin
+Bundle-Vendor: Argeo SASU
+Require-Bundle: org.eclipse.rap.ui;resolution:=optional
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Bundle-ActivationPolicy: lazy
+Import-Package: javax.servlet;version="2.4.0",
+ javax.servlet.http;version="2.4.0",
+ org.argeo.slc.client.ui.perspectives
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/build.properties b/eclipse/plugins/runtime/org.argeo.slc.client.rap/build.properties
new file mode 100644 (file)
index 0000000..5dd830c
--- /dev/null
@@ -0,0 +1,5 @@
+source.. = src/main/java/\r
+output.. = target/classes/\r
+bin.includes = plugin.xml,\\r
+               META-INF/,\\r
+               .\r
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif b/eclipse/plugins/runtime/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif
new file mode 100644 (file)
index 0000000..b8ca14a
Binary files /dev/null and b/eclipse/plugins/runtime/org.argeo.slc.client.rap/icons/slc_execution_perspective.gif differ
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/plugin.xml b/eclipse/plugins/runtime/org.argeo.slc.client.rap/plugin.xml
new file mode 100644 (file)
index 0000000..3658bee
--- /dev/null
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<?eclipse version="3.4"?>\r
+<plugin>\r
+\r
+ <extension\r
+         id="SlcRapProduct"\r
+         point="org.eclipse.core.runtime.products">\r
+      <product\r
+            name="ArgeoSlcProduct"\r
+            application="org.eclipse.ui.ide.workbench"\r
+            >\r
+         <property\r
+               name="windowImages"\r
+               value="icons/argeo-icon-256.png">\r
+         </property>\r
+         <property\r
+               name="appName"\r
+               value="SLC">\r
+         </property>\r
+      </product>\r
+   </extension>\r
+\r
+   <extension\r
+         point="org.eclipse.rap.ui.entrypoint">\r
+      <entrypoint\r
+            class="org.argeo.slc.client.rap.SlcClientRapApplication"\r
+            parameter="slc"\r
+            id="org.argeo.slc.client.rap.SlcClientRapApplication">\r
+      </entrypoint>\r
+   </extension>\r
+     \r
+   <extension\r
+         point="org.eclipse.ui.perspectives">\r
+      <perspective\r
+            name="Slc Execution"\r
+            class="org.argeo.slc.client.ui.perspectives.SlcExecution"\r
+                       id="org.argeo.slc.client.ui.perspectives.slcExecution"\r
+            icon="icons/slc_execution_perspective.gif">\r
+      </perspective>\r
+   </extension>\r
+       <extension\r
+         point="org.eclipse.ui.menus">\r
+      <menuContribution\r
+            locationURI="menu:org.eclipse.ui.main.menu">\r
+         <menu\r
+               id="fileMenu"\r
+               label="File">\r
+            <command\r
+                  id="exitCommand"\r
+                  commandId="org.eclipse.ui.file.exit"\r
+                  label="Exit"\r
+                  style="push"\r
+                  tooltip="Exits the application">\r
+            </command>\r
+         </menu>\r
+      </menuContribution>\r
+   </extension>\r
+  <!-- <extension\r
+         point="org.eclipse.ui.commands">\r
+      <command\r
+            defaultHandler="org.eclipse.ui.internal.handlers.QuitHandler"\r
+            id="org.eclipse.ui.file.exit"\r
+            name="Exit">\r
+      </command> \r
+   </extension> -->\r
+  \r
+</plugin>\r
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml b/eclipse/plugins/runtime/org.argeo.slc.client.rap/pom.xml
new file mode 100644 (file)
index 0000000..a17b171
--- /dev/null
@@ -0,0 +1,36 @@
+<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.eclipse</groupId>
+               <artifactId>runtime</artifactId>
+               <version>0.13.1-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.client.rap</artifactId>
+       <name>SLC Client RAP</name>
+       <packaging>jar</packaging>
+       <dependencies>
+
+               <!-- SLC -->
+               <dependency>
+                       <groupId>org.argeo.slc.eclipse</groupId>
+                       <artifactId>org.argeo.slc.client.ui</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+               <!-- Argeo common distribution for RAP projects -->
+               <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rap</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
+               <!-- Eclipse -->
+               <!-- <dependency> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui</artifactId> 
+                       </dependency> <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> 
+                       </dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> 
+                       </dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId> 
+                       </dependency> -->
+       </dependencies>
+</project>
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationActionBarAdvisor.java
new file mode 100644 (file)
index 0000000..62904be
--- /dev/null
@@ -0,0 +1,24 @@
+package org.argeo.slc.client.rap;
+
+import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.application.ActionBarAdvisor;
+import org.eclipse.ui.application.IActionBarConfigurer;
+
+/**
+ * Creates, adds and disposes actions for the menus and action bars of
+ * each workbench window.
+ */
+public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
+
+    public ApplicationActionBarAdvisor(IActionBarConfigurer configurer) {
+        super(configurer);
+    }
+
+    protected void makeActions(IWorkbenchWindow window) {
+    }
+
+    protected void fillMenuBar(IMenuManager menuBar) {
+    }
+    
+}
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchAdvisor.java
new file mode 100644 (file)
index 0000000..d3d0581
--- /dev/null
@@ -0,0 +1,22 @@
+package org.argeo.slc.client.rap;
+
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.eclipse.ui.application.WorkbenchAdvisor;
+import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+
+/**
+ * This workbench advisor creates the window advisor, and specifies
+ * the perspective id for the initial window.
+ */
+public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
+
+       private static final String PERSPECTIVE_ID = "org.argeo.slc.client.ui.perspectives.slcExecution";
+
+    public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(IWorkbenchWindowConfigurer configurer) {
+        return new ApplicationWorkbenchWindowAdvisor(configurer);
+    }
+
+       public String getInitialWindowPerspectiveId() {
+               return PERSPECTIVE_ID;
+       }
+}
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/ApplicationWorkbenchWindowAdvisor.java
new file mode 100644 (file)
index 0000000..58ef8af
--- /dev/null
@@ -0,0 +1,30 @@
+package org.argeo.slc.client.rap;
+
+import org.eclipse.swt.graphics.Point;
+import org.eclipse.ui.application.ActionBarAdvisor;
+import org.eclipse.ui.application.IActionBarConfigurer;
+import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
+import org.eclipse.ui.application.WorkbenchWindowAdvisor;
+
+/**
+ * Configures the initial size and appearance of a workbench window.
+ */
+public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
+
+       public ApplicationWorkbenchWindowAdvisor(
+                       IWorkbenchWindowConfigurer configurer) {
+               super(configurer);
+       }
+
+       public ActionBarAdvisor createActionBarAdvisor(
+                       IActionBarConfigurer configurer) {
+               return new ApplicationActionBarAdvisor(configurer);
+       }
+
+       public void preWindowOpen() {
+               IWorkbenchWindowConfigurer configurer = getWindowConfigurer();
+               configurer.setInitialSize(new Point(1200, 900));
+               configurer.setShowCoolBar(false);
+               configurer.setShowStatusLine(false);
+       }
+}
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/Perspective.java
new file mode 100644 (file)
index 0000000..51c0f24
--- /dev/null
@@ -0,0 +1,14 @@
+package org.argeo.slc.client.rap;
+
+import org.eclipse.ui.IPageLayout;
+import org.eclipse.ui.IPerspectiveFactory;
+
+/**
+ * Configures the perspective layout. This class is contributed 
+ * through the plugin.xml.
+ */
+public class Perspective implements IPerspectiveFactory {
+
+       public void createInitialLayout(IPageLayout layout) {
+       }
+}
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapApplication.java
new file mode 100644 (file)
index 0000000..5b7fc5f
--- /dev/null
@@ -0,0 +1,19 @@
+package org.argeo.slc.client.rap;
+
+import org.eclipse.rwt.lifecycle.IEntryPoint;
+import org.eclipse.swt.widgets.Display;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.application.WorkbenchAdvisor;
+
+/**
+ * This class controls all aspects of the application's execution
+ * and is contributed through the plugin.xml.
+ */
+public class SlcClientRapApplication implements IEntryPoint {
+
+       public int createUI() {
+               Display display = PlatformUI.createDisplay();
+               WorkbenchAdvisor advisor = new ApplicationWorkbenchAdvisor();
+               return PlatformUI.createAndRunWorkbench( display, advisor );
+       }
+}
diff --git a/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java b/eclipse/plugins/runtime/org.argeo.slc.client.rap/src/main/java/org/argeo/slc/client/rap/SlcClientRapPlugin.java
new file mode 100644 (file)
index 0000000..60ca364
--- /dev/null
@@ -0,0 +1,68 @@
+package org.argeo.slc.client.rap;\r
+\r
+import org.eclipse.jface.resource.ImageDescriptor;\r
+import org.eclipse.ui.plugin.AbstractUIPlugin;\r
+import org.osgi.framework.BundleContext;\r
+\r
+/**\r
+ * The activator class controls the plug-in life cycle\r
+ */\r
+public class SlcClientRapPlugin extends AbstractUIPlugin {\r
+\r
+       // The plug-in ID\r
+       public static final String PLUGIN_ID = "org.argeo.slc.client.rap"; //$NON-NLS-1$\r
+\r
+       // The shared instance\r
+       private static SlcClientRapPlugin plugin;\r
+\r
+       /**\r
+        * The constructor\r
+        */\r
+       public SlcClientRapPlugin() {\r
+       }\r
+\r
+       /*\r
+        * (non-Javadoc)\r
+        * \r
+        * @see\r
+        * org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext\r
+        * )\r
+        */\r
+       public void start(BundleContext context) throws Exception {\r
+               super.start(context);\r
+               plugin = this;\r
+       }\r
+\r
+       /*\r
+        * (non-Javadoc)\r
+        * \r
+        * @see\r
+        * org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext\r
+        * )\r
+        */\r
+       public void stop(BundleContext context) throws Exception {\r
+               plugin = null;\r
+               super.stop(context);\r
+       }\r
+\r
+       /**\r
+        * Returns the shared instance\r
+        * \r
+        * @return the shared instance\r
+        */\r
+       public static SlcClientRapPlugin getDefault() {\r
+               return plugin;\r
+       }\r
+\r
+       /**\r
+        * Returns an image descriptor for the image file at the given plug-in\r
+        * relative path\r
+        * \r
+        * @param path\r
+        *            the path\r
+        * @return the image descriptor\r
+        */\r
+       public static ImageDescriptor getImageDescriptor(String path) {\r
+               return imageDescriptorFromPlugin(PLUGIN_ID, path);\r
+       }\r
+}\r
index 03f7f1f22cb1225b1658ad2da4f1052733b08952..27e2b12418cc1ebd36ec586d1c5fa48b1f327d1c 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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.eclipse</groupId>
        <name>SLC Client RCP</name>
        <packaging>jar</packaging>
        <dependencies>
+               
                <!-- SLC -->
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.ui</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <!-- Eclipse -->
+               
+               <!-- Argeo common distribution for RCP projects -->
                <dependency>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.dep.rcp</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+               
+               <!-- Eclipse -->
+               <!--   <dependency>
                        <groupId>org.eclipse.ui</groupId>
                        <artifactId>org.eclipse.ui</artifactId>
                </dependency>
@@ -32,7 +42,6 @@
                <dependency>
                        <groupId>org.eclipse.swt</groupId>
                        <artifactId>org.eclipse.swt.gtk.linux.x86</artifactId>
-               </dependency>
-
+               </dependency> -->
        </dependencies>
 </project>
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
deleted file mode 100644 (file)
index ef7a3a3..0000000
+++ /dev/null
@@ -1,255 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?>
-
-<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>
-
-   <launcherArgs>
-      <programArgs>-console</programArgs>
-      <vmArgsMac>-XstartOnFirstThread -Dorg.eclipse.swt.internal.carbon.smallFonts</vmArgsMac>
-   </launcherArgs>
-
-   <windowImages i16="icons/argeo-icon-256.png"/>
-
-
-   <launcher>
-      <solaris/>
-      <win useIco="false">
-         <bmp/>
-      </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.lowagie.text"/>
-      <plugin id="com.springsource.com.mysql.jdbc"/>
-      <plugin id="com.springsource.com.thoughtworks.xstream"/>
-      <plugin id="com.springsource.edu.emory.mathcs.backport"/>
-      <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
-      <plugin id="com.springsource.javassist"/>
-      <plugin id="com.springsource.javax.activation"/>
-      <plugin id="com.springsource.javax.annotation"/>
-      <plugin id="com.springsource.javax.ejb"/>
-      <plugin id="com.springsource.javax.el"/>
-      <plugin id="com.springsource.javax.jms"/>
-      <plugin id="com.springsource.javax.mail"/>
-      <plugin id="com.springsource.javax.management.j2ee"/>
-      <plugin id="com.springsource.javax.media.jai.codec"/>
-      <plugin id="com.springsource.javax.media.jai.core"/>
-      <plugin id="com.springsource.javax.persistence"/>
-      <plugin id="com.springsource.javax.resource"/>
-      <plugin id="com.springsource.javax.servlet"/>
-      <plugin id="com.springsource.javax.servlet.jsp"/>
-      <plugin id="com.springsource.javax.servlet.jsp.jstl"/>
-      <plugin id="com.springsource.javax.transaction"/>
-      <plugin id="com.springsource.javax.xml.bind"/>
-      <plugin id="com.springsource.javax.xml.rpc"/>
-      <plugin id="com.springsource.javax.xml.soap"/>
-      <plugin id="com.springsource.javax.xml.stream"/>
-      <plugin id="com.springsource.javax.xml.ws"/>
-      <plugin id="com.springsource.jcifs"/>
-      <plugin id="com.springsource.jdbm"/>
-      <plugin id="com.springsource.json"/>
-      <plugin id="com.springsource.junit"/>
-      <plugin id="com.springsource.jxl"/>
-      <plugin id="com.springsource.net.sf.cglib"/>
-      <plugin id="com.springsource.net.sf.ehcache"/>
-      <plugin id="com.springsource.net.sourceforge.jtds"/>
-      <plugin id="com.springsource.oracle.jdbc"/>
-      <plugin id="com.springsource.org.antlr"/>
-      <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.codec"/>
-      <plugin id="com.springsource.org.apache.commons.collections"/>
-      <plugin id="com.springsource.org.apache.commons.dbcp"/>
-      <plugin id="com.springsource.org.apache.commons.fileupload"/>
-      <plugin id="com.springsource.org.apache.commons.httpclient"/>
-      <plugin id="com.springsource.org.apache.commons.io"/>
-      <plugin id="com.springsource.org.apache.commons.lang"/>
-      <plugin id="com.springsource.org.apache.commons.net"/>
-      <plugin id="com.springsource.org.apache.commons.pool"/>
-      <plugin id="com.springsource.org.apache.commons.vfs"/>
-      <plugin id="com.springsource.org.apache.derby"/>
-      <plugin id="com.springsource.org.apache.directory.server.changepw"/>
-      <plugin id="com.springsource.org.apache.directory.server.core" fragment="true"/>
-      <plugin id="com.springsource.org.apache.directory.server.core.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.jndi"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos"/>
-      <plugin id="com.springsource.org.apache.directory.server.kerberos.shared"/>
-      <plugin id="com.springsource.org.apache.directory.server.ldap"/>
-      <plugin id="com.springsource.org.apache.directory.server.ntp"/>
-      <plugin id="com.springsource.org.apache.directory.server.protocol.shared"/>
-      <plugin id="com.springsource.org.apache.directory.shared.asn1"/>
-      <plugin id="com.springsource.org.apache.directory.shared.ldap"/>
-      <plugin id="com.springsource.org.apache.log4j"/>
-      <plugin id="com.springsource.org.apache.lucene"/>
-      <plugin id="com.springsource.org.apache.mina"/>
-      <plugin id="com.springsource.org.apache.oro"/>
-      <plugin id="com.springsource.org.apache.regexp"/>
-      <plugin id="com.springsource.org.apache.taglibs.standard"/>
-      <plugin id="com.springsource.org.apache.tools.ant"/>
-      <plugin id="com.springsource.org.apache.tools.ant.launch"/>
-      <plugin id="com.springsource.org.apache.ws.commons.schema"/>
-      <plugin id="com.springsource.org.apache.xalan"/>
-      <plugin id="com.springsource.org.apache.xerces" fragment="true"/>
-      <plugin id="com.springsource.org.apache.xml.resolver"/>
-      <plugin id="com.springsource.org.apache.xml.serializer"/>
-      <plugin id="com.springsource.org.apache.xmlbeans"/>
-      <plugin id="com.springsource.org.apache.xmlcommons"/>
-      <plugin id="com.springsource.org.aspectj.runtime"/>
-      <plugin id="com.springsource.org.aspectj.weaver"/>
-      <plugin id="com.springsource.org.castor"/>
-      <plugin id="com.springsource.org.codehaus.jackson"/>
-      <plugin id="com.springsource.org.codehaus.jackson.mapper"/>
-      <plugin id="com.springsource.org.dbunit"/>
-      <plugin id="com.springsource.org.dom4j"/>
-      <plugin id="com.springsource.org.h2"/>
-      <plugin id="com.springsource.org.hibernate"/>
-      <plugin id="com.springsource.org.hsqldb"/>
-      <plugin id="com.springsource.org.jaxen"/>
-      <plugin id="com.springsource.org.jdom"/>
-      <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"/>
-      <plugin id="com.springsource.org.xmlpull"/>
-      <plugin id="com.springsource.slf4j.api"/>
-      <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"/>
-      <plugin id="org.argeo.dep.osgi.geotools"/>
-      <plugin id="org.argeo.dep.osgi.jai.imageio"/>
-      <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.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.security.core"/>
-      <plugin id="org.argeo.security.manager.ldap"/>
-      <plugin id="org.argeo.security.services"/>
-      <plugin id="org.argeo.server.core"/>
-      <plugin id="org.argeo.server.jdbc" fragment="true"/>
-      <plugin id="org.argeo.server.json"/>
-      <plugin id="org.argeo.slc.agent"/>
-      <plugin id="org.argeo.slc.agent.ext.bsf" fragment="true"/>
-      <plugin id="org.argeo.slc.agent.ext.jdbc" fragment="true"/>
-      <plugin id="org.argeo.slc.agent.ext.xalan" fragment="true"/>
-      <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"/>
-      <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"/>
-      <plugin id="org.argeo.slc.demo.basic"/>
-      <plugin id="org.argeo.slc.demo.log4j" fragment="true"/>
-      <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"/>
-      <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"/>
-      <plugin id="org.argeo.slc.server.hibernate"/>
-      <plugin id="org.argeo.slc.server.services"/>
-      <plugin id="org.argeo.slc.specs"/>
-      <plugin id="org.argeo.slc.support.activemq"/>
-      <plugin id="org.argeo.slc.support.ant"/>
-      <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"/>
-      <plugin id="org.argeo.slc.support.osgi"/>
-      <plugin id="org.argeo.slc.support.simple"/>
-      <plugin id="org.eclipse.core.commands"/>
-      <plugin id="org.eclipse.core.contenttype"/>
-      <plugin id="org.eclipse.core.databinding"/>
-      <plugin id="org.eclipse.core.databinding.observable"/>
-      <plugin id="org.eclipse.core.databinding.property"/>
-      <plugin id="org.eclipse.core.expressions"/>
-      <plugin id="org.eclipse.core.jobs"/>
-      <plugin id="org.eclipse.core.runtime"/>
-      <plugin id="org.eclipse.equinox.app"/>
-      <plugin id="org.eclipse.equinox.common"/>
-      <plugin id="org.eclipse.equinox.preferences"/>
-      <plugin id="org.eclipse.equinox.registry"/>
-      <plugin id="org.eclipse.help"/>
-      <plugin id="org.eclipse.jface"/>
-      <plugin id="org.eclipse.jface.databinding"/>
-      <plugin id="org.eclipse.osgi"/>
-      <plugin id="org.eclipse.swt"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86" fragment="true"/>
-      <plugin id="org.eclipse.swt.gtk.linux.x86_64" fragment="true"/>
-      <plugin id="org.eclipse.swt.win32.win32.x86" fragment="true"/>
-      <plugin id="org.eclipse.ui"/>
-      <plugin id="org.eclipse.ui.workbench"/>
-      <plugin id="org.springframework.aop"/>
-      <plugin id="org.springframework.beans"/>
-      <plugin id="org.springframework.context"/>
-      <plugin id="org.springframework.context.support"/>
-      <plugin id="org.springframework.core"/>
-      <plugin id="org.springframework.jdbc"/>
-      <plugin id="org.springframework.jms"/>
-      <plugin id="org.springframework.orm"/>
-      <plugin id="org.springframework.osgi.core"/>
-      <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"/>
-      <plugin id="org.springframework.web.servlet"/>
-      <plugin id="org.springframework.xml"/>
-   </plugins>
-
-   <configurations>
-      <plugin id="org.argeo.security.manager.ldap" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.security.services" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.agent" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.agent" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.gis" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.hibernate" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.oxm" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.client.ui" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.demo.ant" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.demo.basic" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.gis.position.backend" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.gis.position.gpsbabel" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.castor" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.h2" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.hibernate" autoStart="true" startLevel="0" />
-      <plugin id="org.argeo.slc.server.services" autoStart="true" startLevel="0" />
-   </configurations>
-
-</product>
index dca9232250d037accc608617d0154fd43e66f174..a83c9986c05f6c1d041b3680d555b39d10278eab 100644 (file)
        <artifactId>org.argeo.slc.client.ui</artifactId>
        <name>SLC Client UI</name>
        <packaging>jar</packaging>
+
+
        <dependencies>
                <!-- SLC Client UI -->
-               <dependency>
-                       <groupId>org.argeo.slc.eclipse</groupId>
-                       <artifactId>org.argeo.slc.client.commons</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
                <dependency>
                        <groupId>org.argeo.slc.eclipse</groupId>
                        <artifactId>org.argeo.slc.client.oxm</artifactId>
                        <artifactId>org.argeo.slc.server</artifactId>
                        <version>${project.version}</version>
                </dependency>
-               <!-- Commons -->
-               <dependency>
-                       <groupId>org.argeo.commons.eclipse</groupId>
-                       <artifactId>org.argeo.eclipse.ui</artifactId>
-                       <version>${version.argeo-commons}</version>
-               </dependency>
+
                <!-- Spring -->
-               <dependency>
+       <!-- <dependency>
                        <groupId>org.springframework</groupId>
                        <artifactId>org.springframework.context</artifactId>
                </dependency>
-               <!-- Eclipse -->
+ -->   
+               <!-- Commons (with all dependencies that are commons for both RCP and RAP) -->
                <dependency>
-                       <groupId>org.eclipse.ui</groupId>
-                       <artifactId>org.eclipse.ui</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.core</groupId>
-                       <artifactId>org.eclipse.core.runtime</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.eclipse.swt</groupId>
-                       <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId>
+                       <groupId>org.argeo.commons.eclipse</groupId>
+                       <artifactId>org.argeo.eclipse.ui</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
+
+
+               <!-- Eclipse - Only used at compile time. so that it is compatible with 
+                       RCP runtime -->
+               <!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.eclipse</groupId> 
+                       <artifactId>org.argeo.slc.client.rap</artifactId> <version>${project.version}</version> 
+                       <scope>provided</scope> </dependency> -->
+
+               <!-- Commons -->
+               <!-- TO BE DELETED <dependency> <groupId>org.argeo.slc.eclipse</groupId> 
+                       <artifactId>org.argeo.slc.client.commons</artifactId> <version>${project.version}</version> 
+                       </dependency> <dependency> <groupId>org.argeo.commons.eclipse</groupId> <artifactId>org.argeo.eclipse.ui</artifactId> 
+                       <version>${version.argeo-commons}</version> </dependency> -->
+               <!-- Eclipse -->
+               <!-- TO BE DELETED <dependency> <groupId>org.eclipse.ui</groupId> <artifactId>org.eclipse.ui</artifactId> 
+                       </dependency> <dependency> <groupId>org.eclipse.core</groupId> <artifactId>org.eclipse.core.runtime</artifactId> 
+                       </dependency> <dependency> <groupId>org.eclipse.swt</groupId> <artifactId>org.eclipse.swt.gtk.linux.x86_64</artifactId> 
+                       </dependency> -->
+
+
        </dependencies>
 </project>
index ecc6ff299236fbd59a50553e4f325a1d93a58cc4..0b1816b758d6982344473b2da70dccd1e8312f8c 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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.eclipse</groupId>
@@ -16,5 +17,6 @@
                <module>org.argeo.slc.client.core</module>
                <module>org.argeo.slc.client.ui</module>
                <module>org.argeo.slc.client.rcp</module>
+               <module>org.argeo.slc.client.rap</module>
        </modules>
 </project>
index 18f192bc6efc845baf26e97422583d15c9d143e0..b3ba0ffb34a60914a4c250bac48ee8f05298d6bf 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
                                                        ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
                                                        ${project.build.directory}/lib;in=*.jar,
                                                </argeo.osgi.bundles>
-                                               <!--
-                                                       <argeo.osgi.bundles>
-                                                       ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*,
-                                                       ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*,
-                                                       ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.*
-                                                       </argeo.osgi.bundles>
-                                               -->
+                                               <!-- <argeo.osgi.bundles> ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml;ex=.*, 
+                                                       ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml;ex=.*, ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml;ex=.* 
+                                                       </argeo.osgi.bundles> -->
 
                                                <argeo.osgi.start>
                                                        org.springframework.osgi.extender,
                                                        org.argeo.slc.demo.ant                                          
                                                </argeo.osgi.start>
                                                <argeo.server.port.http>7080</argeo.server.port.http>
-                                               <!--
-                                                       <argeo.osgi.start> org.springframework.osgi.extender,
-                                                       org.argeo.server.ads.server,
-                                                       org.argeo.slc.server.jackrabbit.derby, org.argeo.slc.server.jcr,
-                                                       org.argeo.slc.server.main, org.argeo.slc.ria,
-                                                       org.argeo.slc.agent, org.argeo.slc.agent.jms,
-                                                       org.argeo.slc.demo.minimal, org.argeo.slc.demo.basic,
-                                                       org.argeo.slc.demo.ant </argeo.osgi.start>
-                                               -->
+                                               <!-- <argeo.osgi.start> org.springframework.osgi.extender, org.argeo.server.ads.server, 
+                                                       org.argeo.slc.server.jackrabbit.derby, org.argeo.slc.server.jcr, org.argeo.slc.server.main, 
+                                                       org.argeo.slc.ria, org.argeo.slc.agent, org.argeo.slc.agent.jms, org.argeo.slc.demo.minimal, 
+                                                       org.argeo.slc.demo.basic, org.argeo.slc.demo.ant </argeo.osgi.start> -->
                                        </systemProperties>
                                </configuration>
                                <executions>
                                        </execution>
                                </executions>
                        </plugin>
-                               <plugin>
-                                       <artifactId>maven-jar-plugin</artifactId>
-                                       <configuration>
-                                               <archive>
-                                                       <manifestFile>META-INF/MANIFEST.MF</manifestFile>
-                                               </archive>
-                                       </configuration>
-                               </plugin>
+                       <plugin>
+                               <artifactId>maven-jar-plugin</artifactId>
+                               <configuration>
+                                       <archive>
+                                               <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+                                       </archive>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
        <dependencies>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
+                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 5bba9fa74fef688b4f51aa36dfb7c2dadd026355..0675de0542eac3cad4c40e1e0e14c21475264814 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -15,6 +15,7 @@
                <developmentCycle>0.13</developmentCycle>
                <site.repoBase>file:///srv/projects/www/slc/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/slc/site</site.urlBase>
+               <version.argeo-slc>0.13.1-SNAPSHOT</version.argeo-slc>
        </properties>
        <modules>
                <module>runtime</module>
@@ -91,6 +92,17 @@ limitations under the License.
                                <role>developer</role>
                        </roles>
                </developer>
+               <developer>
+                       <id>bsinou</id>
+                       <name>Bruno Sinou</name>
+                       <email><![CDATA[http://www.google.com/recaptcha/mailhide/d?k=01SZoYvDnJzcw0KOR7M7u6Qg==&c=SVgEjXA_Uu9ZrNzLES92w1ght6puLFiVpoNUddCfSU8=]]></email>
+                       <organization>Argeo</organization>
+                       <organizationUrl>http://www.argeo.org</organizationUrl>
+                       <roles>
+                               <role>developer</role>
+                               <role>QA</role>
+                       </roles>
+               </developer>
        </developers>
        <contributors>
                <contributor>
@@ -104,8 +116,133 @@ limitations under the License.
                        </roles>
                </contributor>
        </contributors>
+       <build>
+               <pluginManagement>
+                       <plugins>
+                               <plugin>
+                                       <groupId>org.apache.maven.plugins</groupId>
+                                       <artifactId>maven-scm-plugin</artifactId>
+                                       <version>1.4</version>
+                                       <configuration>
+                                               <connectionType>connection</connectionType>
+                                       </configuration>
+                                       <dependencies>
+                                               <dependency>
+                                                       <groupId>org.apache.maven.scm</groupId>
+                                                       <artifactId>maven-scm-provider-gitexe</artifactId>
+                                                       <version>1.2</version>
+                                               </dependency>
+                                       </dependencies>
+                               </plugin>
+                               <plugin>
+                                       <groupId>org.argeo.maven.plugins</groupId>
+                                       <artifactId>maven-argeo-osgi-plugin</artifactId>
+                                       <version>${version.maven-argeo-osgi}</version>
+                               </plugin>
+                       </plugins>
+               </pluginManagement>
+               <plugins>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>buildnumber-maven-plugin</artifactId>
+                               <version>1.0-beta-4</version>
+                               <executions>
+                                       <execution>
+                                               <phase>generate-resources</phase>
+                                               <goals>
+                                                       <goal>create</goal>
+                                               </goals>
+                                       </execution>
+                               </executions>
+                               <configuration>
+                                       <doCheck>false</doCheck>
+                                       <doUpdate>false</doUpdate>
+                                       <format>{0,date,yyyyMMdd_HHmmss}</format>
+                                       <items>
+                                               <item>timestamp</item>
+                                       </items>
+                                       <revisionOnScmFailure>git</revisionOnScmFailure>
+                                       <providerImplementations>
+                                               <git>svn</git>
+                                       </providerImplementations>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.4.3</version>
+                               <configuration>
+                                       <encoding>UTF-8</encoding>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-release-plugin</artifactId>
+                               <version>2.1</version>
+                               <configuration>
+                                       <autoVersionSubmodules>true</autoVersionSubmodules>
+                                       <preparationGoals>clean install</preparationGoals>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+
+
+       <!-- TO BE DELETED : done differently now to handle automatic generation 
+               of target platform. <build> <pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+               <artifactId>maven-compiler-plugin</artifactId> <version>2.3.2</version> <configuration> 
+               <source>1.5</source> <target>1.5</target> </configuration> </plugin> <plugin> 
+               <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-source-plugin</artifactId> 
+               <version>2.1.2</version> <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-clean-plugin</artifactId> 
+               <version>2.4.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+               <artifactId>maven-surefire-plugin</artifactId> <version>2.7.1</version> </plugin> 
+               <plugin> <groupId>org.argeo.maven.plugins</groupId> <artifactId>maven-argeo-osgi-plugin</artifactId> 
+               <version>${version.maven-argeo-osgi}</version> </plugin> <plugin> <artifactId>maven-jar-plugin</artifactId> 
+               <version>2.3.1</version> <configuration> <archive> <manifestFile>target/classes/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> 
+               <extensions>true</extensions> <configuration> <manifestLocation>target/classes/META-INF</manifestLocation> 
+               <instructions> <Bundle-Version>${project.version}-r${buildNumber}</Bundle-Version> 
+               <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName> <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment> 
+               <_removeheaders>Bnd-LastModified</_removeheaders> </instructions> </configuration> 
+               <executions> <execution> <id>bundle-manifest</id> <phase>process-classes</phase> 
+               <goals> <goal>manifest</goal> </goals> </execution> </executions> </plugin> 
+               </plugins> </pluginManagement> <plugins> <plugin> <groupId>org.codehaus.mojo</groupId> 
+               <artifactId>buildnumber-maven-plugin</artifactId> <version>1.0-beta-4</version> 
+               <executions> <execution> <phase>generate-resources</phase> <goals> <goal>create</goal> 
+               </goals> </execution> </executions> <configuration> <doCheck>false</doCheck> 
+               <doUpdate>false</doUpdate> <format>{0,date,yyyyMMdd_HHmmss}</format> <items> 
+               <item>timestamp</item> </items> <revisionOnScmFailure>git</revisionOnScmFailure> 
+               <providerImplementations> <git>svn</git> </providerImplementations> </configuration> 
+               </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-resources-plugin</artifactId> 
+               <version>2.4.3</version> <configuration> <encoding>UTF-8</encoding> </configuration> 
+               </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-site-plugin</artifactId> 
+               <version>2.1.1</version> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 
+               <artifactId>maven-release-plugin</artifactId> <version>2.1</version> <configuration> 
+               <autoVersionSubmodules>true</autoVersionSubmodules> <releaseProfiles>release</releaseProfiles> 
+               <preparationGoals>clean install</preparationGoals> </configuration> </plugin> 
+               <plugin> <groupId>com.mycila.maven-license-plugin</groupId> <artifactId>maven-license-plugin</artifactId> 
+               <version>1.8.0</version> <configuration> <header>license-apache2-header.txt</header> 
+               <failIfMissing>true</failIfMissing> <aggregate>true</aggregate> <includes> 
+               <include>src/**/*.java</include> <include>src/**/*.xml</include> </includes> 
+               <excludes> <exclude>**/springutil/**</exclude> <exclude>**/qooxdoo-sdk/**</exclude> 
+               </excludes> <useDefaultExcludes>true</useDefaultExcludes> <mapping> <java>SLASHSTAR_STYLE</java> 
+               <xml>XML_STYLE</xml> </mapping> </configuration> </plugin> </plugins> </build> -->
        <dependencyManagement>
                <dependencies>
+                       <dependency>
+                               <groupId>org.argeo.dep</groupId>
+                               <artifactId>versions-all</artifactId>
+                               <version>${version.argeo-distribution}</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+                       <!-- </dependencies> </dependencyManagement> -->
+
+                       <!-- TO BE DELETED, it is in DEP now. <dependencyManagement> <dependencies> -->
+
                        <!-- SLC (itself) -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
@@ -197,7 +334,6 @@ limitations under the License.
                                <artifactId>org.argeo.slc.ria</artifactId>
                                <version>${project.version}</version>
                        </dependency>
-
                        <dependency>
                                <groupId>org.argeo.ria</groupId>
                                <artifactId>org.argeo.ria.core</artifactId>
@@ -209,7 +345,6 @@ limitations under the License.
                                <version>${project.version}</version>
                                <type>pom</type>
                        </dependency>
-
                        <!-- SLC dubious -->
                        <dependency>
                                <groupId>org.argeo.slc.runtime</groupId>
@@ -218,7 +353,6 @@ limitations under the License.
                                <type>tar.gz</type>
                                <classifier>dist</classifier>
                        </dependency>
-
                        <!-- Argeo Commons -->
                        <dependency>
                                <groupId>org.argeo.commons.security</groupId>
@@ -247,9 +381,9 @@ limitations under the License.
                                <artifactId>org.argeo.server.jackrabbit</artifactId>
                                <version>${version.argeo-commons}</version>
                        </dependency>
-
                </dependencies>
        </dependencyManagement>
+       <!-- -->
        <repositories>
                <repository>
                        <id>argeo</id>
index e1d71d58b916f038498eeca7a3ce3b2ed76fdbc5..4cf39434b070f907afb0f1c624f4d74792924ce3 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -40,6 +41,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.specs</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
index adf9aa118781d36f406438bfc8168b313bd143ad..469923cc2f6c301186e89bc5d900d68c71178773 100644 (file)
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.commons.osgi</groupId>
                        <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 
                <dependency>
index c43d6615e972c0fb5290d9cc71eb95f2e212338c..178673a4c9d549cb73c92d57b3026e52903d3f83 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -8,7 +9,6 @@
        </parent>
        <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.lib.detached</artifactId>
-       <packaging>jar</packaging>
        <name>SLC Lib Detached</name>
        <build>
                <plugins>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.detached</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
+                       <version>${project.version}</version>
                        <scope>test</scope>
                </dependency>
 
index 1c94914c95aaa38435df405347c3905f62c1c647..c826dd5696a010c92b010acdf9059d4c30092395 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -46,6 +47,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <!-- Spring -->
                        <optional>true</optional>
                </dependency>
 
-               <!--  Commons VFS
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>com.springsource.org.apache.commons.vfs</artifactId>
-               </dependency> -->
-
+               <!-- Commons VFS <dependency> <groupId>org.apache.commons</groupId> <artifactId>com.springsource.org.apache.commons.vfs</artifactId> 
+                       </dependency> -->
        </dependencies>
 </project>
index 69fec90a887e2ba99725a0e53cb219e7a4cfdb7a..ff10dd3a910e3f824d574a9266286c4361a16f49 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -30,6 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <!-- Spring -->
@@ -76,7 +78,7 @@
                        <artifactId>com.springsource.org.apache.commons.pool</artifactId>
                </dependency>
 
-               <!-- JEE required by ActiveMQ Core-->
+               <!-- JEE required by ActiveMQ Core -->
                <dependency>
                        <groupId>javax.activation</groupId>
                        <artifactId>com.springsource.javax.activation</artifactId>
index 8638cf25cdeb44f5297affc11cd1cfb5745fea6f..010451e7f3f134f783839942edd23e0f23a0511f 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -30,6 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -40,7 +42,7 @@
                        <groupId>org.apache.ant</groupId>
                        <artifactId>com.springsource.org.apache.tools.ant.launch</artifactId>
                </dependency>
-               
+
                <dependency>
                        <groupId>org.apache.commons</groupId>
                        <artifactId>com.springsource.org.apache.commons.net</artifactId>
index 9ae9d2e0939ad0b0ef3b4d0a633871790acf0943..ae112ec25be5e1c1cec228a3962d136c6a8ea9f0 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -62,6 +63,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -94,6 +96,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
+                       <version>${project.version}</version>
                </dependency>
        </dependencies>
 </project>
\ No newline at end of file
index 44379485ce960c1c134cd7bda11683b1fa9f7611..44f0410ab0c13d08c9b272686e6349596d7d783c 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -43,6 +44,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.osgi</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -55,7 +57,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
+                       <version>${project.version}</version>
                </dependency>
-
        </dependencies>
 </project>
\ No newline at end of file
index 9be399424c5dd87d749f66bc2b2f55b37699655d..250645068820ba1e40f9a239e5ba367d1f9fbbdc 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -34,6 +35,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
index e4992964cacc590d0c45525817b1bc79be3aceba..5d1705a1c71ee55e4ca7fd71c66c6033b5771cda 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -28,6 +29,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                        <scope>test</scope>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
index 4ce2961b2d73ecf65a0020744b14cc099532a993..2513d1192af80c5f3ca64da68c6101005aac0673 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
@@ -30,6 +31,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
@@ -50,7 +52,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.unit</artifactId>
                        <scope>test</scope>
+                       <version>${project.version}</version>
                </dependency>
-
        </dependencies>
 </project>
\ No newline at end of file
index 87cca0a13b0089d3ac378a6d4ff0cfe25b9f4f81..35fc706825044bc6a1d3176cf7654a8182ee57d6 100644 (file)
@@ -67,7 +67,9 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.specs</artifactId>
-               </dependency><!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
+                       <version>${project.version}</version>
+               </dependency>
+               <!-- <dependency> <groupId>org.argeo.dep.osgi</groupId> <artifactId>org.argeo.dep.osgi.maven.embedder</artifactId> 
                        </dependency> -->
                <dependency>
                        <groupId>org.springframework</groupId>
index e60a79dc41567abd169f11f92f55b97541ea17b0..ff34db74c79fa14491175ce29459c44c791d00e7 100644 (file)
@@ -32,6 +32,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
index cbeac8cf2c364fe3031cfe605018cd5a0c162892..158dc3aff535274e425ac806441500a09f9b137b 100644 (file)
@@ -42,6 +42,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <!-- SSH -->
index 2f537d0c73ac930bde44a3ccfc128851916ffef1..5123f883fad8e6b998faf48e6b2f2237b4ff1228 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <dependency>
index c02243c14fbd1919a9b6fa80df2cf35a36f39360..2c45f9707f141fbda0eac8a51b9e570735d50efb 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.core</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.simple</artifactId>
+                       <version>${project.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.junit</groupId>
@@ -82,6 +85,7 @@
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.launcher</artifactId>
+                       <version>${project.version}</version>
                </dependency>
 
                <!-- OXM -->
index 08fbc04979cc0e536a3c8b77132f8c0ea52df60b..7876f22349cf17ea66c5727e45401fe8782ce914 100644 (file)
@@ -1,4 +1,5 @@
-<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">
+<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>
                                                                <artifactItem>
                                                                        <groupId>org.argeo.ria</groupId>
                                                                        <artifactId>org.argeo.ria.core</artifactId>
+                                                                       <version>${version.argeo-ria}</version>
                                                                        <classifier>ria</classifier>
                                                                        <type>zip</type>
                                                                        <outputDirectory>src/argeo-ria-src</outputDirectory>
                                                                        <classifier>ria-security</classifier>
                                                                        <type>zip</type>
                                                                        <outputDirectory>src/argeo-ria-lib/security</outputDirectory>
-                                                               </artifactItem>                                                         
-                                                       </artifactItems>                                                        
+                                                               </artifactItem>
+                                                       </artifactItems>
                                                        <overWriteReleases>true</overWriteReleases>
                                                        <overWriteSnapshots>true</overWriteSnapshots>
                                                </configuration>
                                                                <descriptor>assembly/ria-slc-web.xml</descriptor>
                                                        </descriptors>
                                                </configuration>
-                                       </execution>                            
+                                       </execution>
                                        <execution>
                                                <id>assembly-ria-jcr</id>
                                                <phase>package</phase>
                                                                <descriptor>assembly/ria-jcr.xml</descriptor>
                                                        </descriptors>
                                                </configuration>
-                                       </execution>                            
+                                       </execution>
                                </executions>
                        </plugin>
                </plugins>
                                <version>${version.argeo-commons}</version>
                        </dependency>
                </dependencies>
-       </dependencyManagement> 
+       </dependencyManagement>
 </project>
\ No newline at end of file