Simplify SLC and use Argeo Commons

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

diff --git a/demo/pom.xml b/demo/pom.xml
index 09984e50798555e00b3b97159c385542aad74ac1..7b1d15b40e5d27e2202983a821e0f2931875e8f3 100644 (file)
--- a/demo/pom.xml
+++ b/demo/pom.xml
@@ -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>
@@ -65,18 +66,16 @@
        </build>
        <dependencies>
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
 
                <!--
-                       Unit Tests -->
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.unit</artifactId>
-                       <scope>test</scope>
-               </dependency>
-
+                       Unit Tests <dependency> <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.unit</artifactId> <scope>test</scope>
+                       </dependency>
+               -->
 
        </dependencies>
 
@@ -91,17 +90,18 @@
                                                <configuration>
                                                        <execDir>target/exec/server</execDir>
                                                        <systemProperties>
-                                                               <slc.osgi.start>
+                                                               <argeo.osgi.start>
                                                                        org.springframework.osgi.extender,
+                                                                       org.argeo.server.ads.server,
                                                                        org.argeo.slc.server.hsqldb,
                                                                        org.argeo.slc.server.main,
                                                                        org.argeo.slc.ria
-                                                               </slc.osgi.start>
-                                                               <slc.osgi.bundles>
+                                                               </argeo.osgi.start>
+                                                               <argeo.osgi.bundles>
                                                                        ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/server;in=*;ex=pom.xml;ex=target;ex=.*,
                                                                        ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-                                                               </slc.osgi.bundles>
+                                                               </argeo.osgi.bundles>
                                                        </systemProperties>
                                                </configuration>
                                        </plugin>
@@ -117,6 +117,14 @@
                                        <groupId>org.argeo.slc.server</groupId>
                                        <artifactId>org.argeo.slc.ria</artifactId>
                                </dependency>
+
+                               <!-- Security -->
+                               <dependency>
+                                       <groupId>org.argeo.commons.security</groupId>
+                                       <artifactId>org.argeo.security.dep.ads</artifactId>
+                                       <version>${version.argeo-commons}</version>
+                                       <type>pom</type>
+                               </dependency>
                        </dependencies>
                </profile>
                <profile>
@@ -129,16 +137,16 @@
                                                <configuration>
                                                        <execDir>target/exec/agent</execDir>
                                                        <systemProperties>
-                                                               <slc.osgi.start>
+                                                               <argeo.osgi.start>
                                                                        org.springframework.osgi.extender,
                                                                        org.argeo.slc.support.equinox,
                                                                        org.argeo.slc.agent,
                                                                        org.argeo.slc.agent.jms
-                                                               </slc.osgi.start>
-                                                               <slc.osgi.bundles>
+                                                               </argeo.osgi.start>
+                                                               <argeo.osgi.bundles>
                                                                        ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-                                                               </slc.osgi.bundles>
+                                                               </argeo.osgi.bundles>
                                                        </systemProperties>
                                                </configuration>
                                        </plugin>
@@ -168,15 +176,15 @@
                                                        <execDir>target/exec/detached</execDir>
                                                        <fork>true</fork>
                                                        <systemProperties>
-                                                               <slc.osgi.start>
+                                                               <argeo.osgi.start>
                                                                        org.springframework.osgi.extender,
                                                                        org.argeo.slc.detached,
                                                                        org.argeo.slc.demo.det
-                                                               </slc.osgi.start>
-                                                               <slc.osgi.bundles>
+                                                               </argeo.osgi.start>
+                                                               <argeo.osgi.bundles>
                                                                        ${basedir}/site;in=org.argeo.slc.demo.det;ex=pom.xml;ex=target,
                                                                        ${basedir}/site;in=org.argeo.slc.demo.log4j;ex=pom.xml;ex=target,
-                                                               </slc.osgi.bundles>
+                                                               </argeo.osgi.bundles>
                                                                <javax.xml.parsers.DocumentBuilderFactory>org.apache.xerces.jaxp.DocumentBuilderFactoryImpl</javax.xml.parsers.DocumentBuilderFactory>
                                                        </systemProperties>
                                                </configuration>
@@ -210,15 +218,15 @@
                                                <configuration>
                                                        <execDir>target/exec/agent</execDir>
                                                        <systemProperties>
