From ef9526b977a7cd42bafa433ec6739ec09f0f2a7d Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 20 Nov 2009 19:17:18 +0000 Subject: [PATCH 1/1] Simplify SLC and use Argeo Commons git-svn-id: https://svn.argeo.org/slc/trunk@3136 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/pom.xml | 64 +++++++++-------- .../META-INF/spring/demo.xml | 4 +- .../META-INF/MANIFEST.MF | 36 +++++++--- dep/org.argeo.slc.dep.agent/pom.xml | 16 ++++- dep/org.argeo.slc.dep.server/pom.xml | 62 ++++++----------- .../org.argeo.slc.it.webapp/pom.xml | 28 ++++++-- .../META-INF/spring/main.xml | 17 ++++- .../META-INF/MANIFEST.MF | 68 +++++++++++++------ .../WEB-INF/applicationContext.xml | 3 +- .../org.argeo.slc.webapp.war/WEB-INF/osgi.xml | 12 ++-- .../WEB-INF/security.xml | 38 +++++------ pom.xml | 19 +++++- .../java/org/argeo/slc/osgiboot/OsgiBoot.java | 5 ++ runtime/org.argeo.slc.support.equinox/pom.xml | 7 +- runtime/org.argeo.slc.support.osgi/pom.xml | 7 +- runtime/org.argeo.slc.unit/pom.xml | 8 ++- server/org.argeo.slc.ria/config.json | 7 +- server/org.argeo.slc.ria/pom.xml | 8 +-- .../src/WEB-INF/applicationContext.xml | 12 ---- .../src/WEB-INF/security.xml | 20 ------ server/org.argeo.slc.ria/src/WEB-INF/web.xml | 28 -------- 21 files changed, 251 insertions(+), 218 deletions(-) delete mode 100644 server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml delete mode 100644 server/org.argeo.slc.ria/src/WEB-INF/security.xml diff --git a/demo/pom.xml b/demo/pom.xml index 09984e507..7b1d15b40 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -65,18 +66,16 @@ - org.argeo.slc.runtime - org.argeo.slc.osgiboot + org.argeo.commons.osgi + org.argeo.osgi.boot + ${version.argeo-commons} - - org.argeo.slc.runtime - org.argeo.slc.unit - test - - + Unit Tests org.argeo.slc.runtime + org.argeo.slc.unit test + + --> @@ -91,17 +90,18 @@ target/exec/server - + org.springframework.osgi.extender, + org.argeo.server.ads.server, org.argeo.slc.server.hsqldb, org.argeo.slc.server.main, org.argeo.slc.ria - - + + ${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 - + @@ -117,6 +117,14 @@ org.argeo.slc.server org.argeo.slc.ria + + + + org.argeo.commons.security + org.argeo.security.dep.ads + ${version.argeo-commons} + pom + @@ -129,16 +137,16 @@ target/exec/agent - + org.springframework.osgi.extender, org.argeo.slc.support.equinox, org.argeo.slc.agent, org.argeo.slc.agent.jms - - + + ${basedir}/site;in=*;ex=pom.xml;ex=target, ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target - + @@ -168,15 +176,15 @@ target/exec/detached true - + org.springframework.osgi.extender, org.argeo.slc.detached, org.argeo.slc.demo.det - - + + ${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, - + org.apache.xerces.jaxp.DocumentBuilderFactoryImpl @@ -210,15 +218,15 @@ target/exec/agent - + org.springframework.osgi.extender, org.argeo.slc.support.equinox, org.argeo.slc.agent - - + + ${basedir}/site;in=*;ex=pom.xml;ex=target, ${basedir}/../modules/agent;in=*;ex=pom.xml;ex=target - + @@ -253,7 +261,7 @@ --> - + 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 - + 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 ea7250f93..1f06d0ef8 100644 --- 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"> - + 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 4d89a12ec..976df0544 100644 --- 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 5e5d92142..03d8a530b 100644 --- a/dep/org.argeo.slc.dep.agent/pom.xml +++ b/dep/org.argeo.slc.dep.agent/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -31,7 +32,7 @@ org.argeo.slc.runtime org.argeo.slc.support.castor - + org.argeo.slc.runtime @@ -41,5 +42,16 @@ org.argeo.slc.runtime org.argeo.slc.lib.detached + + + + org.objectweb.asm + com.springsource.org.objectweb.asm + + + org.objectweb.asm + com.springsource.org.objectweb.asm.attrs + + \ 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 bae727eb3..8f2ce3e4d 100644 --- a/dep/org.argeo.slc.dep.server/pom.xml +++ b/dep/org.argeo.slc.dep.server/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -45,6 +46,21 @@ org.argeo.slc.support.equinox + + + org.argeo.commons.server + org.argeo.server.modules + ${version.argeo-commons} + pom + + + + org.argeo.commons.security + org.argeo.security.dep.ldap + ${version.argeo-commons} + pom + + org.eclipse.osgi @@ -79,48 +95,12 @@ com.springsource.org.aopalliance - - - javax.servlet - com.springsource.javax.servlet.jsp - - - javax.servlet - com.springsource.javax.servlet.jsp.jstl - - - javax.el - com.springsource.javax.el - - - org.apache.el - com.springsource.org.apache.el - - - org.apache.taglibs - com.springsource.org.apache.taglibs.standard - - - org.argeo.dep.osgi - org.argeo.dep.osgi.catalina.start - - - org.apache.catalina - com.springsource.org.apache.catalina - - - org.apache.jasper - com.springsource.org.apache.jasper - - - javax.xml.ws - com.springsource.javax.xml.ws - - - javax.xml.bind - com.springsource.javax.xml.bind + org.argeo.commons.server + org.argeo.server.dep.tomcat + ${version.argeo-commons} + pom diff --git a/integration-tests/org.argeo.slc.it.webapp/pom.xml b/integration-tests/org.argeo.slc.it.webapp/pom.xml index b3c209183..883024cc0 100644 --- a/integration-tests/org.argeo.slc.it.webapp/pom.xml +++ b/integration-tests/org.argeo.slc.it.webapp/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -20,19 +21,19 @@ -clean - + ${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 - - + + 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 - + @@ -77,6 +78,12 @@ + + org.argeo.commons.osgi + org.argeo.osgi.boot + ${version.argeo-commons} + + org.argeo.slc.dep org.argeo.slc.dep.server @@ -87,6 +94,15 @@ org.argeo.slc.dep.agent ${project.version} + + + + org.argeo.commons.security + org.argeo.security.dep.ads + ${version.argeo-commons} + pom + + org.argeo.slc.server 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 927a928a8..393d4dbe8 100644 --- 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"> - + + + + + @@ -21,10 +28,16 @@ + - + + + + \ 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 e5bba0821..3dbb0bfd8 100644 --- 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 fcea0a17e..4e2b8da55 100644 --- 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 @@ - - + --> - + - + + + + + \ 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 35397ad70..245cd0908 100644 --- 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 @@ - + + - - - - - + + + + - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 4816463ac..d1f1693db 100644 --- a/pom.xml +++ b/pom.xml @@ -23,9 +23,10 @@ 0.12 0.12.2-SNAPSHOT + 0.1.2-SNAPSHOT 3.4.2.R34x_v20080826-1230 2.0.0 - 0.1.21 + 0.1.22-SNAPSHOT 0.8.2.1 file:///var/argeo/projects/SLC/www/site http://www.argeo.org/projects/slc/site @@ -316,10 +317,24 @@ limitations under the License. dist + + + org.argeo.commons.security + org.argeo.security.dep.ads + ${version.argeo-commons} + pom + + + org.argeo.commons.osgi + org.argeo.osgi.boot + ${version.argeo-commons} + + + org.argeo.dep versions - 1.0.0 + 1.0.1-SNAPSHOT pom import 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 325d36028..f2ed1451d 100644 --- 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 adec339df..6be67da3a 100644 --- a/runtime/org.argeo.slc.support.equinox/pom.xml +++ b/runtime/org.argeo.slc.support.equinox/pom.xml @@ -8,7 +8,7 @@ org.argeo.slc.runtime org.argeo.slc.support.equinox - SLC Support Equinox OSGi + SLC Support Equinox jar @@ -54,6 +54,11 @@ org.argeo.slc.support.osgi + + org.eclipse.osgi + org.eclipse.osgi + + org.argeo.slc.runtime diff --git a/runtime/org.argeo.slc.support.osgi/pom.xml b/runtime/org.argeo.slc.support.osgi/pom.xml index a34ce66ef..ee911bb9d 100644 --- a/runtime/org.argeo.slc.support.osgi/pom.xml +++ b/runtime/org.argeo.slc.support.osgi/pom.xml @@ -43,7 +43,9 @@ org.eclipse.osgi org.eclipse.osgi + provided + org.springframework.osgi org.springframework.osgi.core @@ -63,11 +65,6 @@ com.springsource.org.objectweb.asm.attrs - - org.argeo.slc.runtime - org.argeo.slc.osgiboot - - - org.argeo.slc.runtime - org.argeo.slc.osgiboot + org.argeo.commons.osgi + org.argeo.osgi.boot + ${version.argeo-commons} org.springframework.osgi diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json index 442a7a621..9ed57eb07 100644 --- a/server/org.argeo.slc.ria/config.json +++ b/server/org.argeo.slc.ria/config.json @@ -65,10 +65,11 @@ "qx.version" : "${QXVERSION}", "qx.theme" : "${QXTHEME}", "qx.application" : "${APPLICATION}.Application", + "ria.splashScreen" : "org.argeo.security.ria/ArgeoLogo.png", "ria.auth.enableAuth" : "true", - "ria.auth.credentialsURI" : "/org.argeo.slc.webapp/getCredentials.ria", - "ria.auth.loginURI" : "/org.argeo.slc.webapp/authService.ria", - "ria.auth.logoutURI" : "/org.argeo.slc.webapp/authService.ria?logout=true", + "ria.auth.credentialsURI" : "/org.argeo.security.webapp/getCredentials.ria", + "ria.auth.loginURI" : "/org.argeo.security.webapp/login.ria", + "ria.auth.logoutURI" : "/org.argeo.security.webapp/logout.ria", "ria.StartupPerspective":"org.argeo.slc.web.Perspective" } }, diff --git a/server/org.argeo.slc.ria/pom.xml b/server/org.argeo.slc.ria/pom.xml index 6449ed2ad..ae0170785 100644 --- 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 org.argeo.slc.ria 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 index 415bdc304..000000000 --- a/server/org.argeo.slc.ria/src/WEB-INF/applicationContext.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ 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 index ef1e61883..000000000 --- a/server/org.argeo.slc.ria/src/WEB-INF/security.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - 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 dc1ae6e70..f46cd1782 100644 --- 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"> SLC Web UI - - - - contextConfigLocation - /WEB-INF/applicationContext.xml - - - - Spring Context - org.springframework.web.context.ContextLoaderListener - - - contextClass - org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext - - - - - springSecurityFilterChain - org.springframework.web.filter.DelegatingFilterProxy - - - - springSecurityFilterChain - /* - - - -- 2.39.2