Author: ashakirin
Date: Wed Jan 8 12:50:35 2014
New Revision: 1556517
URL: http://svn.apache.org/r1556517
Log:
XKMS: allowed access to XKMSInvoker, XKMSCryptoFactory and XKMSCryptoProvider
Added:
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
- copied, changed from r1555845,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XKMSInvoker.java
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/
- copied from r1554225,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
- copied, changed from r1554397,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
- copied, changed from r1554846,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProviderFactory.java
Removed:
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XKMSInvoker.java
cxf/trunk/services/xkms/xkms-common/src/main/java/org/apache/cxf/xkms/crypto/MissingPrincipalException.java
Modified:
cxf/trunk/services/xkms/xkms-client/pom.xml
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/CryptoProviderUtils.java
cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
Modified: cxf/trunk/services/xkms/xkms-client/pom.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/pom.xml?rev=1556517&r1=1556516&r2=1556517&view=diff
==============================================================================
--- cxf/trunk/services/xkms/xkms-client/pom.xml (original)
+++ cxf/trunk/services/xkms/xkms-client/pom.xml Wed Jan 8 12:50:35 2014
@@ -58,7 +58,7 @@
*
</Import-Package>
<Export-Package>
- org.apache.cxf.xkms.crypto.impl,
+ org.apache.cxf.xkms.crypto.provider,
org.apache.cxf.xkms.cache,
org.apache.cxf.xkms.client
<!-- To avoid problems with existing users.
Copied:
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
(from r1555845,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XKMSInvoker.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java?p2=cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java&p1=cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XKMSInvoker.java&r1=1555845&r2=1556517&rev=1556517&view=diff
==============================================================================
---
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XKMSInvoker.java
(original)
+++
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/client/XKMSInvoker.java
Wed Jan 8 12:50:35 2014
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.cxf.xkms.crypto.impl;
+package org.apache.cxf.xkms.client;
import java.io.ByteArrayInputStream;
import java.math.BigInteger;
@@ -32,7 +32,6 @@ import java.util.UUID;
import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
-import org.apache.cxf.xkms.client.X509AppId;
import org.apache.cxf.xkms.exception.ExceptionMapper;
import org.apache.cxf.xkms.exception.XKMSException;
import org.apache.cxf.xkms.exception.XKMSLocateException;
@@ -55,7 +54,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3._2002._03.xkms_wsdl.XKMSPortType;
-class XKMSInvoker {
+public class XKMSInvoker {
private static final Logger LOG =
LoggerFactory.getLogger(XKMSInvoker.class);
private static final org.apache.cxf.xkms.model.xmldsig.ObjectFactory
DSIG_OF =
Modified:
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/CryptoProviderUtils.java
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/CryptoProviderUtils.java?rev=1556517&r1=1554225&r2=1556517&view=diff
==============================================================================
---
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/CryptoProviderUtils.java
(original)
+++
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/CryptoProviderUtils.java
Wed Jan 8 12:50:35 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.xkms.crypto.impl;
+package org.apache.cxf.xkms.crypto.provider;
import java.io.IOException;
import java.io.InputStream;
Copied:
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
(from r1554397,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java?p2=cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java&p1=cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java&r1=1554397&r2=1556517&rev=1556517&view=diff
==============================================================================
---
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProvider.java
(original)
+++
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProvider.java
Wed Jan 8 12:50:35 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.xkms.crypto.impl;
+package org.apache.cxf.xkms.crypto.provider;
import java.math.BigInteger;
import java.security.PrivateKey;
@@ -32,6 +32,7 @@ import org.apache.cxf.common.logging.Log
import org.apache.cxf.xkms.cache.EHCacheXKMSClientCache;
import org.apache.cxf.xkms.cache.XKMSCacheToken;
import org.apache.cxf.xkms.cache.XKMSClientCache;
+import org.apache.cxf.xkms.client.XKMSInvoker;
import org.apache.cxf.xkms.crypto.CryptoProviderException;
import org.apache.cxf.xkms.handlers.Applications;
import org.apache.wss4j.common.crypto.Crypto;
Copied:
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
(from r1554846,
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProviderFactory.java)
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java?p2=cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java&p1=cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProviderFactory.java&r1=1554846&r2=1556517&rev=1556517&view=diff
==============================================================================
---
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/impl/XkmsCryptoProviderFactory.java
(original)
+++
cxf/trunk/services/xkms/xkms-client/src/main/java/org/apache/cxf/xkms/crypto/provider/XkmsCryptoProviderFactory.java
Wed Jan 8 12:50:35 2014
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.cxf.xkms.crypto.impl;
+package org.apache.cxf.xkms.crypto.provider;
import java.io.IOException;
import java.io.InputStream;
Modified:
cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml?rev=1556517&r1=1556516&r2=1556517&view=diff
==============================================================================
---
cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml
(original)
+++
cxf/trunk/services/xkms/xkms-client/src/main/resources/OSGI-INF/blueprint/beans.xml
Wed Jan 8 12:50:35 2014
@@ -32,7 +32,7 @@
</jaxws:properties>
</jaxws:client>
<service ref="xkmsClient"
interface="org.w3._2002._03.xkms_wsdl.XKMSPortType"/>
- <bean id="xkmsCryptoProviderFactory"
class="org.apache.cxf.xkms.crypto.impl.XkmsCryptoProviderFactory">
+ <bean id="xkmsCryptoProviderFactory"
class="org.apache.cxf.xkms.crypto.provider.XkmsCryptoProviderFactory">
<argument ref="xkmsClient"/>
</bean>
<service ref="xkmsCryptoProviderFactory"
interface="org.apache.cxf.xkms.crypto.CryptoProviderFactory"/>
Modified:
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
URL:
http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml?rev=1556517&r1=1556516&r2=1556517&view=diff
==============================================================================
---
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
(original)
+++
cxf/trunk/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/client.xml
Wed Jan 8 12:50:35 2014
@@ -47,7 +47,7 @@
</constructor-arg>
<constructor-arg ref="cxf"/>
</bean>
- <bean id="xkmsCrypto"
class="org.apache.cxf.xkms.crypto.impl.XkmsCryptoProvider">
+ <bean id="xkmsCrypto"
class="org.apache.cxf.xkms.crypto.provider.XkmsCryptoProvider">
<constructor-arg>
<ref bean="xkmsClient"/>
</constructor-arg>
@@ -65,7 +65,7 @@
<util:properties id="cryptoProperties"
location="classpath:alice.properties"/>
</constructor-arg>
</bean>
- <bean id="xkmsAsymmetricCrypto"
class="org.apache.cxf.xkms.crypto.impl.XkmsCryptoProvider">
+ <bean id="xkmsAsymmetricCrypto"
class="org.apache.cxf.xkms.crypto.provider.XkmsCryptoProvider">
<constructor-arg>
<ref bean="xkmsClient"/>
</constructor-arg>
