summaryrefslogtreecommitdiff
path: root/xmlsecurity
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2005-03-29 12:35:06 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2005-03-29 12:35:06 +0000
commitc72c76c7dcb15b7ef30112a3c0684c86cfe44796 (patch)
tree4635c9879e1e124a1bd103e5df1758a38b16ffe5 /xmlsecurity
parent6ad0c7a4bfc40332c69d9e69dcaa71ca5b6a2522 (diff)
INTEGRATION: CWS xmlsec10 (1.1.1.1.38); FILE MERGED
2005/03/24 08:20:59 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/SignatureEntity.java12
-rw-r--r--xmlsecurity/tools/uno/TestTool.java14
2 files changed, 13 insertions, 13 deletions
diff --git a/xmlsecurity/tools/uno/SignatureEntity.java b/xmlsecurity/tools/uno/SignatureEntity.java
index 613d38bfd7dd..e96b0d244ec9 100644
--- a/xmlsecurity/tools/uno/SignatureEntity.java
+++ b/xmlsecurity/tools/uno/SignatureEntity.java
@@ -2,9 +2,9 @@
*
* $RCSfile: SignatureEntity.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:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -98,7 +98,7 @@ class SignatureEntity extends SecurityEntity
if (isExporting)
{
m_nSignatureElementCollectorId = m_xSAXEventKeeper.addSecurityElementCollector(
- ElementMarkPriority.PRI_AFTERMODIFY,
+ ElementMarkPriority.AFTERMODIFY,
true);
m_xSAXEventKeeper.setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
@@ -126,7 +126,7 @@ class SignatureEntity extends SecurityEntity
args[0] = new Integer(m_nSecurityId).toString();
args[1] = m_xSAXEventKeeper;
args[2] = new Integer(m_nSignatureElementCollectorId).toString();
- args[3] = m_xXMLSecurityContext;
+ args[3] = m_xXMLSecurityContext.getSecurityEnvironment();
args[4] = m_xXMLSignature;
xInitialization.initialize(args);
@@ -159,7 +159,7 @@ class SignatureEntity extends SecurityEntity
else
{
m_nSignatureElementCollectorId = m_xSAXEventKeeper.addSecurityElementCollector(
- ElementMarkPriority.PRI_BEFOREMODIFY, false);
+ ElementMarkPriority.BEFOREMODIFY, false);
m_xSAXEventKeeper.setSecurityId(m_nSignatureElementCollectorId, m_nSecurityId);
@@ -290,7 +290,7 @@ class SignatureEntity extends SecurityEntity
{
int referenceId = m_xSAXEventKeeper.addSecurityElementCollector(
isExporting?
- (ElementMarkPriority.PRI_AFTERMODIFY):(ElementMarkPriority.PRI_BEFOREMODIFY),
+ (ElementMarkPriority.AFTERMODIFY):(ElementMarkPriority.BEFOREMODIFY),
false );
m_xSAXEventKeeper.setSecurityId(referenceId, m_nSecurityId);
diff --git a/xmlsecurity/tools/uno/TestTool.java b/xmlsecurity/tools/uno/TestTool.java
index ceab55e4e0ed..8149d60a22ee 100644
--- a/xmlsecurity/tools/uno/TestTool.java
+++ b/xmlsecurity/tools/uno/TestTool.java
@@ -2,9 +2,9 @@
*
* $RCSfile: TestTool.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:35:06 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -150,10 +150,10 @@ public class TestTool extends JFrame implements ActionListener
/*
* C-based component names
*/
- public static String SEINITIALIZER_COMPONENT_C = "com.sun.star.xml.security.bridge.xmlsec.SEInitializer_NssImpl";
- public static String XMLSIGNATURE_COMPONENT_C = "com.sun.star.xml.security.bridge.xmlsec.XMLSignature_NssImpl";
- public static String XMLENCRYPTION_COMPONENT_C = "com.sun.star.xml.security.bridge.xmlsec.XMLEncryption_NssImpl";
- public static String XMLDOCUMENTWRAPPER_COMPONENT_C = "com.sun.star.xml.security.bridge.xmlsec.XMLDocumentWrapper_XmlSecImpl";
+ public static String SEINITIALIZER_COMPONENT_C = "com.sun.star.xml.crypto.SEInitializer";
+ public static String XMLSIGNATURE_COMPONENT_C = "com.sun.star.xml.crypto.XMLSignature";
+ public static String XMLENCRYPTION_COMPONENT_C = "com.sun.star.xml.crypto.XMLEncryption";
+ public static String XMLDOCUMENTWRAPPER_COMPONENT_C = "com.sun.star.xml.wrapper.XMLDocumentWrapper";
/* url resolver name */
public static String UNOURLRESOLVER = "com.sun.star.bridge.UnoUrlResolver";
@@ -435,7 +435,7 @@ public class TestTool extends JFrame implements ActionListener
m_startButton.setEnabled(false);
m_isExportingButton = new JCheckBox("export, not import", true);
- m_isJavaComponentButton = new JCheckBox("java, not C++", false);
+ m_isJavaComponentButton = new JCheckBox("use java component", false);
m_saveButton = new JButton("Save...");
m_saveButton.addActionListener(this);