diff options
| author | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
|---|---|---|
| committer | Thomas Lenz <tlenz@iaik.tugraz.at> | 2014-09-15 13:42:36 +0200 |
| commit | 8074865580b5fa28817b37c9ad2e8c992ebef977 (patch) | |
| tree | 475cd1ed9bc517dffbf023e7d9c7d16ce2bde8c5 /id/server/doc/conf/Catalina | |
| parent | 234f17d14f9f48655c27d54114df0aa2593cf6d8 (diff) | |
| parent | 714a8cb32dd5585829dfc1926e56971425a2a692 (diff) | |
| download | moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.gz moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.tar.bz2 moa-id-spss-8074865580b5fa28817b37c9ad2e8c992ebef977.zip | |
Merge branch 'moa-2.1-Snapshot'
Conflicts:
id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
pom.xml
Diffstat (limited to 'id/server/doc/conf/Catalina')
| -rw-r--r-- | id/server/doc/conf/Catalina/localhost/proxy.xml | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/id/server/doc/conf/Catalina/localhost/proxy.xml b/id/server/doc/conf/Catalina/localhost/proxy.xml deleted file mode 100644 index eef60b953..000000000 --- a/id/server/doc/conf/Catalina/localhost/proxy.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - - Context configuration file for the MOA-Proxy App - - aus einer Tomcat 4.x.xx server.xml Datei: - <Context path="" docBase="../moa-id-proxy.war" debug="0"/> - ---> -<Context path="" docBase="${catalina.base}/webappsProxy/moa-id-proxy.war" privileged="true" - - antiResourceLocking="false" antiJARLocking="false"> - -<!-- -<ResourceLink name="users" global="UserDatabase" - type="org.apache.catalina.UserDatabase"/> ---> - - <!-- Uncomment this Valve to limit access to the Admin app to localhost - for obvious security reasons. Allow may be a comma-separated list of - hosts (or even regular expressions). - <Valve className="org.apache.catalina.valves.RemoteAddrValve" - allow="127.0.0.1"/> - --> - -</Context> |