-                                                               <slc.osgi.start>
+                                                               <argeo.osgi.start>
                                                                        org.springframework.osgi.extender,
                                                                        org.argeo.slc.support.equinox,
                                                                        org.argeo.slc.agent
-                                                               </slc.osgi.start>
-                                                               <slc.osgi.bundles>
+                                                               </argeo.osgi.start>
+                                                               <argeo.osgi.bundles>
                                                                        ${basedir}/site;in=*;ex=pom.xml;ex=target,
                                                                        ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target
-                                                               </slc.osgi.bundles>
+                                                               </argeo.osgi.bundles>
                                                        </systemProperties>
                                                </configuration>
                                        </plugin>
@@ -253,7 +261,7 @@
                                                                -->
                                                        </jvmArgs>
                                                        <systemProperties>
-                                                               <slc.osgi.start>
+                                                               <argeo.osgi.start>
                                                                        org.argeo.dep.osgi.catalina.start,
                                                                        org.springframework.osgi.extender,
                                                                        org.springframework.osgi.web.extender,
@@ -265,7 +273,7 @@
                                                                        org.argeo.slc.server.jms,
                                                                        org.argeo.slc.webapp,
                                                                        org.argeo.slc.ria
-                                                               </slc.osgi.start>
+                                                               </argeo.osgi.start>
                                                        </systemProperties>
                                                </configuration>
                                        </plugin>

diff --git a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
index ea7250f938b51bff1f8d5c9cc1408c96057d3a66..1f06d0ef89333265070622739b51b7b464b5a97b 100644 (file)
--- a/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
+++ b/demo/site/org.argeo.slc.demo.agent/META-INF/spring/demo.xml
@@ -6,10 +6,10 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <bundle id="basic" symbolic-name="org.argeo.slc.demo.basic"
-               action="start" />
        <bundle id="minimal" symbolic-name="org.argeo.slc.demo.minimal"
                action="start" />
+       <bundle id="basic" symbolic-name="org.argeo.slc.demo.basic"
+               action="start" />
        <bundle id="ant" symbolic-name="org.argeo.slc.demo.ant" action="start" />
        <bundle id="detached" symbolic-name="org.argeo.slc.demo.detached"
                action="start" />

diff --git a/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
index 4d89a12ecc04b86330ae3b47eb3330872dd8a10d..976df054485d778e84c05873474a3bd7f964bc2f 100644 (file)
--- a/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
@@ -1,14 +1,28 @@
 Manifest-Version: 1.0
+Bundle-SymbolicName: org.argeo.slc.demo.detached
 Bundle-Version: 0.12.1.SNAPSHOT
 Bundle-Name: SLC Demo Detached (Test)
-Import-Package: net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.refl
- ect,org.aopalliance.aop,org.argeo.slc.core.attachment,org.argeo.slc.c
- ore.execution,org.argeo.slc.core.execution.tasks,org.argeo.slc.core.s
- tructure.tree,org.argeo.slc.core.test,org.argeo.slc.core.test.context
- ,org.argeo.slc.core.test.tree,org.argeo.slc.detached,org.argeo.slc.de
- tached.drivers,org.argeo.slc.execution,org.argeo.slc.lib.detached,org
- .argeo.slc.osgi,org.argeo.slc.structure,org.argeo.slc.test,org.spring
- framework.aop,org.springframework.aop.framework,org.springframework.a
- op.scope,org.springframework.beans.factory.config,org.springframework
- .core.io,org.springframework.oxm.castor
-Bundle-SymbolicName: org.argeo.slc.demo.detached
+Import-Package: net.sf.cglib.core,
+ net.sf.cglib.proxy,
+ net.sf.cglib.reflect,
+ org.aopalliance.aop,
+ org.argeo.slc.core.attachment,
+ org.argeo.slc.core.execution,
+ org.argeo.slc.core.execution.tasks,
+ org.argeo.slc.core.structure.tree,
+ org.argeo.slc.core.test,
+ org.argeo.slc.core.test.context,
+ org.argeo.slc.core.test.tree,
+ org.argeo.slc.detached,
+ org.argeo.slc.detached.drivers,
+ org.argeo.slc.execution,
+ org.argeo.slc.lib.detached,
+ org.argeo.slc.osgi,
+ org.argeo.slc.structure,
+ org.argeo.slc.test,
+ org.springframework.aop,
+ org.springframework.aop.framework,
+ org.springframework.aop.scope,
+ org.springframework.beans.factory.config,
+ org.springframework.core.io,
+ org.springframework.oxm.castor

