Update SLC to latest commons version

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

diff --git a/demo/slc-client-rcp.product b/demo/slc-client-rcp.product
index 59c46c9d7700658a1b25fc009d2c238a841e6bab..21cfe1f5de2f3cef39a33cb8fd468b08275e4c0f 100644 (file)
--- a/demo/slc-client-rcp.product
+++ b/demo/slc-client-rcp.product
@@ -31,7 +31,6 @@
       <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"/>
@@ -79,7 +78,7 @@
       <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.derby" fragment=""/>
       <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"/>
@@ -111,7 +110,6 @@
       <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"/>
@@ -135,12 +133,9 @@
       <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"/>
@@ -150,35 +145,33 @@
       <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.eclipse.ui.jcr"/>
       <plugin id="org.argeo.eclipse.ui.rcp"/>
-      <plugin id="org.argeo.infra.core"/>
-      <plugin id="org.argeo.infra.security.services" fragment="true"/>
+      <plugin id="org.argeo.ext.jackrabbit.sybase" fragment="true"/>
       <plugin id="org.argeo.jcr.ui.explorer"/>
+      <plugin id="org.argeo.node.repo.jackrabbit"/>
+      <plugin id="org.argeo.node.repofactory.jackrabbit"/>
       <plugin id="org.argeo.security.activemq"/>
       <plugin id="org.argeo.security.core"/>
+      <plugin id="org.argeo.security.dao.jackrabbit"/>
+      <plugin id="org.argeo.security.dao.ldap"/>
       <plugin id="org.argeo.security.equinox"/>
       <plugin id="org.argeo.security.jackrabbit" fragment="true"/>
       <plugin id="org.argeo.security.ldap"/>
-      <plugin id="org.argeo.security.manager.ldap"/>
       <plugin id="org.argeo.security.services"/>
       <plugin id="org.argeo.security.ui"/>
-      <plugin id="org.argeo.security.ui.application"/>
+      <plugin id="org.argeo.security.ui.rcp"/>
       <plugin id="org.argeo.server.ads"/>
       <plugin id="org.argeo.server.ads.server"/>
       <plugin id="org.argeo.server.core"/>
-      <plugin id="org.argeo.server.ext.jackrabbit" fragment="true"/>
+      <plugin id="org.argeo.server.jackrabbit"/>
       <plugin id="org.argeo.server.jcr"/>
+      <plugin id="org.argeo.server.jcr.mvc"/>
       <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"/>
@@ -231,6 +224,7 @@
       <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"/>
@@ -257,10 +251,11 @@
    </plugins>
 
    <configurations>
+      <plugin id="org.argeo.node.repo.jackrabbit" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.node.repofactory.jackrabbit" autoStart="true" startLevel="0" />
+      <plugin id="org.argeo.security.dao.jackrabbit" autoStart="true" startLevel="0" />
       <plugin id="org.argeo.security.equinox" autoStart="true" startLevel="0" />
-      <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.server.ads.server" 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.core" autoStart="true" startLevel="0" />

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index f2128c68399d485e753b4c1c9b50a4b755d2e0c1..58d882c1f0663fa9f61035a8432d84ae3da11aef 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -84,12 +84,6 @@
                </dependency>
 
                <!-- Security -->
-               <dependency>
-                       <groupId>org.argeo.commons.security</groupId>
-                       <artifactId>org.argeo.security.dep.ldap</artifactId>
-                       <version>${version.argeo-commons}</version>
-                       <type>pom</type>
-               </dependency>
                <dependency>
                        <groupId>org.springframework.security</groupId>
                        <artifactId>org.springframework.security.taglibs</artifactId>
@@ -147,12 +141,6 @@
                </dependency>
 
                <!-- Jackrabbit -->
-               <dependency>
-                       <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>

diff --git a/eclipse/plugins/org.argeo.slc.ui.gis.rap/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.ui.gis.rap/META-INF/MANIFEST.MF
index fc831c4dfd6e37ed057b0059e52cfd423b6f175d..c36c178bee177dfe266638d387219a423dd460b0 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.gis.rap/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.ui.gis.rap/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rap
 Bundle-SymbolicName: org.argeo.slc.ui.gis.rap;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Vendor: Argeo
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ActivationPolicy: lazy

