Java 1.5 not supported anymore

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

diff --git a/basic/runtime/org.argeo.basic.nodeps/.classpath b/basic/runtime/org.argeo.basic.nodeps/.classpath
index f0a6d79aa9111244d25f94657aa71a463bae2977..8499fd0fa0631d7bd1350bfe2f9602724da87602 100644 (file)
--- a/basic/runtime/org.argeo.basic.nodeps/.classpath
+++ b/basic/runtime/org.argeo.basic.nodeps/.classpath
@@ -3,7 +3,7 @@
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" path="src/test/java"/>
        <classpathentry kind="src" path="src/test/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/basic/runtime/org.argeo.support.junit/.classpath b/basic/runtime/org.argeo.support.junit/.classpath
index b9f9fd2f3f1ac55e10fc3b14a79bc5c0142a9200..3bf3adef58f92318093cb5e45f6456a0ac2f7079 100644 (file)
--- a/basic/runtime/org.argeo.support.junit/.classpath
+++ b/basic/runtime/org.argeo.support.junit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/demo/plugins/org.argeo.demo.i18n.rap/.classpath b/demo/plugins/org.argeo.demo.i18n.rap/.classpath
index d255d98ff6c256eca343f10edc45aa056a2978a2..f01837b068d30039e6c2fb79965752f914e1a88e 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n.rap/.classpath
+++ b/demo/plugins/org.argeo.demo.i18n.rap/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="con"
-               path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
+               path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/>
        <classpathentry kind="con"
                path="org.eclipse.pde.core.requiredPlugins" />
        <classpathentry kind="src" path="src/main/java" />

diff --git a/demo/plugins/org.argeo.demo.i18n.rcp/.classpath b/demo/plugins/org.argeo.demo.i18n.rcp/.classpath
index d255d98ff6c256eca343f10edc45aa056a2978a2..f01837b068d30039e6c2fb79965752f914e1a88e 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n.rcp/.classpath
+++ b/demo/plugins/org.argeo.demo.i18n.rcp/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="con"
-               path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5" />
+               path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6/>
        <classpathentry kind="con"
                path="org.eclipse.pde.core.requiredPlugins" />
        <classpathentry kind="src" path="src/main/java" />

diff --git a/demo/plugins/org.argeo.demo.i18n/.classpath b/demo/plugins/org.argeo.demo.i18n/.classpath
index d3d5c80958677f1f8de5b580c289b3baf7c5452c..cf1efe7e46727bd61a3accee974d6252f4e0b0fb 100644 (file)
--- a/demo/plugins/org.argeo.demo.i18n/.classpath
+++ b/demo/plugins/org.argeo.demo.i18n/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.jcr/.classpath b/eclipse/runtime/org.argeo.eclipse.ui.jcr/.classpath
index d3d5c80958677f1f8de5b580c289b3baf7c5452c..cf1efe7e46727bd61a3accee974d6252f4e0b0fb 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui.jcr/.classpath
+++ b/eclipse/runtime/org.argeo.eclipse.ui.jcr/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>

diff --git a/eclipse/runtime/org.argeo.eclipse.ui/.classpath b/eclipse/runtime/org.argeo.eclipse.ui/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..a5074344255567d7964250243a1e26d82e953a07 100644 (file)
--- a/eclipse/runtime/org.argeo.eclipse.ui/.classpath
+++ b/eclipse/runtime/org.argeo.eclipse.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/osgi/dep/pom.xml b/osgi/dep/pom.xml
index cbac3ef747e25c640f6e36926832578e2d9ef7f6..1e293fe9eee3bfd9027d31b3b39338b1943abbda 100644 (file)
--- a/osgi/dep/pom.xml
+++ b/osgi/dep/pom.xml
@@ -20,7 +20,6 @@
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
                                <executions>
                                        <execution>
                                                <id>check-osgi</id>

diff --git a/osgi/plugins/org.argeo.osgi.ui.explorer/.classpath b/osgi/plugins/org.argeo.osgi.ui.explorer/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..c5931a083cd4ad1714f5a9bdc3ea1b2fc05cd360 100644 (file)
--- a/osgi/plugins/org.argeo.osgi.ui.explorer/.classpath
+++ b/osgi/plugins/org.argeo.osgi.ui.explorer/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/pom.xml b/pom.xml
index d1d922b3dfb87ccac980d6d36825536bc6f00da4..aa4bbc607ea8341bd01224119b55b7a5a7bb0d7f 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -16,10 +16,6 @@
                <developmentCycle>0.3</developmentCycle>
                <version.argeo-distribution>1.1.7</version.argeo-distribution>
                <version.argeo-commons>0.3.4-SNAPSHOT</version.argeo-commons>