diff --git a/dep/org.argeo.slc.dep.agent/pom.xml b/dep/org.argeo.slc.dep.agent/pom.xml
index 5e5d921423e93de0d0660895710b990247ea62d1..03d8a530beff45e6aae339918543e140d8f65106 100644 (file)
--- a/dep/org.argeo.slc.dep.agent/pom.xml
+++ b/dep/org.argeo.slc.dep.agent/pom.xml
@@ -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>
@@ -31,7 +32,7 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                </dependency>
-               
+
                <!-- Additional -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
@@ -41,5 +42,16 @@
                        <groupId>org.argeo.slc.runtime</groupId>
                        <artifactId>org.argeo.slc.lib.detached</artifactId>
                </dependency>
+
+               <!-- ASM -->
+               <dependency>
+                       <groupId>org.objectweb.asm</groupId>
+                       <artifactId>com.springsource.org.objectweb.asm</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.objectweb.asm</groupId>
+                       <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+               </dependency>
+
        </dependencies>
 </project>
\ No newline at end of file

diff --git a/dep/org.argeo.slc.dep.server/pom.xml b/dep/org.argeo.slc.dep.server/pom.xml
index bae727eb357fc49b35833a1cb469850d3b943c14..8f2ce3e4d17e004d206713a0bc8c518a0b95e17f 100644 (file)
--- a/dep/org.argeo.slc.dep.server/pom.xml
+++ b/dep/org.argeo.slc.dep.server/pom.xml
@@ -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>
@@ -45,6 +46,21 @@
                        <artifactId>org.argeo.slc.support.equinox</artifactId>
                </dependency>
 
+               <!-- Commons -->
+               <dependency>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.modules</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </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>
+
                <!-- OSGi integration -->
                <dependency>
                        <groupId>org.eclipse.osgi</groupId>
@@ -79,48 +95,12 @@
                        <artifactId>com.springsource.org.aopalliance</artifactId>
                </dependency>
 
-               <!-- JSP -->
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.servlet</groupId>
-                       <artifactId>com.springsource.javax.servlet.jsp.jstl</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.el</groupId>
-                       <artifactId>com.springsource.javax.el</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.el</groupId>
-                       <artifactId>com.springsource.org.apache.el</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.taglibs</groupId>
-                       <artifactId>com.springsource.org.apache.taglibs.standard</artifactId>
-               </dependency>
-
                <!-- Tomcat -->
                <dependency>
-                       <groupId>org.argeo.dep.osgi</groupId>
-                       <artifactId>org.argeo.dep.osgi.catalina.start</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.catalina</groupId>
-                       <artifactId>com.springsource.org.apache.catalina</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.apache.jasper</groupId>
-                       <artifactId>com.springsource.org.apache.jasper</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.ws</groupId>
-                       <artifactId>com.springsource.javax.xml.ws</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>javax.xml.bind</groupId>
-                       <artifactId>com.springsource.javax.xml.bind</artifactId>
+                       <groupId>org.argeo.commons.server</groupId>
+                       <artifactId>org.argeo.server.dep.tomcat</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
                </dependency>
 
                <!-- DB Drivers -->

diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml
index b3c209183d82242aa1c6add21180374fde18267d..883024cc01e2195060703de9c8818e784b74653f 100644 (file)
--- a/integration-tests/org.argeo.slc.it.webapp/pom.xml
+++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml
@@ -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>
@@ -20,19 +21,19 @@
                                                <arg>-clean</arg>
                                        </argsToAppend>
                                        <systemProperties>
-                                               <slc.osgi.bundles>
+                                               <argeo.osgi.bundles>
                                                        ${basedir}/../../demo/site;in=*;ex=target;ex=pom.xml,
                                                        ${basedir}/../../modules/server;in=*;ex=target;ex=pom.xml,
                                                        ${basedir}/../../modules/agent;in=*;ex=target;ex=pom.xml
