Merge pull request #12 from pfreitag/develop

markmandel · web-flow · commit 644fdf71ae97 · 2017-03-21T13:19:22.000-07:00
Remove CF7 workaround
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-JavaLoader 1.1
+JavaLoader 1.2
 ==============
 
 JavaLoader is a library that has been built to ease the use, development and integration of Java within ColdFusion applications.
diff --git a/javaloader/JavaLoader.cfc b/javaloader/JavaLoader.cfc
@@ -17,7 +17,6 @@ Purpose:    Utlitity class for loading Java Classes
 	instance.static.uuid = "A0608BEC-0AEB-B46A-0E1E1EC5F3CE7C9C";
 </cfscript>
 
-<cfimport taglib="tags" prefix="jl">
 
 <!------------------------------------------- PUBLIC ------------------------------------------->
 
@@ -370,10 +369,9 @@ Purpose:    Utlitity class for loading Java Classes
 		var counter = 0;
     </cfscript>
 
-	<!--- cf7 syntax. Yuck. --->
 	<cfloop from="1" to="#len#" index="counter">
 		<cfset dir = directories[counter]>
-		<jl:directory action="list" directory="#dir#" recurse="true"
+		<cfdirectory action="list" directory="#dir#" recurse="true"
 					type="file"
 					sort="dateLastModified desc"
 					name="qLastModified">
diff --git a/javaloader/tags/directory.cfm b/javaloader/tags/directory.cfm

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-JavaLoader 1.1`
	`1`	`+JavaLoader 1.2`
`2`	`2`	`==============`
`3`	`3`
`4`	`4`	`JavaLoader is a library that has been built to ease the use, development and integration of Java within ColdFusion applications.`