-               <version.equinox>3.6.2</version.equinox>
-               <!-- maven -->
-               <version.maven-argeo-osgi>1.0.33</version.maven-argeo-osgi>
-               <version.maven-argeo-qooxdoo>1.1.1</version.maven-argeo-qooxdoo>
                <!-- distribution -->
                <site.repoBase>file:///srv/projects/www/commons/site</site.repoBase>
                <site.urlBase>http://projects.argeo.org/commons/site</site.urlBase>
@@ -93,13 +89,11 @@ limitations under the License.
                </developer>
        </developers>
        <build>
-               <!-- NOTE: This is just a vision for the future, it's not yet implemented: 
-                       see MNG-2216 <sourceEncoding>UTF-8</sourceEncoding> -->
                <extensions>
                        <extension>
                                <groupId>org.apache.maven.wagon</groupId>
-                               <artifactId>wagon-webdav</artifactId>
-                               <version>1.0-beta-2</version>
+                               <artifactId>wagon-webdav-jackrabbit</artifactId>
+                               <version>2.2</version>
                        </extension>
                </extensions>
                <pluginManagement>
@@ -109,8 +103,8 @@ limitations under the License.
                                        <artifactId>maven-compiler-plugin</artifactId>
                                        <version>2.3.2</version>
                                        <configuration>
-                                               <source>1.5</source>
-                                               <target>1.5</target>
+                                               <source>1.6</source>
+                                               <target>1.6</target>
                                        </configuration>
                                </plugin>
                                <plugin>
@@ -170,7 +164,7 @@ limitations under the License.
                                                <instructions>
                                                        <Bundle-Version>${project.version}-r${timestamp}</Bundle-Version>
                                                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
-                                                       <Bundle-RequiredExecutionEnvironment>J2SE-1.5</Bundle-RequiredExecutionEnvironment>
+                                                       <Bundle-RequiredExecutionEnvironment>JavaSE-1.6</Bundle-RequiredExecutionEnvironment>
                                                </instructions>
                                        </configuration>
                                        <executions>
@@ -212,7 +206,7 @@ limitations under the License.
                                <plugin>
                                        <groupId>org.argeo.maven.plugins</groupId>
                                        <artifactId>maven-argeo-osgi-plugin</artifactId>
-                                       <version>${version.maven-argeo-osgi}</version>
+                                       <version>1.0.33</version>
                                </plugin>
                                <!-- Others -->
                                <plugin>
@@ -239,18 +233,6 @@ limitations under the License.
                                        <doUpdate>false</doUpdate>
                                        <timestampFormat>yyMMdd_HHmm</timestampFormat>
                                </configuration>
-                               <!-- <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>
@@ -298,6 +280,9 @@ limitations under the License.
                                </configuration>
                        </plugin>
                </plugins>
+               <!-- NOTE: This is just a vision for the future, it's not yet implemented: 
+                       see MNG-2216 -->
+               <!-- <sourceEncoding>UTF-8</sourceEncoding> -->
        </build>
        <dependencyManagement>
                <dependencies>