-                                               </slc.osgi.bundles>
-                                               <slc.osgi.start>
+                                               </argeo.osgi.bundles>
+                                               <argeo.osgi.start>
                                                        org.springframework.osgi.extender,
                                                        org.argeo.slc.server.main,
                                                        org.argeo.slc.server.hsqldb,
                                                        org.argeo.slc.ria,
-                                                       org.argeo.slc.agent,                                                            
+                                                       org.argeo.slc.agent,
                                                        org.argeo.slc.agent.jms                                                 
-                                               </slc.osgi.start>
+                                               </argeo.osgi.start>
                                        </systemProperties>
                                </configuration>
                                <executions>
@@ -77,6 +78,12 @@
                </plugins>
        </build>
        <dependencies>
+               <dependency>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
+               </dependency>
+
                <dependency>
                        <groupId>org.argeo.slc.dep</groupId>
                        <artifactId>org.argeo.slc.dep.server</artifactId>
@@ -87,6 +94,15 @@
                        <artifactId>org.argeo.slc.dep.agent</artifactId>
                        <version>${project.version}</version>
                </dependency>
+
+               <!-- Security -->
+               <dependency>
+                       <groupId>org.argeo.commons.security</groupId>
+                       <artifactId>org.argeo.security.dep.ads</artifactId>
+                       <version>${version.argeo-commons}</version>
+                       <type>pom</type>
+               </dependency>
+
                <!-- RIA -->
                <dependency>
                        <groupId>org.argeo.slc.server</groupId>

diff --git a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
index 927a928a8e49b3c7f8d4507d07ebc60a8b858914..393d4dbe8d6bc40299a9fe5835594eeaeb85650b 100644 (file)
--- a/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
+++ b/modules/server/org.argeo.slc.server.main/META-INF/spring/main.xml
@@ -6,7 +6,14 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <bundle id="activemq.broker" symbolic-name="org.argeo.slc.server.activemq.broker"
+       <!-- Security -->
+       <bundle id="security.ldap" symbolic-name="org.argeo.security.manager.ldap"
+               action="start" />
+       <bundle id="security.services" symbolic-name="org.argeo.security.core"
+               action="start" />
+
+       <!-- SLC Middleware -->
+       <bundle id="activemq.broker" symbolic-name="org.argeo.server.activemq.broker"
                action="start" />
        <bundle id="castor" symbolic-name="org.argeo.slc.server.castor"
                action="start" />
@@ -21,10 +28,16 @@
        <bundle id="jms" symbolic-name="org.argeo.slc.server.jms"
                action="start" />
 
+       <!-- Web -->
        <bundle id="spring.osgi.web.extender" symbolic-name="org.springframework.osgi.web.extender"
                action="start" />
        <bundle id="catalina" symbolic-name="org.argeo.dep.osgi.catalina.start"
                action="start" />
-       <bundle id="webapp" symbolic-name="org.argeo.slc.webapp" action="start" />
+
+       <!--  Web app start order is important! Security should be first -->
+       <bundle id="security.webapp" symbolic-name="org.argeo.security.webapp"
+               action="start" />
+       <bundle id="slc.webapp" symbolic-name="org.argeo.slc.webapp"
+               action="start" />
 
 </beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
index e5bba0821b61bd6093d7310c4e7d84ee322b8268..3dbb0bfd803a5ddccb45e45db2ab141818408c96 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
+++ b/modules/server/org.argeo.slc.webapp.war/META-INF/MANIFEST.MF
@@ -4,23 +4,51 @@ Bundle-Version: 0.12.1.SNAPSHOT
 Bundle-Name: SLC Webapp
 Web-ContextPath: org.argeo.slc.webapp
 Bundle-SymbolicName: org.argeo.slc.webapp
