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 2016/07/17 00:50:38 UTC
directory-fortress-enmasse git commit: FC-162 - Upgrade to Apache CXF
3.x
Repository: directory-fortress-enmasse
Updated Branches:
refs/heads/master 55bb0c1f5 -> 21015b03e
FC-162 - Upgrade to Apache CXF 3.x
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/21015b03
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/tree/21015b03
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/diff/21015b03
Branch: refs/heads/master
Commit: 21015b03e5b7f0fe5d0a1106c179ae2392eada89
Parents: 55bb0c1
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Jul 16 19:50:35 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Jul 16 19:50:35 2016 -0500
----------------------------------------------------------------------
pom.xml | 33 +++++++++++++-------------
src/main/resources/applicationContext.xml | 26 ++++++++++----------
2 files changed, 29 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/21015b03/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cc92d21..5145304 100755
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<version>1.0.1-SNAPSHOT</version>
<name>Apache Fortress Rest</name>
<url>http://directory.apache.org/fortress/</url>
- <description>Fortress Rest provides a RESTful implementation of Fortress' ANSI RBAC INCITS 359 engine</description>
+ <description>Fortress Rest provides a RESTful implementation of the Fortress Access Management APIs</description>
<licenses>
<license>
@@ -101,18 +101,18 @@
<!-- Dependencies version -->
<fortress.realm.version>1.0.1-SNAPSHOT</fortress.realm.version>
<commons.beanutils.version>1.9.2</commons.beanutils.version>
- <cxf.bundle.version>2.7.18</cxf.bundle.version>
+ <cxf.version>3.1.6</cxf.version>
<httpclient.version>3.1</httpclient.version>
<java.version>1.7</java.version>
<httpclient.version>3.1</httpclient.version>
<javadoc.version>2.9.1</javadoc.version>
<jackson.jaxrs.version>1.9.13</jackson.jaxrs.version>
- <junit.version>4.12</junit.version>
+ <junit.version>4.12</junit.version>
<log4j.version>1.2.17</log4j.version>
<servlet-api.version>2.5.0</servlet-api.version>
<slf4j.log4j12.version>1.7.18</slf4j.log4j12.version>
- <spring.security.version>4.0.0.RELEASE</spring.security.version>
- <spring.version>4.0.0.RELEASE</spring.version>
+ <spring.version>4.3.1.RELEASE</spring.version>
+ <spring.security.version>4.0.4.RELEASE</spring.security.version>
<!-- Other properties -->
<javadoc.stylesheet>${basedir}/src/main/java/org/openldap/enmasse/fortress-javadoc.css</javadoc.stylesheet>
@@ -126,25 +126,26 @@
<groupId>org.apache.directory.fortress</groupId>
<artifactId>fortress-realm-impl</artifactId>
<version>${fortress.realm.version}</version>
+ <exclusions>
+ <!-- fortress 1.0.0 and prior had this dependency which clashes with cxf version 3. -->
+ <exclusion>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-api</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- CXF Dependencies -->
<dependency>
<groupId>org.apache.cxf</groupId>
- <artifactId>cxf-bundle-jaxrs</artifactId>
- <version>${cxf.bundle.version}</version>
- <exclusions>
- <exclusion>
- <artifactId>geronimo-servlet_3.0_spec</artifactId>
- <groupId>org.apache.geronimo.specs</groupId>
- </exclusion>
- </exclusions>
+ <artifactId>cxf-core</artifactId>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
- <groupId>org.codehaus.jackson</groupId>
- <artifactId>jackson-jaxrs</artifactId>
- <version>${jackson.jaxrs.version}</version>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-frontend-jaxrs</artifactId>
+ <version>${cxf.version}</version>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/directory-fortress-enmasse/blob/21015b03/src/main/resources/applicationContext.xml
----------------------------------------------------------------------
diff --git a/src/main/resources/applicationContext.xml b/src/main/resources/applicationContext.xml
index 3af353a..7677a67 100644
--- a/src/main/resources/applicationContext.xml
+++ b/src/main/resources/applicationContext.xml
@@ -17,23 +17,27 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
-
-<beans default-autowire="byName"
- xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:jaxrs="http://cxf.apache.org/jaxrs"
xmlns:context="http://www.springframework.org/schema/context"
- xsi:schemaLocation="http://www.springframework.org/schema/beans
- http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/context
- http://www.springframework.org/schema/context/spring-context.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd">
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context.xsd">
<context:component-scan base-package="org.apache.directory"/>
<import resource="classpath:META-INF/cxf/cxf.xml"/>
<import resource="classpath:META-INF/cxf/cxf-servlet.xml"/>
+ <bean id="securedObject" class="org.apache.directory.fortress.rest.FortressServiceImpl"/>
+
+ <bean id="annotationsInterceptor" class="org.apache.directory.fortress.rest.FortressInterceptor">
+ <property name="securedObject" ref="securedObject"/>
+ </bean>
+
<jaxrs:server id="restContainer" address="/">
<jaxrs:serviceBeans>
<ref bean="fortressService"/>
@@ -49,10 +53,4 @@ under the License.
</jaxrs:server>
- <bean id="annotationsInterceptor" class="org.apache.directory.fortress.rest.FortressInterceptor">
- <property name="securedObject" ref="securedObject"/>
- </bean>
-
- <bean id="securedObject" class="org.apache.directory.fortress.rest.FortressServiceImpl"/>
-
</beans>