summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-03-29 12:34:29 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-03-29 12:34:29 +0000
commit6ad0c7a4bfc40332c69d9e69dcaa71ca5b6a2522 (patch)
tree091e7e03efbcaf026ff7a807ea163f57462a90e3 /xmlsecurity
parenta947294fb5b70f4f6b3bf47974e31f1ba164f3f0 (diff)
INTEGRATION: CWS xmlsec10 (1.1.1.1.38); FILE MERGED
2005/03/24 08:20:58 mmi 1.1.1.1.38.1: idl review Issue number: Submitted by: Reviewed by:
Diffstat (limited to 'xmlsecurity')
-rw-r--r--xmlsecurity/tools/uno/EncryptionEntity.java10
-rw-r--r--xmlsecurity/tools/uno/SecurityEntity.java6
2 files changed, 8 insertions, 8 deletions
diff --git a/xmlsecurity/tools/uno/EncryptionEntity.java b/xmlsecurity/tools/uno/EncryptionEntity.java
index 3732b0c69095..b31eb12d302a 100644
--- a/xmlsecurity/tools/uno/EncryptionEntity.java
+++ b/xmlsecurity/tools/uno/EncryptionEntity.java
@@ -2,9 +2,9 @@
*
* $RCSfile: EncryptionEntity.java,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: mt $ $Date: 2004-07-12 13:15:24 $
+ * last change: $Author: rt $ $Date: 2005-03-29 13:34:16 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,7 +91,7 @@ class EncryptionEntity extends SecurityEntity
xXMLEncryption, xRemoteServiceManager, xRemoteContext);
m_nEncryptionElementCollectorId = m_xSAXEventKeeper.addSecurityElementCollector(
- ElementMarkPriority.PRI_AFTERMODIFY,
+ ElementMarkPriority.AFTERMODIFY,
true);
m_xSAXEventKeeper.setSecurityId(m_nEncryptionElementCollectorId, m_nSecurityId);
@@ -120,7 +120,7 @@ class EncryptionEntity extends SecurityEntity
args[0] = new Integer(m_nSecurityId).toString();
args[1] = m_xSAXEventKeeper;
args[2] = new Integer(m_nEncryptionElementCollectorId).toString();
- args[3] = m_xXMLSecurityContext;
+ args[3] = m_xXMLSecurityContext.getSecurityEnvironment();
args[4] = m_xXMLEncryption;
xInitialization.initialize(args);
@@ -222,7 +222,7 @@ class EncryptionEntity extends SecurityEntity
int referenceId = m_xSAXEventKeeper.addSecurityElementCollector(
isExporting?
- (ElementMarkPriority.PRI_AFTERMODIFY):(ElementMarkPriority.PRI_BEFOREMODIFY),
+ (ElementMarkPriority.AFTERMODIFY):(ElementMarkPriority.BEFOREMODIFY),
true);
m_xSAXEventKeeper.setSecurityId(referenceId, m_nSecurityId);
diff --git a/xmlsecurity/tools/uno/SecurityEntity.java b/xmlsecurity/tools/uno/SecurityEntity.java
index f813b10cc87f..edfee183116c 100644
--- a/xmlsecurity/tools/uno/SecurityEntity.java
+++ b/xmlsecurity/tools/uno/SecurityEntity.java
@@ -2,9 +2,9 @@
*
* $RCSfile: SecurityEntity.java,v $
*
- * $Revision: 1.1.1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: mt $ $Date: 2004-07-12 13:15:24 $
+ * last change: $Author: rt $ $Date: 2005-03-29 13:34:29 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -194,7 +194,7 @@ class SecurityEntity
{
int referenceId = m_xSAXEventKeeper.addSecurityElementCollector(
isExporting?
- (ElementMarkPriority.PRI_BEFOREMODIFY):(ElementMarkPriority.PRI_AFTERMODIFY),
+ (ElementMarkPriority.BEFOREMODIFY):(ElementMarkPriority.AFTERMODIFY),
false );
setKeyId(referenceId);