-Import-Package: net.sf.cglib.core,net.sf.cglib.proxy,net.sf.cglib.refl
- ect,org.aopalliance.aop,org.argeo.slc.build,org.argeo.slc.core.attach
- ment,org.argeo.slc.core.test.tree,org.argeo.slc.dao.process,org.argeo
- .slc.dao.runtime,org.argeo.slc.dao.test,org.argeo.slc.dao.test.tree,o
- rg.argeo.slc.deploy,org.argeo.slc.msg.event,org.argeo.slc.runtime,org
- .argeo.slc.services,org.argeo.slc.web.mvc,org.argeo.slc.web.mvc.attac
- hment,org.argeo.slc.web.mvc.event,org.argeo.slc.web.mvc.execution,org
- .argeo.slc.web.mvc.management,org.argeo.slc.web.mvc.process,org.argeo
- .slc.web.mvc.provisioning,org.argeo.slc.web.mvc.result,org.argeo.slc.
- web.mvc.runtime,org.hibernate,org.hibernate.hql.ast,org.hibernate.jdb
- c,org.springframework.aop,org.springframework.aop.framework,org.sprin
- gframework.aop.scope,org.springframework.beans.factory.support,org.sp
- ringframework.orm.hibernate3.support,org.springframework.osgi.web.con
- text.support,org.springframework.oxm,org.springframework.security.con
- text,org.springframework.security.providers,org.springframework.secur
- ity.ui.webapp,org.springframework.security.userdetails.memory,org.spr
- ingframework.transaction,org.springframework.web.context,org.springfr
- amework.web.context.request,org.springframework.web.context.support,o
- rg.springframework.web.filter,org.springframework.web.servlet,org.spr
- ingframework.web.servlet.handler,org.springframework.web.servlet.mvc
+Import-Package: net.sf.cglib.core,
+ net.sf.cglib.proxy,
+ net.sf.cglib.reflect,
+ org.aopalliance.aop,
+ org.argeo.slc.build,
+ org.argeo.slc.core.attachment,
+ org.argeo.slc.core.test.tree,
+ org.argeo.slc.dao.process,
+ org.argeo.slc.dao.runtime,
+ org.argeo.slc.dao.test,
+ org.argeo.slc.dao.test.tree,
+ org.argeo.slc.deploy,
+ org.argeo.slc.msg.event,
+ org.argeo.slc.runtime,
+ org.argeo.slc.services,
+ org.argeo.slc.web.mvc,
+ org.argeo.slc.web.mvc.attachment,
+ org.argeo.slc.web.mvc.event,
+ org.argeo.slc.web.mvc.execution,
+ org.argeo.slc.web.mvc.management,
+ org.argeo.slc.web.mvc.process,
+ org.argeo.slc.web.mvc.provisioning,
+ org.argeo.slc.web.mvc.result,
+ org.argeo.slc.web.mvc.runtime,
+ org.hibernate,
+ org.hibernate.hql.ast,
+ org.hibernate.jdbc,
+ org.springframework.aop,
+ org.springframework.aop.framework,
+ org.springframework.aop.scope,
+ org.springframework.beans.factory.support,
+ org.springframework.orm.hibernate3.support,
+ org.springframework.osgi.web.context.support,
+ org.springframework.oxm,
+ org.springframework.security,
+ org.springframework.security.context,
+ org.springframework.security.providers,
+ org.springframework.security.ui,
+ org.springframework.security.ui.webapp,
+ org.springframework.security.userdetails.memory,
+ org.springframework.transaction,
+ org.springframework.web.context,
+ org.springframework.web.context.request,
+ org.springframework.web.context.support,
+ org.springframework.web.filter,
+ org.springframework.web.servlet,
+ org.springframework.web.servlet.handler,
+ org.springframework.web.servlet.mvc

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
index fcea0a17eb3f684fd205a4a2510c996ddf637856..4e2b8da55c16e10ccf4afbf818c6867a9181639d 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/applicationContext.xml
@@ -10,9 +10,8 @@
        <!--
                <import resource="classpath:/org/argeo/slc/server/spring/jmx.xml" />
        -->
-       <import resource="security.xml" />
-
        <import resource="osgi.xml" />
+       <import resource="security.xml" />
 
        <!-- Hibernate instrumentation-->
        <bean id="osivInterceptor"

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
index 79eba0f09ad499864cf812e901586dd2e569570c..d7dde2d34d92e1c5f044efd1a140004391667b4b 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/osgi.xml
@@ -26,11 +26,9 @@
                <reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
                id="modulesManager" />\r
        -->\r
-       <reference id="testManagerService"\r
-               interface="org.argeo.slc.services.TestManagerService" />\r
+       <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
        <reference id="agentService" interface="org.argeo.slc.services.AgentService" />\r
