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:52:36 UTC
directory-fortress-core git commit: FC-162 [ fortress-rest ] Upgrade
to Apache CXF 3.x
Repository: directory-fortress-core
Updated Branches:
refs/heads/master 23cd0aa19 -> 64a2697a5
FC-162 [ fortress-rest ] Upgrade to Apache CXF 3.x
Project: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/commit/64a2697a
Tree: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/tree/64a2697a
Diff: http://git-wip-us.apache.org/repos/asf/directory-fortress-core/diff/64a2697a
Branch: refs/heads/master
Commit: 64a2697a5f2a9dca5b76f1c1d5cba59e86346483
Parents: 23cd0aa
Author: Shawn McKinney <sm...@apache.org>
Authored: Sat Jul 16 19:52:32 2016 -0500
Committer: Shawn McKinney <sm...@apache.org>
Committed: Sat Jul 16 19:52:32 2016 -0500
----------------------------------------------------------------------
pom.xml | 10 +---------
.../apache/directory/fortress/core/rest/RestUtils.java | 11 ++++++++---
2 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/64a2697a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 09ac9f9..c0bccdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -111,7 +111,6 @@
<version.commons.lang>2.6</version.commons.lang>
<version.commons.logging>1.1.1</version.commons.logging>
<version.commons.pool>1.6</version.commons.pool>
- <version.cxf.common.utilities>2.7.18</version.cxf.common.utilities>
<version.dom4j>1.6.1</version.dom4j>
<version.ehcache.core>2.6.11</version.ehcache.core>
<version.hamcrest.core>1.3</version.hamcrest.core>
@@ -209,12 +208,6 @@
</dependency>
<dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-api</artifactId>
- <version>${version.cxf.common.utilities}</version>
- </dependency>
-
- <dependency>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId>
<version>${version.javax.ws.rs-api}</version>
@@ -463,7 +456,7 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
<version>${version.commons.codec}</version>
- <scope>test</scope>
+ <!--<scope>test</scope>-->
</dependency>
<dependency>
@@ -710,7 +703,6 @@
<pathelement location="${org.slf4j:slf4j-api:jar}" />
<pathelement location="${org.slf4j:slf4j-log4j12:jar}" />
<pathelement location="${antlr:antlr:jar}" />
- <pathelement location="${org.apache.cxf:cxf-api:jar}" />
<pathelement location="${javax.ws.rs:javax.ws.rs-api:jar}" />
<pathelement location="${org.apache.httpcomponents:httpclient:jar}" />
<pathelement location="${org.apache.httpcomponents:httpcore:jar}" />
http://git-wip-us.apache.org/repos/asf/directory-fortress-core/blob/64a2697a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
index a5dacfa..af4f496 100644
--- a/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
+++ b/src/main/java/org/apache/directory/fortress/core/rest/RestUtils.java
@@ -34,8 +34,8 @@ import javax.xml.bind.JAXBException;
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.cxf.common.util.Base64Utility;
-import org.apache.cxf.helpers.IOUtils;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
import org.apache.directory.fortress.core.GlobalErrIds;
import org.apache.directory.fortress.core.RestException;
import org.apache.directory.fortress.core.model.FortRequest;
@@ -374,9 +374,14 @@ public class RestUtils
*/
private static String base64Encode( String value )
{
- return Base64Utility.encode( value.getBytes() );
+ return new String ( Base64.encodeBase64( value.getBytes() ) );
}
+/* private static String base64Encode( String value )
+ {
+ return Base64Utility.encode( value.getBytes() );
+ }*/
+
/**
* Process the HTTP method request.