Add alias for external resources and allow to add custom libs

GluuFederation · Apr 5, 2016 · 85a4971 · 85a4971
1 parent 3ff1a72
commit 85a4971
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/server/src/main/java/org/gluu/oxtrust/config/OxTrustConfiguration.java b/server/src/main/java/org/gluu/oxtrust/config/OxTrustConfiguration.java
@@ -68,6 +68,7 @@ public class OxTrustConfiguration {
     public static final String DIR = BASE_DIR + File.separator + "conf" + File.separator;
 
 	public static final String LDAP_PROPERTIES_FILE = DIR + "oxtrust-ldap.properties";
+	public static final String LDAP_DEFAULT_PROPERTIES_FILE = DIR + "ox-ldap.properties";
 	public static final String LDAP_CENTRAL_PROPERTIES_FILE = DIR + "oxtrust-central-ldap.properties";
 
 	public static final String APPLICATION_CONFIGURATION = "oxtrust-config.json";

diff --git a/server/src/main/webapp/META-INF/context.xml b/server/src/main/webapp/META-INF/context.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Context path="/oxTrust" docBase="oxTrust"
-         debug="5" reloadable="true" crossContext="true">
+<Context antiJARLocking="true" path="/identity" aliases="/ext/resources=${gluu.external.resource.base}/oxtrust/resources">
 
   <Resource name="jdbc/inumDB" auth="Container" type="javax.sql.DataSource"
                maxActive="100" maxIdle="30" maxWait="10000"
                driverClassName="com.mysql.jdbc.Driver"
                username="inumbase" password="InUmB@53"
                url="jdbc:mysql://${db.inumdb.host}:3306/inumbase?autoReconnect=true" validationQuery="select 1"/>
 
-
+	<Loader className="org.apache.catalina.loader.VirtualWebappLoader"
+            virtualClasspath="${gluu.external.resource.base}/oxauth/libs/*.jar"/>
+
 </Context>