You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by sm...@apache.org on 2015/04/23 16:44:54 UTC
directory-fortress-enmasse git commit: FC-82 - revert upgrade CXF in
rest component
Repository: directory-fortress-enmasse
Updated Branches:
refs/heads/master 4c33b8df1 -> 59d322cee
FC-82 - revert upgrade CXF in rest component
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/commit/59d322ce
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/59d322ce
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/59d322ce
Branch: refs/heads/master
Commit: 59d322cee775e780600adf21c0371acadf6a0b0a
Parents: 4c33b8d
Author: Shawn McKinney <sm...@apache.org>
Authored: Thu Apr 23 09:44:47 2015 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Thu Apr 23 09:44:47 2015 -0500
----------------------------------------------------------------------
README.txt | 2 +-
pom.xml | 2 +-
src/main/resources/FortressRestServerPolicy.xml | 2 +-
src/main/resources/applicationContext.xml | 13 +++++--------
4 files changed, 8 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/59d322ce/README.txt
----------------------------------------------------------------------
diff --git a/README.txt b/README.txt
index fcf9f42..fb8fd73 100755
--- a/README.txt
+++ b/README.txt
@@ -96,7 +96,7 @@ ________________________________________________________________________________
# SECTION 4: Load Test Users
###################################################################################
Run maven install with load file:
-# mvn install -Dload.file=./src/main/resources/FortressRestServerRoles.xml
+# mvn install -Dload.file=./src/main/resources/FortressRestServerPolicy.xml
###################################################################################
# SECTION 5: Instructions to Deploy Fortress Rest application to Tomcat
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/59d322ce/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 20e2241..7d2122f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -88,7 +88,7 @@
<!-- Dependencies version -->
<version.aspectj>1.8.4</version.aspectj>
<version.commons.beanutils>1.9.2</version.commons.beanutils>
- <version.cxf.bundle>3.0.0-milestone2</version.cxf.bundle>
+ <version.cxf.bundle>2.5.0</version.cxf.bundle>
<version.httpclient>3.1</version.httpclient>
<version.java>1.7</version.java>
<version.javadoc>2.9.1</version.javadoc>
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/59d322ce/src/main/resources/FortressRestServerPolicy.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/FortressRestServerPolicy.xml b/src/main/resources/FortressRestServerPolicy.xml
index 066783a..946828a 100644
--- a/src/main/resources/FortressRestServerPolicy.xml
+++ b/src/main/resources/FortressRestServerPolicy.xml
@@ -28,7 +28,7 @@
<!-- Begin RBAC Admin Data: -->
<adduser>
- <user userId="demoUser4" password="password" description="Demo Test User 4" ou="demousrs1" cn="JoeUser4" sn="User4" pwPolicy="Test1" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="60" photo="p4.jpeg"/>
+ <user userId="demoUser4" password="password" description="Demo Test User 4" ou="demousrs1" cn="JoeUser4" sn="User4" beginTime="0000" endTime="0000" beginDate="20090101" endDate="20990101" beginLockDate="" endLockDate="" dayMask="1234567" timeout="60" photo="p4.jpeg"/>
</adduser>
<adduserrole>
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/59d322ce/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index f88693d..72b9dcd 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -23,14 +23,11 @@ under the License.
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:context="http://www.springframework.org/schema/context"
- xmlns:util="http://www.springframework.org/schema/util"
xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
http://www.springframework.org/schema/context
http://www.springframework.org/schema/context/spring-context-3.0.xsd
- http://www.springframework.org/schema/util
- http://www.springframework.org/schema/util/spring-util-3.0.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
<context:component-scan base-package="org.apache.directory" />
@@ -53,9 +50,9 @@ under the License.
</jaxrs:server>
<bean id="annotationsInterceptor" class="org.apache.directory.fortress.rest.FortressInterceptor">
- <property name="securedObject" ref="securedObject"/>
+ <property name="securedObject" ref="securedObject"/>
</bean>
- <bean id="securedObject" class="org.apache.directory.fortress.rest.FortressServiceImpl"/>
+ <bean id="securedObject" class="org.apache.directory.fortress.rest.FortressServiceImpl"/>
-</beans>
\ No newline at end of file
+</beans>