-       <reference id="slcExecutionService"\r
-               interface="org.argeo.slc.services.SlcExecutionService" />\r
+       <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
 \r
        <reference id="hibernateTransactionManager"\r
                interface="org.springframework.transaction.PlatformTransactionManager"\r
@@ -50,4 +48,10 @@
        <set id="modularDistributions" interface="org.argeo.slc.build.ModularDistribution"\r
                cardinality="0..N" />\r
 \r
+       <!-- Security -->\r
+       <!-- <reference id="authenticationEntryPoint"\r
+               interface="org.springframework.security.ui.AuthenticationEntryPoint" />-->\r
+       <reference id="_authenticationManager"\r
+               interface="org.springframework.security.AuthenticationManager" />\r
+\r
 </beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml b/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
index 35397ad70748a7e5e08702d3a40ac1b8085ed8b6..245cd09086c4880993e0c6b27f5be3e7e0664ddf 100644 (file)
--- a/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
+++ b/modules/server/org.argeo.slc.webapp.war/WEB-INF/security.xml
@@ -1,21 +1,21 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-       xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+       xmlns:security="http://www.springframework.org/schema/security"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="
+       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+       http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
 
-       <http realm="User Interface" >
-               <intercept-url pattern="/**" access="ROLE_USER,ROLE_ADMIN" />
-               <http-basic />
-               <anonymous />
-       </http>
+       <bean id="authenticationEntryPoint"
+               class="org.springframework.security.ui.webapp.AuthenticationProcessingFilterEntryPoint">
+               <property name="loginFormUrl"
+                       value="http://localhost/org.argeo.security.webapp/getCredentials.ria" />
+               <property name="forceHttps" value="false" />
+       </bean>
 
-       <authentication-provider>
-               <user-service>
-                       <user name="mbaudier" password="mbaudier" authorities="ROLE_USER,ROLE_ADMIN" />
-                       <user name="cdujeu" password="cdujeu" authorities="ROLE_USER" />
-                       <user name="test" password="test" authorities="ROLE_USER" />
-                       <user name="demo" password="demo" authorities="ROLE_USER" />
-               </user-service>
-       </authentication-provider>
-
-</beans:beans>
+       <security:http entry-point-ref="authenticationEntryPoint">
+               <security:intercept-url pattern="**"
+                       access="ROLE_USER,ROLE_ADMIN" />
+               <!-- <security:http-basic /> -->
+       </security:http>
+</beans>
\ No newline at end of file

diff --git a/pom.xml b/pom.xml
index 4816463ac0c371ef5b1f5f1159ba0ab568cc7998..d1f1693db5cb7e2a6b6df164988ef744a8ead695 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -23,9 +23,10 @@
        <properties>
                <developmentCycle>0.12</developmentCycle>
                <version.argeo-ria>0.12.2-SNAPSHOT</version.argeo-ria>
+               <version.argeo-commons>0.1.2-SNAPSHOT</version.argeo-commons>
                <version.equinox>3.4.2.R34x_v20080826-1230</version.equinox>
                <version.maven-bundle-plugin>2.0.0</version.maven-bundle-plugin>
-               <version.maven-argeo-osgi>0.1.21</version.maven-argeo-osgi>
+               <version.maven-argeo-osgi>0.1.22-SNAPSHOT</version.maven-argeo-osgi>
                <version.maven-argeo-qooxdoo>0.8.2.1</version.maven-argeo-qooxdoo>
                <site.repoBase>file:///var/argeo/projects/SLC/www/site</site.repoBase>
                <site.urlBase>http://www.argeo.org/projects/slc/site</site.urlBase>
@@ -316,10 +317,24 @@ limitations under the License.
                                <classifier>dist</classifier>
                        </dependency>
 
+                       <!-- Argeo Commons -->
+                       <dependency>
+                               <groupId>org.argeo.commons.security</groupId>
+                               <artifactId>org.argeo.security.dep.ads</artifactId>
+                               <version>${version.argeo-commons}</version>
+                               <type>pom</type>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.argeo.commons.osgi</groupId>
+                               <artifactId>org.argeo.osgi.boot</artifactId>
+                               <version>${version.argeo-commons}</version>
+                       </dependency>
+
+                       <!-- Third Parties -->
                        <dependency>
                                <groupId>org.argeo.dep</groupId>
                                <artifactId>versions</artifactId>
