Adapt to changes in Commons

Deactivate RIA security

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

diff --git a/demo/log4j.properties b/demo/log4j.properties
index 0b5481c040d2a55d77ff96b176858f09919fc2b3..478afe9fcc9eff9ccda37ebd58a9c0a5ee67d458 100644 (file)
--- a/demo/log4j.properties
+++ b/demo/log4j.properties
@@ -22,12 +22,12 @@ log4j.logger.org.hibernate=WARN
 log4j.logger.org.springframework=WARN
 #log4j.logger.org.springframework.web=DEBUG
 #log4j.logger.org.springframework.jms=WARN
-log4j.logger.org.springframework.security=DEBUG
+#log4j.logger.org.springframework.security=DEBUG
 #log4j.logger.org.springframework.ldap=TRACE
-#log4j.logger.org.springframework.osgi.web=TRACE
+#log4j.logger.org.springframework.osgi=INFO
 
-log4j.logger.org.apache.activemq=WARN
-log4j.logger.org.apache.activemq.transport=WARN
+log4j.logger.org.apache.activemq=INFO
+#log4j.logger.org.apache.activemq.transport=WARN
 log4j.logger.org.apache.activemq.ActiveMQMessageConsumer=INFO
 log4j.logger.org.apache.activemq.ActiveMQMessageProducer=INFO
 

diff --git a/demo/slc_demo_rap.properties b/demo/slc_demo_rap.properties
index 08ae1002af9ee37b402ba3a094f20d2f058d4693..583101abf7cc938afe9e496926fec536d1581b2f 100644 (file)
--- a/demo/slc_demo_rap.properties
+++ b/demo/slc_demo_rap.properties
@@ -5,7 +5,7 @@ org.argeo.node.repo.jackrabbit,\
 org.argeo.slc.server.h2,\
 org.argeo.slc.server.castor,\
 org.argeo.slc.server.hibernate,\
-org.argeo.security.manager.ldap,\
+org.argeo.security.dao.ldap,\
 org.argeo.security.services,\
 org.argeo.slc.server.services,\
 com.springsource.javax.servlet,\
@@ -18,6 +18,8 @@ org.argeo.dep.osgi.catalina.start,\
 org.argeo.jackrabbit.webapp,\
 org.eclipse.equinox.http.registry,\
 org.argeo.server.osgi.webapp,\
+org.argeo.slc.server.main,\
+org.argeo.slc.ria,\
 org.argeo.slc.agent,\
 org.argeo.slc.client.agent,\
 org.argeo.slc.client.core,\
@@ -27,7 +29,6 @@ org.argeo.slc.client.rap,\
 org.argeo.slc.client.ui,\
 org.argeo.slc.demo.ant,\
 org.argeo.slc.demo.basic,\
-org.argeo.slc.ui.gis.rap,\
 
 eclipse.ignoreApp=true
 osgi.noShutdown=true

diff --git a/demo/slc_demo_rcp.properties b/demo/slc_demo_rcp.properties
new file mode 100644 (file)
index 0000000..5b51e35
--- /dev/null
+++ b/demo/slc_demo_rcp.properties
@@ -0,0 +1,13 @@
+argeo.osgi.start=\
+org.springframework.osgi.extender,\
+org.argeo.slc.client.rcp,\
+org.argeo.slc.demo.ant,\
+org.argeo.slc.demo.basic,\
+
+eclipse.application=org.argeo.slc.client.rcp.application
+org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.perspectives.slcExecution
+
+log4j.configuration=file:../../log4j.properties
+
+argeo.node.repo.home=~/.argeo/server_noderepo
+argeo.node.repo.dburl=jdbc:h2:file:~/.argeo/h2/server_noderepo_db

diff --git a/eclipse/features/org.argeo.slc.ide/feature.xml b/eclipse/features/org.argeo.slc.ide/feature.xml
index 3d207e9765eee24ce8643b7dea1de35e3a72114b..a05b5c1ee33fb26b32e0288e9fe2951d41d0f4e9 100644 (file)
--- a/eclipse/features/org.argeo.slc.ide/feature.xml
+++ b/eclipse/features/org.argeo.slc.ide/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.argeo.slc.ide"
       label="Argeo Java IDE"
-      version="0.13.0.D20100802_2128"
+      version="0.13.1.D20110413_1126"
       provider-name="Argeo"
       plugin="org.argeo.slc.ide.branding"
       image="icons/argeo-icon-100104-256.png">
@@ -64,14 +64,14 @@ and limitations under the License.
          id="org.argeo.slc.ide.ui"
          download-size="0"
          install-size="0"
-         version="0.13.0.D20100802_2128"
+         version="0.13.1.D20110413_1126"
          unpack="false"/>
 
    <plugin
          id="org.argeo.slc.ide.branding"
          download-size="0"
          install-size="0"
