You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by co...@apache.org on 2012/06/27 18:18:12 UTC
svn commit: r1354606 - in /santuario/xml-security-java/trunk/src:
main/java/org/apache/xml/security/c14n/implementations/
main/java/org/swssf/xmlsec/ext/
main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/
main/java/org/swssf/xmlsec/impl/util/ t...
Author: coheigea
Date: Wed Jun 27 16:17:59 2012
New Revision: 1354606
URL: http://svn.apache.org/viewvc?rev=1354606&view=rev
Log:
Removing some duplicate classes
Added:
santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/RFC2253ParserTest.java
- copied, changed from r1354576, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java
Removed:
santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/UtfHelpper.java
santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/util/RFC2253Parser.java
santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/ext/AbstractOutputProcessor.java
santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java?rev=1354606&r1=1354605&r2=1354606&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/xml/security/c14n/implementations/UtfHelpper.java Wed Jun 27 16:17:59 2012
@@ -22,9 +22,13 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
-public class UtfHelpper {
+public final class UtfHelpper {
+
+ private UtfHelpper() {
+ // complete
+ }
- static final void writeByte(
+ public static final void writeByte(
final String str,
final OutputStream out,
Map<String, byte[]> cache
@@ -38,7 +42,7 @@ public class UtfHelpper {
out.write(result);
}
- static final void writeCharToUtf8(final char c, final OutputStream out) throws IOException {
+ public static final void writeCharToUtf8(final char c, final OutputStream out) throws IOException {
if (c < 0x80) {
out.write(c);
return;
@@ -73,7 +77,7 @@ public class UtfHelpper {
}
- static final void writeStringToUtf8(
+ public static final void writeStringToUtf8(
final String str,
final OutputStream out
) throws IOException{
Modified: santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/ext/AbstractOutputProcessor.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/ext/AbstractOutputProcessor.java?rev=1354606&r1=1354605&r2=1354606&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/ext/AbstractOutputProcessor.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/ext/AbstractOutputProcessor.java Wed Jun 27 16:17:59 2012
@@ -18,9 +18,9 @@
*/
package org.swssf.xmlsec.ext;
+import org.apache.xml.security.utils.RFC2253Parser;
import org.swssf.xmlsec.ext.stax.*;
import org.swssf.xmlsec.impl.EncryptionPartDef;
-import org.swssf.xmlsec.impl.util.RFC2253Parser;
import javax.xml.namespace.QName;
import javax.xml.stream.XMLStreamException;
Modified: santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java?rev=1354606&r1=1354605&r2=1354606&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/swssf/xmlsec/impl/transformer/canonicalizer/CanonicalizerBase.java Wed Jun 27 16:17:59 2012
@@ -18,6 +18,7 @@
*/
package org.swssf.xmlsec.impl.transformer.canonicalizer;
+import org.apache.xml.security.c14n.implementations.UtfHelpper;
import org.swssf.xmlsec.ext.Transformer;
import org.swssf.xmlsec.ext.XMLSecurityException;
import org.swssf.xmlsec.ext.XMLSecurityUtils;
Copied: santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/RFC2253ParserTest.java (from r1354576, santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java)
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/RFC2253ParserTest.java?p2=santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/RFC2253ParserTest.java&p1=santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java&r1=1354576&r2=1354606&rev=1354606&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/test/java/org/swssf/xmlsec/test/RFC2253ParserTest.java (original)
+++ santuario/xml-security-java/trunk/src/test/java/org/apache/xml/security/test/utils/RFC2253ParserTest.java Wed Jun 27 16:17:59 2012
@@ -16,13 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.swssf.xmlsec.test;
+package org.apache.xml.security.test.utils;
+import org.apache.xml.security.utils.RFC2253Parser;
import org.junit.Assert;
import org.junit.Test;
-import org.swssf.xmlsec.impl.util.RFC2253Parser;
-
/**
* @author $Author$
* @version $Revision$ $Date$