diff options
| -rw-r--r-- | id.server/.classpath | 18 | ||||
| -rw-r--r-- | id.server/.cvsignore | 3 | ||||
| -rw-r--r-- | id.server/.project | 1 | ||||
| -rw-r--r-- | id.server/.tomcatplugin | 18 | ||||
| -rw-r--r-- | id.server/build.xml | 13 |
5 files changed, 33 insertions, 20 deletions
diff --git a/id.server/.classpath b/id.server/.classpath index 296c5f2ea..4cb701e3c 100644 --- a/id.server/.classpath +++ b/id.server/.classpath @@ -24,13 +24,15 @@ <classpathentry kind="lib" path="lib/axis-1.1rc2/commons-discovery.jar"/> <classpathentry kind="lib" path="lib/axis-1.1rc2/jaxrpc.jar"/> <classpathentry kind="lib" path="lib/axis-1.1rc2/saaj.jar"/> - <classpathentry kind="lib" path="lib/moa-spss-1.0.8a/moa-spss.jar"/> <classpathentry kind="src" path="/common"/> - <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_ecc.jar"/> - <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_jce_full.jar"/> - <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_ldap.jar"/> - <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik_X509TrustManager.jar"/> - <classpathentry kind="lib" path="lib/iaik-moa-1.06/iaik-moa-full.jar"/> - <classpathentry kind="lib" path="lib/iaik-moa-1.06/ixsil.jar"/> - <classpathentry kind="output" path="bin"/> + <classpathentry kind="lib" + path="E:/Projekte/EclipseWorkspace/id.server/lib/moa-spss-1.2d01/moa-spss.jar" sourcepath="/spss.server/src"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_ecc.jar"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_jce_full.jar"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik-moa-full.jar"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaikPkcs11Provider.jar"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaikPkcs11Wrapper.jar"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/ixsil.jar"/> + <classpathentry kind="lib" path="lib/iaik-moa-20030703/iaik_X509TrustManager.jar"/> + <classpathentry kind="output" path="WEB-INF/classes"/> </classpath> diff --git a/id.server/.cvsignore b/id.server/.cvsignore index 7c18d5ded..5cf4d9dae 100644 --- a/id.server/.cvsignore +++ b/id.server/.cvsignore @@ -1,2 +1,5 @@ bin tmp +WEB-INF +errorpage.jsp +work diff --git a/id.server/.project b/id.server/.project index 4ad8f922f..1100ed330 100644 --- a/id.server/.project +++ b/id.server/.project @@ -14,5 +14,6 @@ </buildSpec> <natures> <nature>org.eclipse.jdt.core.javanature</nature> + <nature>com.sysdeo.eclipse.tomcat.tomcatnature</nature> </natures> </projectDescription> diff --git a/id.server/.tomcatplugin b/id.server/.tomcatplugin index 1916163e0..d2034ee96 100644 --- a/id.server/.tomcatplugin +++ b/id.server/.tomcatplugin @@ -1,8 +1,10 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<tomcatProjectProperties>
- <rootDir>/</rootDir>
- <exportSource>false</exportSource>
- <updateXml>true</updateXml>
- <warLocation></warLocation>
- <webPath>/id.server</webPath>
-</tomcatProjectProperties>
+<?xml version="1.0" encoding="UTF-8"?> +<tomcatProjectProperties> + <rootDir>/</rootDir> + <exportSource>false</exportSource> + <reloadable>true</reloadable> + <redirectLogger>true</redirectLogger> + <updateXml>true</updateXml> + <warLocation>E:\Projekte\EclipseWorkspace\id.server\moa-id-auth.war</warLocation> + <webPath>/moa-id-auth</webPath> +</tomcatProjectProperties> diff --git a/id.server/build.xml b/id.server/build.xml index 708eab22f..4d5051a21 100644 --- a/id.server/build.xml +++ b/id.server/build.xml @@ -8,7 +8,7 @@ --> <project name="moa.id.server" default="dist-all" basedir="."> <property environment="env"/> - <property name="version" value="1.1"/> + <property name="version" value="1.1.1D01"/> <property name="src" value="src"/> <property name="res" value="res"/> <property name="data" value="data"/> @@ -35,13 +35,13 @@ <property name="lib" value="lib"/> <property name="lib.axis" value="${lib}/axis-1.1rc2"/> <property name="lib.commons-logging" value="${lib}/commons-logging-1.0.2"/> - <property name="lib.iaik-moa" value="${lib}/iaik-moa-1.06"/> + <property name="lib.iaik-moa" value="${lib}/iaik-moa-20030703"/> <property name="lib.jaxen" value="${lib}/jaxen-1.0"/> <property name="lib.jaxp" value="${lib}/jaxp-1.2_01"/> <property name="lib.jsse" value="${lib}/jsse-1.0.3_01"/> <property name="lib.junit" value="${lib}/junit-3.8.1"/> <property name="lib.log4j" value="${lib}/log4j-1.2.7"/> - <property name="lib.moa-spss" value="${lib}/moa-spss-1.0.8a"/> + <property name="lib.moa-spss" value="${lib}/moa-spss-1.2d01"/> <property name="lib.postgres-jdbc" value="${lib}/postgres-jdbc2-7.3"/> <property name="lib.servlet" value="${lib}/servlet-2.3"/> <property name="lib.xalan" value="${lib}/xalan-j-2.2"/> @@ -114,6 +114,7 @@ <exclude name="test/**"/> </classes> <classes dir="${res}"/> + <zipfileset file="${res}/resources/wsdl/MOA-SPSS-1.2.xsd" prefix="resources/schemas"/> </war> </target> @@ -145,6 +146,7 @@ version="false" use="true" windowtitle="MOA ID API" + useexternalfile="yes" sourcefiles= "src/at/gv/egovernment/moa/id/auth/AuthenticationServer.java,src/at/gv/egovernment/moa/id/AuthenticationException.java,src/at/gv/egovernment/moa/id/data/AuthenticationData.java,src/at/gv/egovernment/moa/id/proxy/ConnectionBuilder.java,src/at/gv/egovernment/moa/id/config/proxy/OAConfiguration.java,src/at/gv/egovernment/moa/id/proxy/LoginParameterResolver.java" > @@ -161,7 +163,8 @@ author="true" version="true" use="true" - windowtitle="MOA ID Server Internal API"> + windowtitle="MOA ID Server Internal API" + useexternalfile="yes"> <packageset dir="${prj.common}/src"> <exclude name="test/**"/> </packageset> @@ -239,6 +242,7 @@ </copy> <copy toDir="${dist.auth}/endorsed"> <fileset dir="${lib.xerces}"/> + <fileset dir="${lib.xalan}"/> </copy> <copy todir="${dist.auth}/tomcat"> <fileset dir="${data}/deploy/tomcat"/> @@ -272,6 +276,7 @@ </copy> <copy toDir="${dist.proxy}/endorsed"> <fileset dir="${lib.xerces}"/> + <fileset dir="${lib.xalan}"/> </copy> <copy todir="${dist.proxy}/tomcat"> <fileset dir="${data}/deploy/tomcat"/> |