-         version="0.13.0.D20100802_2128"
+         version="0.13.1.D20110413_1126"
          unpack="false"/>
 
 </feature>

diff --git a/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml b/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml
index 5d3eced5907598cc65134ff335da5d113be82625..eb766a5f9ed87add094e90efacc6d2dca489d54f 100644 (file)
--- a/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml
+++ b/eclipse/modules/org.argeo.slc.client.agent/META-INF/spring/client-osgi.xml
@@ -11,7 +11,7 @@
        <reference id="modulesManager"\r
                interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
 \r
-       <service ref="slcAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
+<!--   <service ref="slcAgentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" /> -->\r
        <service ref="slcAgent" interface="org.argeo.slc.runtime.SlcAgent" />\r
 \r
 </beans:beans>
\ No newline at end of file

diff --git a/eclipse/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF b/eclipse/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF
index b3fc8c2404fdf822ae2b10b3db353b180b801896..9928d35d8398aef1f03b06742b1f1916ea16a4ad 100644 (file)
--- a/eclipse/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF
+++ b/eclipse/plugins/org.argeo.slc.ide.branding/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Argeo IDE
 Bundle-SymbolicName: org.argeo.slc.ide.branding;singleton:=true
-Bundle-Version: 0.13.1.SNAPSHOT
+Bundle-Version: 0.13.1.D20110413_1126
 Bundle-Vendor: Argeo.org
 Require-Bundle: org.eclipse.ui;bundle-version="3.5.1",
  org.eclipse.osgi;bundle-version="3.5.1",

diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
index 0d716087b08772b0845b53b716e6bf581e693ae5..0f900ba7869c1c5256be0616aa07137b49552e7b 100644 (file)
--- a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
+++ b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms-osgi.xml
@@ -1,11 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans:beans xmlns="http://www.springframework.org/schema/osgi"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
+       xmlns:osgi="http://www.springframework.org/schema/osgi" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:beans="http://www.springframework.org/schema/beans"
        xsi:schemaLocation="http://www.springframework.org/schema/osgi  
        http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd
        http://www.springframework.org/schema/beans   
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
+       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd"
+       osgi:default-timeout="5000">
 
+       <!-- REFERENCES -->
        <reference id="agentService" interface="org.argeo.slc.services.AgentService" />
        <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
        <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
@@ -16,15 +19,11 @@
 
        <reference id="attachmentsStorage"
                interface="org.argeo.slc.core.attachment.AttachmentsStorage" />
+       <reference id="systemExecutionService" interface="org.argeo.security.SystemExecutionService" />
 
+       <!-- SERVICES -->
        <service ref="jmsEventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />
        <service ref="jmsEventPublisher" interface="org.argeo.slc.msg.event.SlcEventPublisher" />
 
-       <!--
-               <reference id="jmsTransactionManager"
-               interface="org.springframework.transaction.PlatformTransactionManager"
-               bean-name="jmsTransactionManager" />
-       -->
-       <reference id="securityService" interface="org.argeo.security.ArgeoSecurityService" />
 
 </beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
index cd4f23d1fa9342a678e200d92da364df095f3531..b7e379129a5c665d8073db0e3bf62b3aa153a92e 100644 (file)
--- a/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
+++ b/modules/server/org.argeo.slc.server.jms/META-INF/spring/jms.xml
@@ -28,15 +28,13 @@
        <bean id="jmsEventListener" class="org.argeo.slc.jms.JmsSlcEventListener"
                init-method="init" destroy-method="close">
                <property name="jmsConnectionFactory">
-                       <!--
-                               Need its own connection factory in order to set client ids (not
-                               possible on pool)
-                       -->
+                       <!-- Need its own connection factory in order to set client ids (not possible 
+                               on pool) -->
                        <bean class="org.apache.activemq.ActiveMQConnectionFactory">
                                <property name="brokerURL">
                                        <value>${slc.server.jms.url}</value>
-                                       <!--<value>vm://localhost</value>
-                               --></property>
+                                       <!--<value>vm://localhost</value> -->
+                               </property>
                        </bean>
                </property>
                <property name="eventsDestination" ref="slcJms.destination.events" />
@@ -95,12 +93,10 @@
                class="org.springframework.jms.listener.DefaultMessageListenerContainer"
                abstract="true">
                <property name="connectionFactory" ref="jmsConnectionFactory" />
-               <!--
-                       <property name="transactionManager" ref="jmsTransactionManager" />
-               -->
+               <!-- <property name="transactionManager" ref="jmsTransactionManager" /> -->
                <property name="taskExecutor">