diff --git a/eclipse/plugins/org.argeo.slc.ui.gis.rcp/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.ui.gis.rcp/META-INF/MANIFEST.MF
index b01d0ddb773b4b411d1171abe71d2e61236eaf5b..accc84ea52e949ffa23ba47a1165b4b62334c51a 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ui.gis.rcp/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.ui.gis.rcp/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Rcp
 Bundle-SymbolicName: org.argeo.slc.ui.gis.rcp;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Vendor: Argeo
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.ui,

diff --git a/modules/gis/org.argeo.slc.gis.ext.dbcp/META-INF/MANIFEST.MF b/modules/gis/org.argeo.slc.gis.ext.dbcp/META-INF/MANIFEST.MF
index 06616ce49d092361711630a9ddbb80735ef239b4..9d6379aaa2f36f17a1cad440ff146509534eb293 100644 (file)
--- a/modules/gis/org.argeo.slc.gis.ext.dbcp/META-INF/MANIFEST.MF
+++ b/modules/gis/org.argeo.slc.gis.ext.dbcp/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Dbcp
 Bundle-SymbolicName: org.argeo.slc.gis.ext.dbcp
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Fragment-Host: com.springsource.org.apache.commons.dbcp
 Import-Package: org.postgresql

diff --git a/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF b/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF
index bec6866c3ae917bd99cc62b5e5d3da475a6a6b11..7c1b2ccc27090b19e80f88d2c422598ef3e065c5 100644 (file)
--- a/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF
+++ b/modules/gis/org.argeo.slc.gis.position.backend/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Ui
 Bundle-SymbolicName: org.argeo.slc.gis.position.backend
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Import-Package: org.apache.commons.dbcp,
  org.argeo.slc.core.deploy,
  org.argeo.slc.geotools,

diff --git a/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF b/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF
index 81274f30d88b1959a45bf2b2d7d20b128daba86f..a7e2f2ea004acc180877b9c53a2ae28abd5118c3 100644 (file)
--- a/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF
+++ b/modules/gis/org.argeo.slc.gis.position.gpsbabel/META-INF/MANIFEST.MF
@@ -2,6 +2,6 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: SLC GIS Position GpsBabel
 Bundle-SymbolicName: org.argeo.slc.gis.position.gpsbabel
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Import-Package: org.argeo.slc.gpsbabel,
  org.argeo.slc.jts

diff --git a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF
index 8d5dbf0e41b80fe711999cf53628869e44a512bf..9ad1c0a443c8a11d1dd5bc12a4da33ce63b75755 100644 (file)
--- a/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.jackrabbit.pgsql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Pgsql
 Bundle-SymbolicName: org.argeo.slc.server.jackrabbit.pgsql
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Bundle-Vendor: Argeo
 Import-Package: javax.jcr;version="[2.0.0,3.0.0)",
  org.argeo.jackrabbit,

diff --git a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
index 7d50f1286033bf0451757c37763d548371b26de0..cb1a3da59cc22ca47599ce4581c465380c3c118b 100644 (file)
--- a/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.server.repo/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Repo
 Bundle-SymbolicName: org.argeo.slc.server.repo
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 0.13.1.SNAPSHOT
 Import-Package: javax.jcr;version="2.0.0",
  org.argeo.jackrabbit,
  org.argeo.jcr,

diff --git a/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml b/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
index 0a353a9cea62a54650eca126fdbb023b4df94707..8912bd013181c99a947ac35783211fa7ebb11435 100644 (file)
--- a/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
+++ b/modules/server/org.argeo.slc.server.services/META-INF/spring/services-osgi.xml
@@ -40,6 +40,6 @@
        <list id="eventPublishers" interface="org.argeo.slc.msg.event.SlcEventPublisher"
                cardinality="0..N" />
 
-       <reference id="securityService" interface="org.argeo.security.ArgeoSecurityService" />
+       <reference id="systemExecutor" interface="org.argeo.security.SystemExecutionService" />
 
 </beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml b/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml
index 591e6a6d006f5d6e878046a56507495a60cb5cad..39f318f726d4037a6b6c6d5b899d05a995d2eddd 100644 (file)
--- a/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml
+++ b/modules/server/org.argeo.slc.server.services/META-INF/spring/services.xml
@@ -39,7 +39,7 @@
                <constructor-arg ref="slcAgentDescriptorDao" />
                <constructor-arg ref="agentFactory" />
                <property name="pingCycle" value="${slc.server.services.pingCycle}" />
-               <property name="securityService" ref="securityService" />
+               <property name="systemExecutor" ref="systemExecutor" />
        </bean>
 
        <bean id="slcExecutionService" class="org.argeo.slc.services.impl.SlcExecutionServiceImpl">

