Revision d9848104
Added by Cherian Mathew about 9 years ago
cdmlib-remote-webapp/src/main/webapp/WEB-INF/web.xml | ||
---|---|---|
49 | 49 |
<url-pattern>/*</url-pattern> |
50 | 50 |
</filter-mapping> |
51 | 51 |
|
52 |
<!-- |
|
53 |
Security |
|
54 |
--> |
|
55 |
<!-- |
|
52 |
<!-- Remoting Security --> |
|
53 |
|
|
56 | 54 |
<filter> |
57 | 55 |
<filter-name>springSecurityFilterChain</filter-name> |
58 | 56 |
<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class> |
... | ... | |
61 | 59 |
<filter-name>springSecurityFilterChain</filter-name> |
62 | 60 |
<url-pattern>/*</url-pattern> |
63 | 61 |
</filter-mapping> |
64 |
--> |
|
62 |
|
|
65 | 63 |
</web-app> |
cdmlib-remote/src/main/resources/eu/etaxonomy/cdm/remote-security.xml | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
2 | 2 |
<beans xmlns="http://www.springframework.org/schema/beans" |
3 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" |
|
4 |
xmlns:security="http://www.springframework.org/schema/security" |
|
3 |
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" |
|
5 | 4 |
xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.1.xsd |
6 | 5 |
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> |
7 | 6 |
|
8 |
<import resource="remote.xml"/>
|
|
7 |
<import resource="remote.xml" />
|
|
9 | 8 |
|
10 |
<!-- Pattern to intercept URL requests --> |
|
11 |
<!-- |
|
12 |
<security:http auto-config="true" authentication-manager-ref="authenticationManager"> |
|
13 |
<security:intercept-url pattern="/**" access="ROLE_ADMIN" /> |
|
14 |
</security:http> |
|
9 |
<!-- Pattern to intercept URL requests --> |
|
15 | 10 |
|
16 |
--> |
|
11 |
<security:http auto-config="true" authentication-manager-ref="authenticationManager"> |
|
12 |
<security:intercept-url pattern="/remoting/**" access="ROLE_ADMIN,ROLE_PROJECT_MANAGER,ROLE_USER_MANAGER,ROLE_PUBLISH" /> |
|
13 |
<security:http-basic /> |
|
14 |
</security:http> |
|
15 |
|
|
16 |
|
|
17 |
<!-- Pattern to build a security filter chain --> |
|
18 |
|
|
19 |
<!-- <bean id="remotingSpringSecurityFilterChain" class="org.springframework.security.web.FilterChainProxy"> --> |
|
20 |
<!-- <constructor-arg> --> |
|
21 |
<!-- <list> --> |
|
22 |
<!-- <security:filter-chain pattern="/remoting/**" filters="none"/> --> |
|
23 |
<!-- </list> --> |
|
24 |
<!-- </constructor-arg> --> |
|
25 |
<!-- </bean> --> |
|
17 | 26 |
|
18 |
<!-- Pattern to build a security filter chain --> |
|
19 |
<!-- |
|
20 |
<bean id="springSecurityFilterChain" class="org.springframework.security.web.FilterChainProxy"> |
|
21 |
<constructor-arg> |
|
22 |
<list> |
|
23 |
<security:filter-chain pattern="/**" filters="none"/> |
|
24 |
</list> |
|
25 |
</constructor-arg> |
|
26 |
</bean> |
|
27 |
--> |
|
28 | 27 |
</beans> |
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/DeleteResult.java | ||
---|---|---|
9 | 9 |
*/ |
10 | 10 |
package eu.etaxonomy.cdm.api.service; |
11 | 11 |
|
12 |
import java.io.Serializable; |
|
12 | 13 |
import java.util.ArrayList; |
13 | 14 |
import java.util.HashSet; |
14 | 15 |
import java.util.List; |
... | ... | |
26 | 27 |
* @date 04.01.2012 |
27 | 28 |
* |
28 | 29 |
*/ |
29 |
public class DeleteResult { |
|
30 |
public class DeleteResult implements Serializable { |
|
31 |
|
|
30 | 32 |
@SuppressWarnings("unused") |
31 | 33 |
private static final Logger logger = Logger.getLogger(DeleteResult.class); |
32 | 34 |
|
cdmlib-services/src/main/resources/eu/etaxonomy/cdm/remoting-services.xml | ||
---|---|---|
24 | 24 |
<prop key="/remoting/classification.service">httpClassificationService</prop> |
25 | 25 |
<prop key="/remoting/collection.service">httpCollectionService</prop> |
26 | 26 |
<prop key="/remoting/common.service">httpCommonService</prop> |
27 |
<prop key="/remoting/database.service">httpDatabaseService</prop> |
|
27 |
<prop key="/remoting-public/database.service">httpDatabaseService</prop>
|
|
28 | 28 |
<prop key="/remoting/description.service">httpDescriptionService</prop> |
29 | 29 |
<prop key="/remoting/featurenode.service">httpFeatureNodeService</prop> |
30 | 30 |
<prop key="/remoting/featuretree.service">httpFeatureTreeService</prop> |
... | ... | |
48 | 48 |
<prop key="/remoting/term.service">httpTermService</prop> |
49 | 49 |
<prop key="/remoting/entityvalidationresult.service">httpEntityValidationResultService</prop> |
50 | 50 |
<prop key="/remoting/entityconstraintviolation.service">httpEntityConstraintViolationService</prop> |
51 |
<prop key="/remoting/user.service">httpUserService</prop> |
|
51 |
<prop key="/remoting-public/user.service">httpUserService</prop>
|
|
52 | 52 |
<prop key="/remoting/vocabulary.service">httpVocabularyService</prop> |
53 | 53 |
<prop key="/remoting/authenticationManager.service">httpAuthenticationManager</prop> |
54 | 54 |
</props> |
Also available in: Unified diff
DeleteResult : made serializable
remote-security : added remoting url intercept
remoting-services : made user service public
web.xml : added filter chain for securing remoting services