summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjakefeasel <jfeasel@gmail.com>2012-10-14 11:27:12 -0700
committerjakefeasel <jfeasel@gmail.com>2012-10-14 11:27:12 -0700
commitb28c6cee59a80fd0de0e84426ba71f1ab2d3f049 (patch)
tree48af9a241c6f315535b7ecd235c302db98cd7cd9
parent9d2e09880067c9b5b34e43e4765eda65858cdc46 (diff)
downloadsqlfiddle-b28c6cee59a80fd0de0e84426ba71f1ab2d3f049.zip
sqlfiddle-b28c6cee59a80fd0de0e84426ba71f1ab2d3f049.tar.gz
sqlfiddle-b28c6cee59a80fd0de0e84426ba71f1ab2d3f049.tar.bz2
Fixing hardcoded pw in plugin; moving around railo config for flexibility
-rw-r--r--.gitignore1
-rw-r--r--src/main/webapp/WEB-INF/web.xml.example69
-rw-r--r--src/main/webapp/plugins/CFAdminDSN-0.1.zipbin2437 -> 2434 bytes
-rw-r--r--src/main/webapp/plugins/CFAdminDSN/railo.cfm2
4 files changed, 71 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 33f3b5d..6a4e76c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
src/main/webapp/WEB-INF/flex/
src/main/webapp/WEB-INF/railo/
src/main/webapp/WEB-INF/lib/
+src/main/webapp/WEB-INF/web.xml
src/main/webapp/.project
src/main/webapp/.DS_Store
src/main/webapp/config/production/settings.cfm
diff --git a/src/main/webapp/WEB-INF/web.xml.example b/src/main/webapp/WEB-INF/web.xml.example
new file mode 100644
index 0000000..cd40c16
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml.example
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<web-app xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ version="2.5">
+
+ <!-- =================================================================== -->
+ <!-- Invoke the Railo Servlet -->
+ <!-- =================================================================== -->
+
+<servlet>
+ <servlet-name>GlobalCFMLServlet</servlet-name>
+ <description>CFML runtime Engine</description>
+ <servlet-class>railo.loader.servlet.CFMLServlet</servlet-class>
+ <init-param>
+ <param-name>configuration</param-name>
+ <param-value>/WEB-INF/railo/</param-value>
+ <description>Configuraton directory</description>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+</servlet>
+
+ <servlet-mapping>
+ <servlet-name>default</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+
+
+
+ <!-- The mapping for the Railo servlet -->
+<servlet-mapping>
+ <servlet-name>GlobalCFMLServlet</servlet-name>
+ <url-pattern>*.cfm</url-pattern>
+</servlet-mapping>
+<servlet-mapping>
+ <servlet-name>GlobalCFMLServlet</servlet-name>
+ <url-pattern>/index.cfm/*</url-pattern>
+</servlet-mapping>
+<servlet-mapping>
+ <servlet-name>GlobalCFMLServlet</servlet-name>
+ <url-pattern>*.cfml</url-pattern>
+</servlet-mapping>
+<servlet-mapping>
+ <servlet-name>GlobalCFMLServlet</servlet-name>
+ <url-pattern>*.cfc</url-pattern>
+</servlet-mapping>
+
+
+ <!-- ==================== Default Welcome File List ===================== -->
+ <!-- When a request URI refers to a directory, the default servlet looks -->
+ <!-- for a "welcome file" within that directory and, if present, -->
+ <!-- to the corresponding resource URI for display. If no welcome file -->
+ <!-- is present, the default servlet either serves a directory listing, -->
+ <!-- or returns a 404 status, depending on how it is configured. -->
+ <!-- -->
+ <!-- If you define welcome files in your own application's web.xml -->
+ <!-- deployment descriptor, that list *replaces* the list configured -->
+ <!-- here, so be sure that you include any of the default values that -->
+ <!-- you wish to include. -->
+
+ <welcome-file-list>
+ <welcome-file>index.html</welcome-file>
+ <welcome-file>index.htm</welcome-file>
+ <welcome-file>index.jsp</welcome-file>
+ <welcome-file>index.cfm</welcome-file>
+ <welcome-file>index.cfml</welcome-file>
+ </welcome-file-list>
+
+</web-app>
diff --git a/src/main/webapp/plugins/CFAdminDSN-0.1.zip b/src/main/webapp/plugins/CFAdminDSN-0.1.zip
index 20ebb8c..4e993d2 100644
--- a/src/main/webapp/plugins/CFAdminDSN-0.1.zip
+++ b/src/main/webapp/plugins/CFAdminDSN-0.1.zip
Binary files differ
diff --git a/src/main/webapp/plugins/CFAdminDSN/railo.cfm b/src/main/webapp/plugins/CFAdminDSN/railo.cfm
index de1e785..c45ff7d 100644
--- a/src/main/webapp/plugins/CFAdminDSN/railo.cfm
+++ b/src/main/webapp/plugins/CFAdminDSN/railo.cfm
@@ -7,7 +7,7 @@
<cfset var datasources = {}>
<cflock name="cfadmin" timeout="30">
- <cfadmin action="getDatasources" type="web" password="password" returnVariable="dsnList">
+ <cfadmin action="getDatasources" type="web" password="#arguments.adminPassword#" returnVariable="dsnList">
</cflock>