-                       <bean class="org.argeo.security.core.SystemAuthenticatedTaskExecutor">
-                               <property name="securityService" ref="securityService" />
+                       <bean class="org.argeo.security.core.AsyncSystemTaskExecutor">
+                               <property name="systemExecutionService" ref="systemExecutionService" />
                        </bean>
                </property>
        </bean>

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 e625491e9c7db6afa0f006a5f6644fbe99d74307..5a763ad7e3911a3fd992b17b1800e6daa1a5e4a9 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
@@ -7,7 +7,7 @@
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
        <!-- Security -->
-       <bundle id="security.ldap" symbolic-name="org.argeo.security.manager.ldap"
+       <bundle id="security.ldap" symbolic-name="org.argeo.security.dao.ldap"
                action="start" />
        <bundle id="security.services" symbolic-name="org.argeo.security.services"
                action="start" />
@@ -34,9 +34,9 @@
        <bundle id="catalina" symbolic-name="org.argeo.dep.osgi.catalina.start"
                action="start" />
 
-       <!--  Web app start order is important! Security should be first -->
-       <bundle id="security.webapp" symbolic-name="org.argeo.security.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" />
 

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 8912bd013181c99a947ac35783211fa7ebb11435..0b80c6e966c1935d345857703e993cf1e4eacce9 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
@@ -6,18 +6,7 @@
        http://www.springframework.org/schema/beans   
        http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
 
-       <service ref="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
-       <service ref="agentService" interface="org.argeo.slc.services.AgentService" />
-       <service ref="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
-       <service ref="attachmentsStorage">
-               <interfaces>
-                       <beans:value>org.argeo.slc.core.attachment.AttachmentsStorage
-                       </beans:value>
-                       <beans:value>org.argeo.slc.core.attachment.AttachmentUploader
-                       </beans:value>
-               </interfaces>
-       </service>
-
+       <!-- REFERENCES -->
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultDao"
                id="testResultDao" />
        <reference interface="org.argeo.slc.dao.test.tree.TreeTestResultCollectionDao"
@@ -29,12 +18,6 @@
        <reference interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao"
                id="slcAgentDescriptorDao" />
 
-       <!--
-               <reference id="transactionManager"
-               interface="org.springframework.transaction.PlatformTransactionManager"
-               />
-       -->
-
        <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />
 
        <list id="eventPublishers" interface="org.argeo.slc.msg.event.SlcEventPublisher"
@@ -42,4 +25,18 @@
 
        <reference id="systemExecutor" interface="org.argeo.security.SystemExecutionService" />
 
+       <!-- SERVICES -->
+       <service ref="testManagerService" interface="org.argeo.slc.services.TestManagerService" />
+       <service ref="agentService" interface="org.argeo.slc.services.AgentService" />
+       <service ref="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />
+       <service ref="attachmentsStorage">
+               <interfaces>
+                       <beans:value>org.argeo.slc.core.attachment.AttachmentsStorage
+                       </beans:value>
+                       <beans:value>org.argeo.slc.core.attachment.AttachmentUploader
+                       </beans:value>
+               </interfaces>
+       </service>
+
+
 </beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.webapp/WEB-INF/applicationContext.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/applicationContext.xml
index 7a450578faf85d6f747cc6807064f7617038a4c1..1b9c09502e809be729323efcc79e6a48352afea2 100644 (file)
--- a/modules/server/org.argeo.slc.webapp/WEB-INF/applicationContext.xml
+++ b/modules/server/org.argeo.slc.webapp/WEB-INF/applicationContext.xml
@@ -15,7 +15,7 @@
                security.xml has to be before osgi.xml, otherwise namespace parsing
                fails
        -->
-       <import resource="security.xml" />
+<!--   <import resource="security.xml" /> -->
        <import resource="osgi.xml" />
 
        <!--

diff --git a/modules/server/org.argeo.slc.webapp/WEB-INF/osgi.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/osgi.xml
index 1e2ce107770a982b9c5406d00e5acdb506aeed63..25dee67fd501313aac9c45e0af180ce55c691581 100644 (file)
--- a/modules/server/org.argeo.slc.webapp/WEB-INF/osgi.xml
+++ b/modules/server/org.argeo.slc.webapp/WEB-INF/osgi.xml
@@ -18,13 +18,13 @@
        <reference id="slcAgentDescriptorDao"\r
                interface="org.argeo.slc.dao.runtime.SlcAgentDescriptorDao" />\r
 \r
-       <!--  Services -->\r
+       <!-- Services -->\r
        <reference id="slcExecutionService" interface="org.argeo.slc.services.SlcExecutionService" />\r
        <reference id="testManagerService" interface="org.argeo.slc.services.TestManagerService" />\r
        <reference id="agentFactory" interface="org.argeo.slc.runtime.SlcAgentFactory" />\r
        <reference id="attachmentsStorage"\r
                interface="org.argeo.slc.core.attachment.AttachmentsStorage" />\r