diff --git a/pom.xml b/pom.xml
index 27fdddde82a8da4b8ca6567c8ab66e20f85dc4f1..b759c993b405938efa374a9132ea40df08aaacbf 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
        <parent>
                <groupId>org.argeo.commons</groupId>
                <artifactId>argeo-commons</artifactId>
-               <version>0.2.3-SNAPSHOT</version>
+               <version>0.3.2-SNAPSHOT</version>
        </parent>
        <groupId>org.argeo.slc</groupId>
        <artifactId>argeo-slc</artifactId>

diff --git a/runtime/org.argeo.slc.core/pom.xml b/runtime/org.argeo.slc.core/pom.xml
index 5cb6294ef1ca292113f044ebc6ac021695fa2609..7284f7c6f81a2b1af713f586a2ca3b971226c606 100644 (file)
--- a/runtime/org.argeo.slc.core/pom.xml
+++ b/runtime/org.argeo.slc.core/pom.xml
@@ -69,7 +69,7 @@
                <dependency>
                        <groupId>org.argeo.commons.basic</groupId>
                        <artifactId>org.argeo.basic.dep.log4j</artifactId>
-                       <version>0.2.3-SNAPSHOT</version>
+                       <version>${version.argeo-commons}</version>
                        <type>pom</type>
                </dependency>
 

diff --git a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java
index 9a292c0de9306d3a4d159f6562956e81a00a94e9..60df72a9cf526ba33ced1d1cfcdeb4b879aac745 100644 (file)
--- a/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java
+++ b/runtime/org.argeo.slc.server/src/main/java/org/argeo/slc/services/impl/AgentServiceImpl.java
@@ -22,7 +22,6 @@ import java.util.concurrent.Executor;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.security.ArgeoSecurityService;
 import org.argeo.slc.dao.runtime.SlcAgentDescriptorDao;
 import org.argeo.slc.runtime.SlcAgent;
 import org.argeo.slc.runtime.SlcAgentDescriptor;
@@ -38,7 +37,7 @@ public class AgentServiceImpl implements AgentService, InitializingBean,
        private final SlcAgentDescriptorDao slcAgentDescriptorDao;
        private final SlcAgentFactory agentFactory;
 
-       private Executor securityService;
+       private Executor systemExecutor;
 
        private Long pingCycle = 20000l;
 
@@ -68,7 +67,7 @@ public class AgentServiceImpl implements AgentService, InitializingBean,
                if (pingCycle > 0) {
                        Thread authenticatedThread = new Thread("SLC Agents Ping") {
                                public void run() {
-                                       securityService.execute(new AgentsPing());
+                                       systemExecutor.execute(new AgentsPing());
                                }
                        };
                        authenticatedThread.start();
@@ -85,8 +84,8 @@ public class AgentServiceImpl implements AgentService, InitializingBean,
                this.pingCycle = pingCycle;
        }
 
