diff options
author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-20 16:18:21 +0200 |
---|---|---|
committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-05-20 16:18:21 +0200 |
commit | e147bdb7da8e48c1483c7732a0eb6b6f54699b66 (patch) | |
tree | 2ae0c9764f69394df4d159b9c59c34d82bd3fe1f /id/server/proxy | |
parent | 4c2e09ce5137642dca0b79be60ccc37fa8ac5dc3 (diff) | |
download | moa-id-spss-e147bdb7da8e48c1483c7732a0eb6b6f54699b66.tar.gz moa-id-spss-e147bdb7da8e48c1483c7732a0eb6b6f54699b66.tar.bz2 moa-id-spss-e147bdb7da8e48c1483c7732a0eb6b6f54699b66.zip |
update version management
Diffstat (limited to 'id/server/proxy')
-rw-r--r-- | id/server/proxy/.classpath | 26 | ||||
-rw-r--r-- | id/server/proxy/.gitignore | 2 | ||||
-rw-r--r-- | id/server/proxy/.project | 40 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.eclipse.core.resources.prefs | 2 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.eclipse.jdt.core.prefs | 8 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.eclipse.wst.common.component | 25 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml | 7 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.eclipse.wst.validation.prefs | 2 | ||||
-rw-r--r-- | id/server/proxy/.settings/org.maven.ide.eclipse.prefs | 8 | ||||
-rw-r--r-- | id/server/proxy/pom.xml | 4 |
11 files changed, 126 insertions, 2 deletions
diff --git a/id/server/proxy/.classpath b/id/server/proxy/.classpath new file mode 100644 index 000000000..bc5aeac5e --- /dev/null +++ b/id/server/proxy/.classpath @@ -0,0 +1,26 @@ +<?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/id/server/proxy/.gitignore b/id/server/proxy/.gitignore new file mode 100644 index 000000000..4dc009173 --- /dev/null +++ b/id/server/proxy/.gitignore @@ -0,0 +1,2 @@ +/target +/bin diff --git a/id/server/proxy/.project b/id/server/proxy/.project new file mode 100644 index 000000000..398564ccb --- /dev/null +++ b/id/server/proxy/.project @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>moa-id-proxy</name> + <comment>NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment> + <projects> + <project>moa-spss-lib</project> + <project>moa-common</project> + <project>stork-saml-engine</project> + <project>moa-id-commons</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.eclipse.m2e.core.maven2Builder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + <nature>org.eclipse.m2e.core.maven2Nature</nature> + <nature>org.eclipse.wst.common.project.facet.core.nature</nature> + <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature> + <nature>org.eclipse.jem.workbench.JavaEMFNature</nature> + </natures> +</projectDescription> diff --git a/id/server/proxy/.settings/org.eclipse.core.resources.prefs b/id/server/proxy/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 000000000..99f26c020 --- /dev/null +++ b/id/server/proxy/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/id/server/proxy/.settings/org.eclipse.jdt.core.prefs b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 000000000..69c31cd49 --- /dev/null +++ b/id/server/proxy/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,8 @@ +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/id/server/proxy/.settings/org.eclipse.m2e.core.prefs b/id/server/proxy/.settings/org.eclipse.m2e.core.prefs new file mode 100644 index 000000000..f897a7f1c --- /dev/null +++ b/id/server/proxy/.settings/org.eclipse.m2e.core.prefs @@ -0,0 +1,4 @@ +activeProfiles= +eclipse.preferences.version=1 +resolveWorkspaceProjects=true +version=1 diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.component b/id/server/proxy/.settings/org.eclipse.wst.common.component new file mode 100644 index 000000000..0c677de0e --- /dev/null +++ b/id/server/proxy/.settings/org.eclipse.wst.common.component @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0"> + <wb-module deploy-name="moa-id-proxy"> + <dependent-module archiveName="moa-spss-lib-2.0.1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-spss-lib/moa-spss-lib"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="moa-common-2.0.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-2.1.0-RC1.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="moa-id-commons-2.1.0-RC1.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/moa-id-commons/moa-id-commons"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="SamlEngine-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/SamlEngine/SamlEngine"> + <dependency-type>uses</dependency-type> + </dependent-module> + <dependent-module archiveName="Commons-1.4.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/Commons/Commons"> + <dependency-type>uses</dependency-type> + </dependent-module> + <property name="context-root" value="moa-id-proxy"/> + <wb-resource deploy-path="/" source-path="src/main/webapp"/> + <property name="java-output-path" value="/target/classes"/> + </wb-module> +</project-modules> diff --git a/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml new file mode 100644 index 000000000..3d344ed7f --- /dev/null +++ b/id/server/proxy/.settings/org.eclipse.wst.common.project.facet.core.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<faceted-project> + <fixed facet="jst.java"/> + <fixed facet="jst.web"/> + <installed facet="jst.web" version="2.4"/> + <installed facet="jst.java" version="5.0"/> +</faceted-project>
\ No newline at end of file diff --git a/id/server/proxy/.settings/org.eclipse.wst.validation.prefs b/id/server/proxy/.settings/org.eclipse.wst.validation.prefs new file mode 100644 index 000000000..04cad8cb7 --- /dev/null +++ b/id/server/proxy/.settings/org.eclipse.wst.validation.prefs @@ -0,0 +1,2 @@ +disabled=06target +eclipse.preferences.version=1 diff --git a/id/server/proxy/.settings/org.maven.ide.eclipse.prefs b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs new file mode 100644 index 000000000..5fed4cf5a --- /dev/null +++ b/id/server/proxy/.settings/org.maven.ide.eclipse.prefs @@ -0,0 +1,8 @@ +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/id/server/proxy/pom.xml b/id/server/proxy/pom.xml index dbae5ca30..8a8d3c5be 100644 --- a/id/server/proxy/pom.xml +++ b/id/server/proxy/pom.xml @@ -26,7 +26,7 @@ <build>
<plugins>
- <plugin>
+<!-- <plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
@@ -43,7 +43,7 @@ </configuration>
</execution>
</executions>
- </plugin>
+ </plugin> -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
|