-                               <version>1.0.0</version>
+                               <version>1.0.1-SNAPSHOT</version>
                                <type>pom</type>
                                <scope>import</scope>
                        </dependency>

diff --git a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java
index 325d3602840ea6be94fa0cacc4200c55b3219dec..f2ed1451d72fb1c3767351c69488502c931b87fd 100644 (file)
--- a/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java
+++ b/runtime/org.argeo.slc.osgiboot/src/main/java/org/argeo/slc/osgiboot/OsgiBoot.java
@@ -54,6 +54,11 @@ public class OsgiBoot {
                                PROP_SLC_OSGIBOOT_DEFAULT_TIMEOUT, "10000"));
                modulesUrlSeparator = getProperty(
                                PROP_SLC_OSGIBOOT_MODULES_URL_SEPARATOR, ",");
+               
+               warn("############################################################################################################");
+               warn("########################## THIS COMPONENT IS DEPRECATED AND WILL BE REMOVED SOON  ##########################");
+               warn("########################## USE org.argeo.commons.osgi:org.argeo.osgi.boot INSTEAD ##########################");
+               warn("############################################################################################################");
        }
 
        public void bootstrap() {

diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index adec339df1f61222e333264c30d09e3c18df598c..6be67da3a31734a784d828fabc1ecb7e191c59da 100644 (file)
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -8,7 +8,7 @@
        </parent>
        <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.equinox</artifactId>
-       <name>SLC Support Equinox OSGi</name>
+       <name>SLC Support Equinox</name>
        <packaging>jar</packaging>
        <properties />
        <build>
@@ -54,6 +54,11 @@
                        <artifactId>org.argeo.slc.support.osgi</artifactId>
                </dependency>
 
+               <dependency>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
+               </dependency>
+
                <!-- Unit Tests -->
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>

diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml
index a34ce66ef1c3798c73968c7a10171f3eac4a6920..ee911bb9d2d6e692213248f2805a40bab1694ff2 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/pom.xml
+++ b/runtime/org.argeo.slc.support.osgi/pom.xml
@@ -43,7 +43,9 @@
                <dependency>
                        <groupId>org.eclipse.osgi</groupId>
                        <artifactId>org.eclipse.osgi</artifactId>
+                       <scope>provided</scope>
                </dependency>
+
                <dependency>
                        <groupId>org.springframework.osgi</groupId>
                        <artifactId>org.springframework.osgi.core</artifactId>
@@ -63,11 +65,6 @@
                        <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
                </dependency>
 
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
-               </dependency>
-
                <!--
                        Xalan and Xerces are implicitly required since the JDK provided
                        implementations are overridden in the execution modules manager

diff --git a/runtime/org.argeo.slc.unit/pom.xml b/runtime/org.argeo.slc.unit/pom.xml
index 70870b33f1c8be1027d8af515970b33d2c35b892..1d345c8eeb199b5f5161d3cbf29c49a8d9b06672 100644 (file)
--- a/runtime/org.argeo.slc.unit/pom.xml
+++ b/runtime/org.argeo.slc.unit/pom.xml
@@ -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>
@@ -91,8 +92,9 @@
 
                <!-- OSGi -->
                <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.osgiboot</artifactId>
+                       <groupId>org.argeo.commons.osgi</groupId>
+                       <artifactId>org.argeo.osgi.boot</artifactId>
+                       <version>${version.argeo-commons}</version>
                </dependency>
                <dependency>
                        <groupId>org.springframework.osgi</groupId>

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 442a7a621458c68c12288a1d7943ad77f8b489f2..9ed57eb0799e74fa1a880ee076c9b3e47793f4eb 100644 (file)
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -65,10 +65,11 @@
         "qx.version"     : "${QXVERSION}",\r
         "qx.theme"       : "${QXTHEME}",\r
         "qx.application" : "${APPLICATION}.Application",\r
+        "ria.splashScreen"                     : "org.argeo.security.ria/ArgeoLogo.png",\r
         "ria.auth.enableAuth"          : "true",\r
-        "ria.auth.credentialsURI"      : "/org.argeo.slc.webapp/getCredentials.ria",\r
-        "ria.auth.loginURI"                    : "/org.argeo.slc.webapp/authService.ria",\r
-        "ria.auth.logoutURI"           : "/org.argeo.slc.webapp/authService.ria?logout=true",\r
+        "ria.auth.credentialsURI"      : "/org.argeo.security.webapp/getCredentials.ria",\r
+        "ria.auth.loginURI"                    : "/org.argeo.security.webapp/login.ria",\r
+        "ria.auth.logoutURI"           : "/org.argeo.security.webapp/logout.ria",\r
         "ria.StartupPerspective":"org.argeo.slc.web.Perspective"               \r
       }\r
     },\r

diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml
index 6449ed2ad94227ec15966441c7461093161d0410..ae017078500b56b623bdfb181c507cbc5ed4164d 100644 (file)
--- a/server/org.argeo.slc.ria/pom.xml
+++ b/server/org.argeo.slc.ria/pom.xml
@@ -109,13 +109,7 @@
                                                        javax.servlet.jsp.jstl.core,
                                                        javax.servlet.jsp.jstl.fmt,
                                                        javax.servlet.jsp.jstl.tlv,
-                                                       javax.servlet.resources,
-                                                       org.springframework.security.ui.webapp,
-                                                       org.springframework.security.userdetails.memory,
-                                                       org.springframework.web.context,
-                                                       org.springframework.osgi.web.context.support,
-                                                       org.springframework.web.filter,
-                                                       org.springframework.security.context
+                                                       javax.servlet.resources
                                                </Import-Package>
                                                <Web-ContextPath>org.argeo.slc.ria</Web-ContextPath>
                                        </instructions>

diff --git a/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml b/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml
deleted file mode 100644 (file)
index 415bdc3..0000000
--- a/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:aop="http://www.springframework.org/schema/aop"
-       xmlns:tx="http://www.springframework.org/schema/tx"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">
-
-       <import resource="security.xml" />
-
-</beans>
\ No newline at end of file

diff --git a/server/org.argeo.slc.ria/src/WEB-INF/security.xml b/server/org.argeo.slc.ria/src/WEB-INF/security.xml
deleted file mode 100644 (file)
index ef1e618..0000000
--- a/server/org.argeo.slc.ria/src/WEB-INF/security.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<beans:beans xmlns="http://www.springframework.org/schema/security"
-       xmlns:beans="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-              http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-2.0.4.xsd">
-
-       <http realm="User Interface">
-               <intercept-url pattern="/**" access="ROLE_USER" />
-               <http-basic />
-       </http>
-
-       <authentication-provider>
-               <user-service>
-                       <user name="mbaudier" password="mbaudier" authorities="ROLE_USER,ROLE_ADMIN" />
-                       <user name="cdujeu" password="cdujeu" authorities="ROLE_USER" />
-                       <user name="test" password="test" authorities="ROLE_USER" />
-                       <user name="demo" password="demo" authorities="ROLE_USER" />
-               </user-service>
-       </authentication-provider>
-
-</beans:beans>

diff --git a/server/org.argeo.slc.ria/src/WEB-INF/web.xml b/server/org.argeo.slc.ria/src/WEB-INF/web.xml
index dc1ae6e70030db59fb916a9b045355fc3328754e..f46cd1782efed735ac3011737860ff46e7476e31 100644 (file)
--- a/server/org.argeo.slc.ria/src/WEB-INF/web.xml
+++ b/server/org.argeo.slc.ria/src/WEB-INF/web.xml
@@ -4,32 +4,4 @@
        version="2.5">
 
        <display-name>SLC Web UI</display-name>
-
-       <!-- General -->
-       <context-param>
-               <param-name>contextConfigLocation</param-name>
-               <param-value>/WEB-INF/applicationContext.xml</param-value>
-       </context-param>
-
-       <listener>
-               <display-name>Spring Context</display-name>
-               <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-       </listener>
-       <context-param>
-               <param-name>contextClass</param-name>
-               <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-       </context-param>
-
-       <!--  Security -->
-       <filter>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
-       </filter>
-
-       <filter-mapping>
-               <filter-name>springSecurityFilterChain</filter-name>
-               <url-pattern>/*</url-pattern>
-       </filter-mapping>
-
-
 </web-app>