Merge branch 'master' into rsafixesforscript

Conflicts: org.jcryptool.crypto.classic.doppelkasten/META-INF/MANIFEST.MF org.jcryptool.crypto.classic.substitution/META-INF/MANIFEST.MF org.jcryptool.crypto.classic.substitution/src/org/jcryptool/crypto/classic/substitution/ui/SubstitutionKeyEditor.java org.jcryptool.crypto.classic.xor/META-INF/MANIFEST.MF org.jcryptool.visual.rsa/src/org/jcryptool/visual/rsa/ui/wizards/wizardpages/NewPublicKeyPage.java
jcryptool · May 18, 2014 · 60113ae · 60113ae
2 parents 96c86f3 + 9f4d025
commit 60113ae
Show file tree

Hide file tree

Showing 856 changed files with 43,560 additions and 23,779 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
-*.class
-*/bin*
-*/target*
-*/.settings*
-.DS_Store
-workspace
-build.xml
-javaCompiler...args
+*.class
+*/bin*
+*/target*
+*/.settings*
+.DS_Store
+workspace
+build.xml
+javaCompiler...args
+Thumbs.db
diff --git a/com.lowagie.itext/.classpath b/com.lowagie.itext/.classpath
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path=""/>
 	<classpathentry kind="output" path="bin"/>

diff --git a/com.lowagie.itext/META-INF/MANIFEST.MF b/com.lowagie.itext/META-INF/MANIFEST.MF
@@ -1,30 +1,30 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: com.lowagie.itext;singleton:=true
-Bundle-Version: 2.1.7
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: com.lowagie.text,
- com.lowagie.text.exceptions,
- com.lowagie.text.factories,
- com.lowagie.text.html,
- com.lowagie.text.html.simpleparser,
- com.lowagie.text.pdf,
- com.lowagie.text.pdf.codec,
- com.lowagie.text.pdf.codec.wmf,
- com.lowagie.text.pdf.collection,
- com.lowagie.text.pdf.crypto,
- com.lowagie.text.pdf.draw,
- com.lowagie.text.pdf.events,
- com.lowagie.text.pdf.fonts,
- com.lowagie.text.pdf.fonts.cmaps,
- com.lowagie.text.pdf.hyphenation,
- com.lowagie.text.pdf.interfaces,
- com.lowagie.text.pdf.internal,
- com.lowagie.text.pdf.parser,
- com.lowagie.text.xml,
- com.lowagie.text.xml.simpleparser,
- com.lowagie.text.xml.xmp,
- com.lowagie.tools
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: com.lowagie.itext;singleton:=true
+Bundle-Version: 2.1.7
+Bundle-Vendor: %Bundle-Vendor
+Export-Package: com.lowagie.text,
+ com.lowagie.text.exceptions,
+ com.lowagie.text.factories,
+ com.lowagie.text.html,
+ com.lowagie.text.html.simpleparser,
+ com.lowagie.text.pdf,
+ com.lowagie.text.pdf.codec,
+ com.lowagie.text.pdf.codec.wmf,
+ com.lowagie.text.pdf.collection,
+ com.lowagie.text.pdf.crypto,
+ com.lowagie.text.pdf.draw,
+ com.lowagie.text.pdf.events,
+ com.lowagie.text.pdf.fonts,
+ com.lowagie.text.pdf.fonts.cmaps,
+ com.lowagie.text.pdf.hyphenation,
+ com.lowagie.text.pdf.interfaces,
+ com.lowagie.text.pdf.internal,
+ com.lowagie.text.pdf.parser,
+ com.lowagie.text.xml,
+ com.lowagie.text.xml.simpleparser,
+ com.lowagie.text.xml.xmp,
+ com.lowagie.tools
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
diff --git a/com.lowagie.itext/pom.xml b/com.lowagie.itext/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<parent>
-		<groupId>org.jcryptool</groupId>
-		<artifactId>org.jcryptool.crypto.parent</artifactId>
-		<version>0.9.8</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.lowagie</groupId>
-	<packaging>eclipse-plugin</packaging>
-	<artifactId>com.lowagie.itext</artifactId>
-	<version>2.1.7</version>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<parent>
+		<groupId>org.jcryptool</groupId>
+		<artifactId>org.jcryptool.crypto.parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.lowagie</groupId>
+	<packaging>eclipse-plugin</packaging>
+	<artifactId>com.lowagie.itext</artifactId>
+	<version>2.1.7</version>
+</project>
diff --git a/com.thoughtworks.xstream/.classpath b/com.thoughtworks.xstream/.classpath
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
     <classpathentry exported="true" kind="lib" path=""/>
 </classpath>