-       public void setSecurityService(Executor securityService) {
-               this.securityService = securityService;
+       public void setSystemExecutor(Executor securityService) {
+               this.systemExecutor = securityService;
        }
 
        protected class AgentsPing implements Runnable {

diff --git a/runtime/org.argeo.slc.support.gis/pom.xml b/runtime/org.argeo.slc.support.gis/pom.xml
index 4af047f4aaf9cb988dc2a255b27f4656e8285cf2..cd80a2f2b578dcbfb1f487bd57a82cd40153f5c8 100644 (file)
--- a/runtime/org.argeo.slc.support.gis/pom.xml
+++ b/runtime/org.argeo.slc.support.gis/pom.xml
@@ -29,6 +29,13 @@
                                        </instructions>
                                </configuration>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <configuration>
+                                       <skipTests>true</skipTests>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
        <dependencies>

diff --git a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java
index cc2cbe9f162925b387307712630d03ce767f5f2a..fb4fbc68c8bf0f06a443514787eb2c31f30b2dae 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java
+++ b/runtime/org.argeo.slc.support.jcr/src/main/java/org/argeo/slc/jcr/dao/TreeTestResultNodeMapper.java
@@ -35,7 +35,7 @@ import javax.jcr.query.QueryManager;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.jcr.BeanNodeMapper;
+import org.argeo.jcr.spring.BeanNodeMapper;
 import org.argeo.slc.core.attachment.SimpleAttachment;
 import org.argeo.slc.core.structure.SimpleSElement;
 import org.argeo.slc.core.structure.tree.TreeSPath;

diff --git a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
index 3a3b1cdfc7d8428f6c3158d4fa16ce7001ece754..4f2d6ffea82178d448432a57afbad019b4c5b679 100644 (file)
--- a/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
+++ b/runtime/org.argeo.slc.support.jcr/src/test/resources/org/argeo/slc/jcr/dao/applicationContext.xml
@@ -1,21 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
-<!--\r
-\r
-    Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
-\r
-    Licensed under the Apache License, Version 2.0 (the "License");\r
-    you may not use this file except in compliance with the License.\r
-    You may obtain a copy of the License at\r
-\r
-            http://www.apache.org/licenses/LICENSE-2.0\r
-\r
-    Unless required by applicable law or agreed to in writing, software\r
-    distributed under the License is distributed on an "AS IS" BASIS,\r
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-    See the License for the specific language governing permissions and\r
-    limitations under the License.\r
-\r
--->\r
+<!-- Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org> Licensed under \r
+       the Apache License, Version 2.0 (the "License"); you may not use this file \r
+       except in compliance with the License. You may obtain a copy of the License \r
+       at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable \r
+       law or agreed to in writing, software distributed under the License is distributed \r
+       on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either \r
+       express or implied. See the License for the specific language governing permissions \r
+       and limitations under the License. -->\r
 \r
 <beans xmlns="http://www.springframework.org/schema/beans"\r
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
@@ -57,8 +48,7 @@
                <property name="nodeMapperProvider" ref="nodeMapperProvider" />\r
        </bean>\r
 \r
-       <bean id="nodeMapper" class="org.argeo.jcr.BeanNodeMapper">\r
-       </bean>\r
+       <bean id="nodeMapper" class="org.argeo.jcr.spring.BeanNodeMapper" />\r
 \r
        <bean id="treeTestResultNodeMapper" class="org.argeo.slc.jcr.dao.TreeTestResultNodeMapper">\r
        </bean>\r

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 0e7e185e3e018e9eea9d6c54217b4dda4634d972..70548195afaf3d103b0587a2285dc8ec4d5667a0 100644 (file)
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -50,10 +50,6 @@
           "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json",\r
           "uri"      : "${RIA_LIB_URI}/jcr"          \r
         },\r
-        {\r
-          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",\r
-          "uri"      : "${RIA_LIB_URI}/security"          \r
-        },\r
         {\r
           "manifest" : "${ROOT}/Manifest.json",\r
           "uri"                 : "."\r
@@ -215,10 +211,6 @@
           "manifest" : "${RIA_LIB_PATH}/jcr/Manifest.json",\r
           "uri"      : "${RIA_LIB_URI}/jcr"\r
         },\r
-        {\r
-          "manifest" : "${RIA_LIB_PATH}/security/Manifest.json",\r
-          "uri"      : "${RIA_LIB_URI}/security"\r
-        },\r
         {\r
           "manifest" : "${RIA_LIB_PATH}/slc/Manifest.json",\r
           "uri"      : "${RIA_LIB_URI}/slc"\r

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 54bfdc96660362a527f290418d13acc19b5be647..c8ca584a552b3e079b373e5ec3457241fee99b64 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -117,13 +117,6 @@
                                                                        <type>zip</type>
                                                                        <outputDirectory>src/argeo-ria-src</outputDirectory>
                                                                </artifactItem>
-                                                               <artifactItem>
-                                                                       <groupId>org.argeo.commons.security</groupId>
-                                                                       <artifactId>org.argeo.security.ria</artifactId>
-                                                                       <classifier>ria-security</classifier>
-                                                                       <type>zip</type>
-                                                                       <outputDirectory>src/argeo-ria-lib/security</outputDirectory>
-                                                               </artifactItem>
                                                        </artifactItems>
                                                        <overWriteReleases>true</overWriteReleases>
                                                        <overWriteSnapshots>true</overWriteSnapshots>
@@ -178,9 +171,9 @@
        <dependencyManagement>
                <dependencies>
                        <dependency>
-                               <groupId>org.argeo.commons.security</groupId>
-                               <artifactId>org.argeo.security.ria</artifactId>
-                               <version>${version.argeo-commons}</version>
+                               <groupId>org.argeo.ria</groupId>
+                               <artifactId>org.argeo.ria.core</artifactId>
+                               <version>${version.argeo-ria}</version>
                        </dependency>
                </dependencies>
        </dependencyManagement>