-       \r
+\r
        <!-- Events -->\r
        <reference id="eventListener" interface="org.argeo.slc.msg.event.SlcEventListener" />\r
 \r
@@ -38,8 +38,9 @@
        <!-- Security -->\r
        <reference id="_authenticationManager"\r
                interface="org.springframework.security.AuthenticationManager" />\r
-       <reference id="userDetailsService"\r
-               interface="org.springframework.security.userdetails.UserDetailsService" />\r
+       <!-- <reference id="userDetailsService" -->\r
+       <!-- interface="org.springframework.security.userdetails.UserDetailsService" \r
+               /> -->\r
 \r
        <!-- Optional reference to JCR repository -->\r
        <reference id="jcrRepository" interface="javax.jcr.Repository"\r
@@ -47,32 +48,4 @@
 \r
        <reference id="osivInterceptor"\r
                interface="org.springframework.web.context.request.WebRequestInterceptor" />\r
-\r
-       <!--\r
-               <reference id="authenticationEntryPoint"\r
-               interface="org.springframework.security.ui.AuthenticationEntryPoint"\r
-               />\r
-       -->\r
-\r
-       <!--\r
-               <reference id="agentService"\r
-               interface="org.argeo.slc.services.AgentService" />\r
-       -->\r
-       <!--\r
-\r
-               <reference id="hibernateTransactionManager"\r
-               interface="org.springframework.transaction.PlatformTransactionManager"\r
-               bean-name="hibernateTransactionManager" />\r
-       -->\r
-\r
-       <!--\r
-               <reference interface="org.hibernate.SessionFactory"\r
-               id="sessionFactory" />\r
-       -->\r
-       <!--\r
-               <reference interface="org.argeo.slc.execution.ExecutionModulesManager"\r
-               id="modulesManager" />\r
-       -->\r
-\r
-\r
 </beans:beans>
\ No newline at end of file

diff --git a/modules/server/org.argeo.slc.webapp/WEB-INF/web.xml b/modules/server/org.argeo.slc.webapp/WEB-INF/web.xml
index 10f237de2a442c121611a74d6fe359c7caaaa7c6..a8a40421540f62001fee080216da978370cffd2b 100644 (file)
--- a/modules/server/org.argeo.slc.webapp/WEB-INF/web.xml
+++ b/modules/server/org.argeo.slc.webapp/WEB-INF/web.xml
@@ -77,26 +77,6 @@
                <url-pattern>*.jcr</url-pattern>
        </servlet-mapping>
 
-       <!-- WEBDAV servlet -->
-       <servlet>
-               <servlet-name>webdav</servlet-name>
-               <servlet-class>org.argeo.server.jackrabbit.webdav.ExtendedDispatcherServlet</servlet-class>
-               <init-param>
-                       <param-name>contextClass</param-name>
-                       <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
-               </init-param>
-               <init-param>
-                       <param-name>dispatchOptionsRequest</param-name>
-                       <param-value>true</param-value>
-               </init-param>
-               <load-on-startup>1</load-on-startup>
-       </servlet>
-
-       <servlet-mapping>
-               <servlet-name>webdav</servlet-name>
-               <url-pattern>/default/*</url-pattern>
-       </servlet-mapping>
-
        <!-- JCR-MANAGER servlet -->
        <servlet>
                <servlet-name>jcr-manager</servlet-name>
@@ -144,7 +124,7 @@
                <param-value>org.springframework.osgi.web.context.support.OsgiBundleXmlWebApplicationContext</param-value>
        </context-param>
 
-       <!--  Security -->
+       <!--  Security
        <filter>
                <filter-name>springSecurityFilterChain</filter-name>
                <filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
@@ -158,5 +138,6 @@
        <context-param>
                <param-name>argeo.security.systemKey</param-name>
                <param-value>argeo</param-value>
-       </context-param>
+       </context-param> 
+       -->
 </web-app>

diff --git a/server/org.argeo.slc.ria/config.json b/server/org.argeo.slc.ria/config.json
index 70548195afaf3d103b0587a2285dc8ec4d5667a0..9f238f5e0e071a03c14d3d6ec6fd719a12325dd0 100644 (file)
--- a/server/org.argeo.slc.ria/config.json
+++ b/server/org.argeo.slc.ria/config.json
@@ -75,7 +75,7 @@
         "qx.application" : "${APPLICATION}.Application",\r
         "ria.branding.splashScreen"            : "org.argeo.security.ria/ArgeoLogo.png",\r
         "ria.branding.applicationTitle" : "Slc RIA",\r
-        "ria.auth.enableAuth"          : "true",\r
+        "ria.auth.enableAuth"          : "false",\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