diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-21 08:57:31 +0200 | 
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-21 08:57:31 +0200 | 
| commit | e46fd963799f681d69b1eb7f886979e87e0d6340 (patch) | |
| tree | f704d0effa2cc07bbcfb402da99aa2c2961472d9 /spss/handbook/clients/api | |
| parent | 9766fca0bafff04a06b617d63c89c4b26cc21db4 (diff) | |
| download | moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.tar.gz moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.tar.bz2 moa-id-spss-e46fd963799f681d69b1eb7f886979e87e0d6340.zip | |
Revert "update version management"
This reverts commit e147bdb7da8e48c1483c7732a0eb6b6f54699b66.
Conflicts:
	id/ConfigWebTool/pom.xml
Diffstat (limited to 'spss/handbook/clients/api')
17 files changed, 3 insertions, 324 deletions
| diff --git a/spss/handbook/clients/api/.classpath b/spss/handbook/clients/api/.classpath deleted file mode 100644 index bc5aeac5e..000000000 --- a/spss/handbook/clients/api/.classpath +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> -	<classpathentry kind="src" output="target/classes" path="src/main/java"> -		<attributes> -			<attribute name="optional" value="true"/> -			<attribute name="maven.pomderived" value="true"/> -		</attributes> -	</classpathentry> -	<classpathentry kind="src" output="target/test-classes" path="src/test/java"> -		<attributes> -			<attribute name="optional" value="true"/> -			<attribute name="maven.pomderived" value="true"/> -		</attributes> -	</classpathentry> -	<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> -		<attributes> -			<attribute name="maven.pomderived" value="true"/> -		</attributes> -	</classpathentry> -	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"> -		<attributes> -			<attribute name="maven.pomderived" value="true"/> -		</attributes> -	</classpathentry> -	<classpathentry kind="output" path="target/classes"/> -</classpath> diff --git a/spss/handbook/clients/api/.gitignore b/spss/handbook/clients/api/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/spss/handbook/clients/api/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/spss/handbook/clients/api/.project b/spss/handbook/clients/api/.project deleted file mode 100644 index 3842561f1..000000000 --- a/spss/handbook/clients/api/.project +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> -	<name>moa-spss-handbook-apiClient</name> -	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> -	<projects> -		<project>moa-common</project> -		<project>moa-spss-lib</project> -	</projects> -	<buildSpec> -		<buildCommand> -			<name>org.eclipse.jdt.core.javabuilder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.eclipse.wst.common.project.facet.core.builder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.eclipse.wst.validation.validationbuilder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.maven.ide.eclipse.maven2Builder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.eclipse.m2e.core.maven2Builder</name> -			<arguments> -			</arguments> -		</buildCommand> -	</buildSpec> -	<natures> -		<nature>org.eclipse.m2e.core.maven2Nature</nature> -		<nature>org.maven.ide.eclipse.maven2Nature</nature> -		<nature>org.eclipse.wst.common.project.facet.core.nature</nature> -		<nature>org.eclipse.jdt.core.javanature</nature> -		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> -		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> -	</natures> -</projectDescription> diff --git a/spss/handbook/clients/api/.settings/org.eclipse.core.resources.prefs b/spss/handbook/clients/api/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index e9441bb12..000000000 --- a/spss/handbook/clients/api/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,3 +0,0 @@ -eclipse.preferences.version=1 -encoding//src/main/java=UTF-8 -encoding/<project>=UTF-8 diff --git a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 69c31cd49..000000000 --- a/spss/handbook/clients/api/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,8 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/spss/handbook/clients/api/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/api/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/spss/handbook/clients/api/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 1174e9cf1..000000000 --- a/spss/handbook/clients/api/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Jul 07 16:06:54 CEST 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spss/handbook/clients/api/bin/.gitignore b/spss/handbook/clients/api/bin/.gitignore deleted file mode 100644 index ea8c4bf7f..000000000 --- a/spss/handbook/clients/api/bin/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/target diff --git a/spss/handbook/clients/api/bin/.project b/spss/handbook/clients/api/bin/.project deleted file mode 100644 index 3842561f1..000000000 --- a/spss/handbook/clients/api/bin/.project +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> -	<name>moa-spss-handbook-apiClient</name> -	<comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> -	<projects> -		<project>moa-common</project> -		<project>moa-spss-lib</project> -	</projects> -	<buildSpec> -		<buildCommand> -			<name>org.eclipse.jdt.core.javabuilder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.eclipse.wst.common.project.facet.core.builder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.eclipse.wst.validation.validationbuilder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.maven.ide.eclipse.maven2Builder</name> -			<arguments> -			</arguments> -		</buildCommand> -		<buildCommand> -			<name>org.eclipse.m2e.core.maven2Builder</name> -			<arguments> -			</arguments> -		</buildCommand> -	</buildSpec> -	<natures> -		<nature>org.eclipse.m2e.core.maven2Nature</nature> -		<nature>org.maven.ide.eclipse.maven2Nature</nature> -		<nature>org.eclipse.wst.common.project.facet.core.nature</nature> -		<nature>org.eclipse.jdt.core.javanature</nature> -		<nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> -		<nature>org.eclipse.jem.workbench.JavaEMFNature</nature> -	</natures> -</projectDescription> diff --git a/spss/handbook/clients/api/bin/.settings/org.eclipse.jdt.core.prefs b/spss/handbook/clients/api/bin/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index 56a71c783..000000000 --- a/spss/handbook/clients/api/bin/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Mon Aug 05 10:52:31 CEST 2013 -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.source=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.compliance=1.5 diff --git a/spss/handbook/clients/api/bin/.settings/org.eclipse.m2e.core.prefs b/spss/handbook/clients/api/bin/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1c..000000000 --- a/spss/handbook/clients/api/bin/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/spss/handbook/clients/api/bin/.settings/org.maven.ide.eclipse.prefs b/spss/handbook/clients/api/bin/.settings/org.maven.ide.eclipse.prefs deleted file mode 100644 index 1174e9cf1..000000000 --- a/spss/handbook/clients/api/bin/.settings/org.maven.ide.eclipse.prefs +++ /dev/null @@ -1,9 +0,0 @@ -#Tue Jul 07 16:06:54 CEST 2009 -activeProfiles= -eclipse.preferences.version=1 -fullBuildGoals=process-test-resources -includeModules=false -resolveWorkspaceProjects=true -resourceFilterGoals=process-resources resources\:testResources -skipCompilerPlugin=true -version=1 diff --git a/spss/handbook/clients/api/bin/pom.xml b/spss/handbook/clients/api/bin/pom.xml deleted file mode 100644 index 2d3da3df3..000000000 --- a/spss/handbook/clients/api/bin/pom.xml +++ /dev/null @@ -1,137 +0,0 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -	<parent> -		<groupId>MOA.spss.handbook.clients</groupId> -		<artifactId>moa-spss-handbook-clients</artifactId> -		<version>2.0</version> -	</parent> -	 -	<modelVersion>4.0.0</modelVersion> -	<groupId>MOA.spss.handbook</groupId> -	<artifactId>moa-spss-handbook-apiClient</artifactId> -	<packaging>jar</packaging> -	<version>2.0</version> -	<name>MOA SP/SS Handbook API Client</name> - -	<properties> -		<repositoryPath>${basedir}/../../../../../repository</repositoryPath> -	</properties> - -	<dependencies> -		<dependency> -			<groupId>axis</groupId> -			<artifactId>axis</artifactId> -		</dependency> -		<dependency> -			<groupId>org.apache.axis</groupId> -			<artifactId>axis-jaxrpc</artifactId> -		</dependency> -		<dependency> -			<groupId>org.apache.axis</groupId> -			<artifactId>axis-saaj</artifactId> -		</dependency> -		<dependency> -			<groupId>axis</groupId> -			<artifactId>axis-wsdl4j</artifactId> -		</dependency> -		<dependency> -			<groupId>commons-discovery</groupId> -			<artifactId>commons-discovery</artifactId> -		</dependency> -		<dependency> -			<groupId>commons-logging</groupId> -			<artifactId>commons-logging</artifactId> -		</dependency> -		<dependency> -			<groupId>javax.activation</groupId> -			<artifactId>activation</artifactId> -		</dependency> -		<dependency> -			<groupId>javax.mail</groupId> -			<artifactId>mail</artifactId> -		</dependency> -		<dependency> -			<groupId>junit</groupId> -			<artifactId>junit</artifactId> -		</dependency> -		<dependency> -			<groupId>log4j</groupId> -			<artifactId>log4j</artifactId> -		</dependency> -		<dependency> -			<groupId>postgresql</groupId> -			<artifactId>postgresql</artifactId> -		</dependency> -		<dependency> -			<groupId>javax.servlet</groupId> -			<artifactId>servlet-api</artifactId> -			<!-- <scope>provided</scope>--> -		</dependency> -		<dependency> -			<groupId>xalan-bin-dist</groupId> -			<artifactId>xalan</artifactId> -			<scope>compile</scope> -		</dependency> -		<dependency> -			<groupId>xerces</groupId> -			<artifactId>xercesImpl</artifactId> -		</dependency> -		<dependency> -			<groupId>xalan-bin-dist</groupId> -			<artifactId>xml-apis</artifactId> -		</dependency> -		<dependency> -			<groupId>xalan-bin-dist</groupId> -			<artifactId>serializer</artifactId> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_moa</artifactId> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_ixsil</artifactId> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_jce_full</artifactId> -			<scope>compile</scope> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_ecc</artifactId> -			<scope>compile</scope> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_cms</artifactId> -			<scope>runtime</scope> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_Pkcs11Provider</artifactId> -			<scope>runtime</scope> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_Pkcs11Wrapper</artifactId> -			<scope>runtime</scope> -		</dependency> -		<dependency> -			<groupId>iaik.prod</groupId> -			<artifactId>iaik_Pkcs11Wrapper</artifactId> -			<classifier>win32</classifier> -			<type>dll</type> -			<scope>runtime</scope> -			<optional>true</optional> -		</dependency> -		<dependency> -			<groupId>MOA</groupId> -			<artifactId>moa-common</artifactId> -		</dependency> -		<dependency> -			<groupId>MOA.spss.server</groupId> -			<artifactId>moa-spss-lib</artifactId> -		</dependency> -	</dependencies> - -</project> diff --git a/spss/handbook/clients/api/bin/signatures/SimpleSignature.xml b/spss/handbook/clients/api/bin/signatures/SimpleSignature.xml deleted file mode 100644 index 9ecd215c1..000000000 --- a/spss/handbook/clients/api/bin/signatures/SimpleSignature.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<dsig:Signature Id="signature-1-1" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"><dsig:SignedInfo><dsig:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><dsig:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/><dsig:Reference Id="reference-1-1" URI="#xpointer(id('signed-data-1-1-1')/node())"><dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><dsig:DigestValue>tLODyeiWFbAkQKwhrR23jtcgu4k=</dsig:DigestValue></dsig:Reference></dsig:SignedInfo><dsig:SignatureValue>VEjXB6+geUL16oTPDVx5lcQliGl/oyVobug3BVxVwhu8CU7WK65moTcTuo/CL2hQ</dsig:SignatureValue><dsig:KeyInfo><dsig:X509Data><dsig:X509Certificate>MIID+DCCA2WgAwIBAgIBCTAJBgUrDgMCHQUAMH8xCzAJBgNVBAYTAkFUMSwwKgYD -VQQKEyNTdGFic3RlbGxlIElLVC1TdHJhdGVnaWUgZGVzIEJ1bmRlczEeMBwGA1UE -CxMVVGVjaG5payB1bmQgU3RhbmRhcmRzMSIwIAYDVQQDExlUZXN0IENBIC0gU2ln -bmF0dXJkaWVuc3RlMB4XDTA0MDgwNDA4MjM0OFoXDTA3MDgwNDA4MjM0OFowgZgx -CzAJBgNVBAYTAkFUMS0wKwYDVQQKEyRTdGFic3N0ZWxsZSBJS1QtU3RyYXRlZ2ll -IGRlcyBCdW5kZXMxHjAcBgNVBAsTFVRlY2huaWsgdW5kIFN0YW5kYXJkczE6MDgG -A1UEAxMxVGVzdDogU2lnbmF0dXJkaWVuc3QgYWxsZXIgS3VuZGVuOiBFQ0RTQSAo -UDE5MnYxKTCB8zCBvAYHKoZIzj0CATCBsAIBATAkBgcqhkjOPQEBAhkA//////// -/////////////v//////////MDQEGP////////////////////7//////////AQY -ZCEFGeWcgOcPp+mrciQwSf643uzBRrmxBDEEGI2oDrAwkPZ8vyDrQ6GIAPT/Cv2C -/xASBxkrlf/I2nhjEBHtayTN1XP5d6EeeUgRAhkA////////////////md74NhRr -ybG00igxAgEBAzIABNHWY9lQOE1zgmpcpjTg2WIg6qgEsGhpXELPinJoMPDVheTv -2BZPG42YJsNfvWgC06OCARwwggEYMA4GA1UdDwEB/wQEAwIGwDAMBgNVHRMBAf8E -AjAAMB0GA1UdDgQWBBRHH5EXnrWosCmIa+JyEM5seMxFVzBdBgNVHSAEVjBUMFIG -DCsGAQQBlRIBAgMBATBCMEAGCCsGAQUFBwICMDQaMkRpZXNlcyBaZXJ0aWZpa2F0 -IGlzdCBudXIgZvxyIFRlc3R6d2Vja2UgZ2VlaWduZXQuMEMGA1UdHwQ8MDowOKA2 -oDSGMmh0dHA6Ly9sYWJzLmNpby5ndi5hdC90ZW1wL2NybHMvc2lnbmF0dXJkaWVu -c3QuY3JsMBQGByooAAoBAQEECQwHQktBLUlLVDAfBgNVHSMEGDAWgBRAl0P5fWaw -vf59+uxGcYY9wffZPTAJBgUrDgMCHQUAA4GBAIMKUsnajgfBtpHeDdMdQMLA8fdt -lluezDOM78WYYSFURP04QZk5iHkShzptgZCF5Y/T4an3dC3SnytL67LJvEoKUyja -iTMLo7650xRTvAjTaMJ+nly/wTRYJKplOLXKWj3WwfObMHXdsDE8NJmpJSRE7Sw7 -+tj+UiTiNNSaXirq</dsig:X509Certificate></dsig:X509Data></dsig:KeyInfo><dsig:Object Id="signed-data-1-1-1">Diese Daten werden signiert.</dsig:Object></dsig:Signature>
\ No newline at end of file diff --git a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.class b/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.classBinary files differ deleted file mode 100644 index 472793a75..000000000 --- a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/CreateXMLSignature.class +++ /dev/null diff --git a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.class b/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.classBinary files differ deleted file mode 100644 index 38a1a386e..000000000 --- a/spss/handbook/clients/api/bin/src/main/java/at/gv/egovernment/moa/spss/handbook/clients/api/VerifyXMLSignature.class +++ /dev/null diff --git a/spss/handbook/clients/api/pom.xml b/spss/handbook/clients/api/pom.xml index da2101414..52a96c56b 100644 --- a/spss/handbook/clients/api/pom.xml +++ b/spss/handbook/clients/api/pom.xml @@ -9,6 +9,7 @@  	<groupId>MOA.spss.handbook</groupId>
  	<artifactId>moa-spss-handbook-apiClient</artifactId>
  	<packaging>jar</packaging>
 +	<version>2.0</version>
  	<name>MOA SP/SS Handbook API Client</name>
  	<properties>
 @@ -134,7 +135,7 @@  	</dependencies>
      <build>
          <plugins>
 -<!--         		<plugin>
 +        		<plugin>
              		<groupId>org.codehaus.mojo</groupId>
              		<artifactId>properties-maven-plugin</artifactId>
              		<version>1.0-alpha-2</version>
 @@ -151,7 +152,7 @@            		          </configuration>
                		  </execution>
              		</executions>
 -        		</plugin> -->
 +        		</plugin>
          	</plugins>
         </build>
  </project>
 | 