diff --git a/security/plugins/org.argeo.security.equinox/.classpath b/security/plugins/org.argeo.security.equinox/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..5641c7ca39f6826ec4ff5af926bfd34f528f3684 100644 (file)
--- a/security/plugins/org.argeo.security.equinox/.classpath
+++ b/security/plugins/org.argeo.security.equinox/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/plugins/org.argeo.security.ui.admin/.classpath b/security/plugins/org.argeo.security.ui.admin/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..5641c7ca39f6826ec4ff5af926bfd34f528f3684 100644 (file)
--- a/security/plugins/org.argeo.security.ui.admin/.classpath
+++ b/security/plugins/org.argeo.security.ui.admin/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/plugins/org.argeo.security.ui.rap/.classpath b/security/plugins/org.argeo.security.ui.rap/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..5641c7ca39f6826ec4ff5af926bfd34f528f3684 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rap/.classpath
+++ b/security/plugins/org.argeo.security.ui.rap/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/plugins/org.argeo.security.ui.rcp/.classpath b/security/plugins/org.argeo.security.ui.rcp/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..8cf7f48a042a0cc96dfada5bf36efafd90b7b9e4 100644 (file)
--- a/security/plugins/org.argeo.security.ui.rcp/.classpath
+++ b/security/plugins/org.argeo.security.ui.rcp/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/security/plugins/org.argeo.security.ui/.classpath b/security/plugins/org.argeo.security.ui/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..5641c7ca39f6826ec4ff5af926bfd34f528f3684 100644 (file)
--- a/security/plugins/org.argeo.security.ui/.classpath
+++ b/security/plugins/org.argeo.security.ui/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.activemq/.classpath b/security/runtime/org.argeo.security.activemq/.classpath
index 0a607ba1718eb2af79f9423643e3e347427d3a3f..c0bbc0a2f9f968d1800f9391b54e3bb6edd91ec0 100644 (file)
--- a/security/runtime/org.argeo.security.activemq/.classpath
+++ b/security/runtime/org.argeo.security.activemq/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.core/.classpath b/security/runtime/org.argeo.security.core/.classpath
index 3e6ecf767d5519108c40bc9c9ea27c164872ca49..b639b537ce71a6eb713cbcf7b5a6df2c86d477e2 100644 (file)
--- a/security/runtime/org.argeo.security.core/.classpath
+++ b/security/runtime/org.argeo.security.core/.classpath
@@ -4,7 +4,7 @@
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.jackrabbit/.classpath b/security/runtime/org.argeo.security.jackrabbit/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..5641c7ca39f6826ec4ff5af926bfd34f528f3684 100644 (file)
--- a/security/runtime/org.argeo.security.jackrabbit/.classpath
+++ b/security/runtime/org.argeo.security.jackrabbit/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.ldap/.classpath b/security/runtime/org.argeo.security.ldap/.classpath
index 8b978d9ede4d96fb47cbd858fc3b6607968c677f..5641c7ca39f6826ec4ff5af926bfd34f528f3684 100644 (file)
--- a/security/runtime/org.argeo.security.ldap/.classpath
+++ b/security/runtime/org.argeo.security.ldap/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/security/runtime/org.argeo.security.mvc/.classpath b/security/runtime/org.argeo.security.mvc/.classpath
index fc460145a4b82500722cb922fc76d370cbfc9f2e..ff41fbb4dd356738ea37e8d854b1d4a17585bd63 100644 (file)
--- a/security/runtime/org.argeo.security.mvc/.classpath
+++ b/security/runtime/org.argeo.security.mvc/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/server/dep/pom.xml b/server/dep/pom.xml
index d53f2c39865baa1080ba2936a260a68f6ebbd66b..4e08a6e1229eeba66dd2b30289d8e23299e04ec1 100644 (file)
--- a/server/dep/pom.xml
+++ b/server/dep/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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.commons</groupId>
@@ -24,7 +25,6 @@
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
                                <executions>
                                        <execution>
                                                <id>check-osgi</id>

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/.classpath b/server/plugins/org.argeo.jcr.ui.explorer/.classpath
index 0a607ba1718eb2af79f9423643e3e347427d3a3f..527d8ababf28abecdf0dfe86d86b977d6b54d39c 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/.classpath
+++ b/server/plugins/org.argeo.jcr.ui.explorer/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="src" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java
index 085087201e5d8921e3c01df10203446cf17b27c6..4790649d259b12deee180356e478f458cf37fe4b 100644 (file)
--- a/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java
+++ b/server/plugins/org.argeo.jcr.ui.explorer/src/main/java/org/argeo/jcr/ui/explorer/browser/NodeContentProvider.java
@@ -49,6 +49,9 @@ public class NodeContentProvider implements ITreeContentProvider {
        }
 
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
+               if (newInput == null)// dispose
+                       return;
+
                if (userSession != null) {
                        Node userHome = JcrUtils.getUserHome(userSession);
                        if (userHome != null) {

diff --git a/server/runtime/org.argeo.server.ads/.classpath b/server/runtime/org.argeo.server.ads/.classpath
index fc460145a4b82500722cb922fc76d370cbfc9f2e..ff41fbb4dd356738ea37e8d854b1d4a17585bd63 100644 (file)
--- a/server/runtime/org.argeo.server.ads/.classpath
+++ b/server/runtime/org.argeo.server.ads/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.core/.classpath b/server/runtime/org.argeo.server.core/.classpath
index b9f9fd2f3f1ac55e10fc3b14a79bc5c0142a9200..3bf3adef58f92318093cb5e45f6456a0ac2f7079 100644 (file)
--- a/server/runtime/org.argeo.server.core/.classpath
+++ b/server/runtime/org.argeo.server.core/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.hibernate/.classpath b/server/runtime/org.argeo.server.hibernate/.classpath
index fc460145a4b82500722cb922fc76d370cbfc9f2e..ff41fbb4dd356738ea37e8d854b1d4a17585bd63 100644 (file)
--- a/server/runtime/org.argeo.server.hibernate/.classpath
+++ b/server/runtime/org.argeo.server.hibernate/.classpath
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.jackrabbit/.classpath b/server/runtime/org.argeo.server.jackrabbit/.classpath
index 73ba12c2eada5b5a04bc37083084a28b61fb6272..e9c521af644948148fc8c8c94be83b38531935b9 100644 (file)
--- a/server/runtime/org.argeo.server.jackrabbit/.classpath
+++ b/server/runtime/org.argeo.server.jackrabbit/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.jcr.mvc/.classpath b/server/runtime/org.argeo.server.jcr.mvc/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..c5931a083cd4ad1714f5a9bdc3ea1b2fc05cd360 100644 (file)
--- a/server/runtime/org.argeo.server.jcr.mvc/.classpath
+++ b/server/runtime/org.argeo.server.jcr.mvc/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/server/runtime/org.argeo.server.jcr/.classpath b/server/runtime/org.argeo.server.jcr/.classpath
index 762e65304a45132d5d1e220c1529aa25d8e5da91..d40e15cbf748a365d7ef303a34eceb3fce215f2e 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/.classpath
+++ b/server/runtime/org.argeo.server.jcr/.classpath
@@ -4,7 +4,7 @@
        <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>>>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="target/classes"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.jcr/pom.xml b/server/runtime/org.argeo.server.jcr/pom.xml
index 6e42303644e2822ac8f9764dd474792cd1643061..f91d673be0f2fc28283a20fa523adf2f98e4a999 100644 (file)
--- a/server/runtime/org.argeo.server.jcr/pom.xml
+++ b/server/runtime/org.argeo.server.jcr/pom.xml
@@ -42,7 +42,6 @@
                        <plugin>
                                <groupId>org.argeo.maven.plugins</groupId>
                                <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <version>${version.maven-argeo-osgi}</version>
                                <configuration>
                                        <useDependencies>true</useDependencies>
                                        <onlyCheck>true</onlyCheck>

diff --git a/server/runtime/org.argeo.server.json/.classpath b/server/runtime/org.argeo.server.json/.classpath
index 412536dbdaa8d2de2388f05cffea98ad05c576eb..607f05846700968379f6cdf925b7d3df5c196c9a 100644 (file)
--- a/server/runtime/org.argeo.server.json/.classpath
+++ b/server/runtime/org.argeo.server.json/.classpath
@@ -2,7 +2,7 @@
 <classpath>
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.jxl/.classpath b/server/runtime/org.argeo.server.jxl/.classpath
index f53d405d86395453458a208ae26206c9cc5e0259..ab16ae263cd3fdd7e5e2565800250b35a19169cf 100644 (file)
--- a/server/runtime/org.argeo.server.jxl/.classpath
+++ b/server/runtime/org.argeo.server.jxl/.classpath
@@ -3,7 +3,7 @@
        <classpathentry kind="src" output="target/classes" path="src/main/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
        <classpathentry kind="src" output="target/test-classes" path="src/test/resources"/>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="output" path="bin"/>
 </classpath>

diff --git a/server/runtime/org.argeo.server.modeshape/.classpath b/server/runtime/org.argeo.server.modeshape/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..8cf7f48a042a0cc96dfada5bf36efafd90b7b9e4 100644 (file)
--- a/server/runtime/org.argeo.server.modeshape/.classpath
+++ b/server/runtime/org.argeo.server.modeshape/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/server/runtime/org.argeo.server.webextender/.classpath b/server/runtime/org.argeo.server.webextender/.classpath
index 92f19d2ff95b83a87f5210157582c70bb070ed48..8cf7f48a042a0cc96dfada5bf36efafd90b7b9e4 100644 (file)
--- a/server/runtime/org.argeo.server.webextender/.classpath
+++ b/server/runtime/org.argeo.server.webextender/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
        <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
        <classpathentry kind="src" path="src/main/java"/>
        <classpathentry kind="output" path="target/classes"/>