diff --git a/com.thoughtworks.xstream/META-INF/MANIFEST.MF b/com.thoughtworks.xstream/META-INF/MANIFEST.MF
@@ -1,29 +1,29 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: com.thoughtworks.xstream;singleton:=true
-Bundle-Version: 1.3.1
-Bundle-Vendor: %Bundle-Vendor
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: com.thoughtworks.xstream,
- com.thoughtworks.xstream.alias,
- com.thoughtworks.xstream.annotations,
- com.thoughtworks.xstream.converters,
- com.thoughtworks.xstream.converters.basic,
- com.thoughtworks.xstream.converters.collections,
- com.thoughtworks.xstream.converters.enums,
- com.thoughtworks.xstream.converters.extended,
- com.thoughtworks.xstream.converters.javabean,
- com.thoughtworks.xstream.converters.reflection,
- com.thoughtworks.xstream.core,
- com.thoughtworks.xstream.core.util,
- com.thoughtworks.xstream.io,
- com.thoughtworks.xstream.io.binary,
- com.thoughtworks.xstream.io.copy,
- com.thoughtworks.xstream.io.json,
- com.thoughtworks.xstream.io.path,
- com.thoughtworks.xstream.io.xml,
- com.thoughtworks.xstream.io.xml.xppdom,
- com.thoughtworks.xstream.mapper,
- com.thoughtworks.xstream.persistence
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: com.thoughtworks.xstream;singleton:=true
+Bundle-Version: 1.3.1
+Bundle-Vendor: %Bundle-Vendor
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Export-Package: com.thoughtworks.xstream,
+ com.thoughtworks.xstream.alias,
+ com.thoughtworks.xstream.annotations,
+ com.thoughtworks.xstream.converters,
+ com.thoughtworks.xstream.converters.basic,
+ com.thoughtworks.xstream.converters.collections,
+ com.thoughtworks.xstream.converters.enums,
+ com.thoughtworks.xstream.converters.extended,
+ com.thoughtworks.xstream.converters.javabean,
+ com.thoughtworks.xstream.converters.reflection,
+ com.thoughtworks.xstream.core,
+ com.thoughtworks.xstream.core.util,
+ com.thoughtworks.xstream.io,
+ com.thoughtworks.xstream.io.binary,
+ com.thoughtworks.xstream.io.copy,
+ com.thoughtworks.xstream.io.json,
+ com.thoughtworks.xstream.io.path,
+ com.thoughtworks.xstream.io.xml,
+ com.thoughtworks.xstream.io.xml.xppdom,
+ com.thoughtworks.xstream.mapper,
+ com.thoughtworks.xstream.persistence
diff --git a/com.thoughtworks.xstream/pom.xml b/com.thoughtworks.xstream/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<parent>
-		<groupId>org.jcryptool</groupId>
-		<artifactId>org.jcryptool.crypto.parent</artifactId>
-		<version>0.9.8</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.thoughtworks</groupId>
-	<artifactId>com.thoughtworks.xstream</artifactId>
-	<version>1.3.1</version>
-	<packaging>eclipse-plugin</packaging>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<parent>
+		<groupId>org.jcryptool</groupId>
+		<artifactId>org.jcryptool.crypto.parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>com.thoughtworks</groupId>
+	<artifactId>com.thoughtworks.xstream</artifactId>
+	<version>1.3.1</version>
+	<packaging>eclipse-plugin</packaging>
+</project>
diff --git a/org.apache.xalan/.classpath b/org.apache.xalan/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path=""/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path=""/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/org.apache.xalan/META-INF/MANIFEST.MF b/org.apache.xalan/META-INF/MANIFEST.MF
@@ -1,57 +1,57 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %Bundle-Name
-Bundle-SymbolicName: org.apache.xalan
-Bundle-Version: 2.7.1
-Bundle-Vendor: %Bundle-Vendor
-Export-Package: java_cup.runtime,
- org.apache.bcel,
- org.apache.bcel.classfile,
- org.apache.bcel.generic,
- org.apache.bcel.util,
- org.apache.bcel.verifier,
- org.apache.bcel.verifier.exc,
- org.apache.bcel.verifier.statics,
- org.apache.bcel.verifier.structurals,
- org.apache.regexp,
- org.apache.xalan,
- org.apache.xalan.client,
- org.apache.xalan.extensions,
- org.apache.xalan.lib,
- org.apache.xalan.lib.sql,
- org.apache.xalan.processor,
- org.apache.xalan.res,
- org.apache.xalan.serialize,
- org.apache.xalan.templates,
- org.apache.xalan.trace,
- org.apache.xalan.transformer,
- org.apache.xalan.xslt,
- org.apache.xalan.xsltc,
- org.apache.xalan.xsltc.cmdline,
- org.apache.xalan.xsltc.cmdline.getopt,
- org.apache.xalan.xsltc.compiler,
- org.apache.xalan.xsltc.compiler.util,
- org.apache.xalan.xsltc.dom,
- org.apache.xalan.xsltc.runtime,
- org.apache.xalan.xsltc.runtime.output,
- org.apache.xalan.xsltc.trax,
- org.apache.xalan.xsltc.util,
- org.apache.xml.dtm,
- org.apache.xml.dtm.ref,
- org.apache.xml.dtm.ref.dom2dtm,
- org.apache.xml.dtm.ref.sax2dtm,
- org.apache.xml.res,
- org.apache.xml.utils,
- org.apache.xml.utils.res,
- org.apache.xpath,
- org.apache.xpath.axes,
- org.apache.xpath.compiler,
- org.apache.xpath.domapi,
- org.apache.xpath.functions,
- org.apache.xpath.jaxp,
- org.apache.xpath.objects,
- org.apache.xpath.operations,
- org.apache.xpath.patterns,
- org.apache.xpath.res
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Bundle-ActivationPolicy: lazy
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %Bundle-Name
+Bundle-SymbolicName: org.apache.xalan
+Bundle-Version: 2.7.1
+Bundle-Vendor: %Bundle-Vendor
+Export-Package: java_cup.runtime,
+ org.apache.bcel,
+ org.apache.bcel.classfile,
+ org.apache.bcel.generic,
+ org.apache.bcel.util,
+ org.apache.bcel.verifier,
+ org.apache.bcel.verifier.exc,
+ org.apache.bcel.verifier.statics,
+ org.apache.bcel.verifier.structurals,
+ org.apache.regexp,
+ org.apache.xalan,
+ org.apache.xalan.client,
+ org.apache.xalan.extensions,
+ org.apache.xalan.lib,
+ org.apache.xalan.lib.sql,
+ org.apache.xalan.processor,
+ org.apache.xalan.res,
+ org.apache.xalan.serialize,
+ org.apache.xalan.templates,
+ org.apache.xalan.trace,
+ org.apache.xalan.transformer,
+ org.apache.xalan.xslt,
+ org.apache.xalan.xsltc,
+ org.apache.xalan.xsltc.cmdline,
+ org.apache.xalan.xsltc.cmdline.getopt,
+ org.apache.xalan.xsltc.compiler,
+ org.apache.xalan.xsltc.compiler.util,
+ org.apache.xalan.xsltc.dom,
+ org.apache.xalan.xsltc.runtime,
+ org.apache.xalan.xsltc.runtime.output,
+ org.apache.xalan.xsltc.trax,
+ org.apache.xalan.xsltc.util,
+ org.apache.xml.dtm,
+ org.apache.xml.dtm.ref,
+ org.apache.xml.dtm.ref.dom2dtm,
+ org.apache.xml.dtm.ref.sax2dtm,
+ org.apache.xml.res,
+ org.apache.xml.utils,
+ org.apache.xml.utils.res,
+ org.apache.xpath,
+ org.apache.xpath.axes,
+ org.apache.xpath.compiler,
+ org.apache.xpath.domapi,
+ org.apache.xpath.functions,
+ org.apache.xpath.jaxp,
+ org.apache.xpath.objects,
+ org.apache.xpath.operations,
+ org.apache.xpath.patterns,
+ org.apache.xpath.res
+Bundle-RequiredExecutionEnvironment: JavaSE-1.7
+Bundle-ActivationPolicy: lazy
diff --git a/org.apache.xalan/pom.xml b/org.apache.xalan/pom.xml
@@ -1,15 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
-	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<parent>
-		<groupId>org.jcryptool</groupId>
-		<artifactId>org.jcryptool.crypto.parent</artifactId>
-		<version>0.9.8</version>
-	</parent>
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>org.apache</groupId>
-	<version>2.7.1</version>
-	<packaging>eclipse-plugin</packaging>
-	<artifactId>org.apache.xalan</artifactId>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>
+<project
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
+	xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+	<parent>
+		<groupId>org.jcryptool</groupId>
+		<artifactId>org.jcryptool.crypto.parent</artifactId>
+		<version>1.0.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.apache</groupId>
+	<version>2.7.1</version>
+	<packaging>eclipse-plugin</packaging>
+	<artifactId>org.apache.xalan</artifactId>
+</project>
diff --git a/org.apache.xerces/.classpath b/org.apache.xerces/.classpath
@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path=""/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
+	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+	<classpathentry exported="true" kind="lib" path=""/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>