diff options
| author | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-01-27 17:42:51 +0100 |
|---|---|---|
| committer | Bojan Suzic <bojan.suzic@iaik.tugraz.at> | 2014-01-27 17:42:51 +0100 |
| commit | aba2defe8f95cf960395158f6eb2ad7b1fb6e150 (patch) | |
| tree | 298a0165a30b8538b89abb93a399c615f91702d3 /id/server/proxy | |
| parent | ed9ad9b0c13ee0de3231bab038f35b01beeb0d0b (diff) | |
| parent | cea2f395ec773b386ec628d60120752cf320f6b6 (diff) | |
| download | moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.tar.gz moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.tar.bz2 moa-id-spss-aba2defe8f95cf960395158f6eb2ad7b1fb6e150.zip | |
merging
Diffstat (limited to 'id/server/proxy')
| -rw-r--r-- | id/server/proxy/.settings/org.eclipse.wst.common.component | 4 | ||||
| -rw-r--r-- | id/server/proxy/moa-id-proxy.iml | 12 | ||||
| -rw-r--r-- | id/server/proxy/pom.xml | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component index 5b7986017..e1f55f641 100644 --- a/id/server/proxy/.settings/org.eclipse.wst.common.component +++ b/id/server/proxy/.settings/org.eclipse.wst.common.component @@ -6,13 +6,13 @@ <dependent-module archiveName="moa-common-2.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-common/moa-common">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="moa-id-lib-1.9.97-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
+ <dependent-module archiveName="moa-id-lib-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-lib/moa-id-lib">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="stork-saml-engine-1.5.2.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/stork-saml-engine/stork-saml-engine">
<dependency-type>uses</dependency-type>
</dependent-module>
- <dependent-module archiveName="moa-id-commons-1.9.97-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
+ <dependent-module archiveName="moa-id-commons-1.9.96-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons">
<dependency-type>uses</dependency-type>
</dependent-module>
<property name="context-root" value="moa-id-proxy"/>
diff --git a/id/server/proxy/moa-id-proxy.iml b/id/server/proxy/moa-id-proxy.iml index 10a3ee912..dd5809d75 100644 --- a/id/server/proxy/moa-id-proxy.iml +++ b/id/server/proxy/moa-id-proxy.iml @@ -13,8 +13,8 @@ </facet> </component> <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/target/classes" /> - <output-test url="file://$MODULE_DIR$/target/test-classes" /> + <output url="file://$MODULE_DIR$/../../target/classes" /> + <output-test url="file://$MODULE_DIR$/../../target/test-classes" /> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/target" /> </content> @@ -22,10 +22,6 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="Maven: org.opensaml:openws:1.5.0" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:slf4j-log4j12:1.6.6" level="project" /> - <orderEntry type="library" name="Maven: eu.stork:saml-engine:1.1.0" level="project" /> - <orderEntry type="library" name="Maven: eu.stork:stork-commons:1.1.0" level="project" /> - <orderEntry type="library" name="Maven: org.slf4j:slf4j-simple:1.7.5" level="project" /> - <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> <orderEntry type="library" name="Maven: axis:axis:1.0_IAIK" level="project" /> <orderEntry type="module" module-name="moa-spss-lib" /> <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" /> @@ -62,7 +58,7 @@ <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.2.5" level="project" /> <orderEntry type="library" name="Maven: org.xerial:sqlite-jdbc:3.7.8-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: iaik.prod:iaik_jsse:4.4" level="project" /> - <orderEntry type="module" module-name="moa-id-lib" /> + <orderEntry type="library" name="Maven: MOA.id.server:moa-id-lib:1.9.97-SNAPSHOT" level="project" /> <orderEntry type="module" module-name="stork-saml-engine" /> <orderEntry type="library" name="Maven: org.opensaml:opensaml:2.5.3" level="project" /> <orderEntry type="library" name="Maven: org.opensaml:openws:1.4.4" level="project" /> @@ -89,7 +85,7 @@ <orderEntry type="library" name="Maven: org.slf4j:log4j-over-slf4j:1.7.5" level="project" /> <orderEntry type="library" name="Maven: org.slf4j:jul-to-slf4j:1.7.5" level="project" /> <orderEntry type="library" name="Maven: commons-io:commons-io:2.2" level="project" /> - <orderEntry type="module" module-name="moa-id-commons" /> + <orderEntry type="library" name="Maven: MOA.id.server:moa-id-commons:1.9.97-SNAPSHOT" level="project" /> <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:4.2.1.Final" level="project" /> <orderEntry type="library" name="Maven: antlr:antlr:2.7.7" level="project" /> <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging:3.1.0.GA" level="project" /> diff --git a/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index 212ddda71..c7cb9a7c8 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -2,7 +2,7 @@ <parent>
<groupId>MOA.id</groupId>
<artifactId>moa-id</artifactId>
- <version>1.9.97-SNAPSHOT</version>
+ <version>1.9.96-SNAPSHOT</version>
</parent>
<properties>
|