Merge branch 'development'

Author: lmajano

.gitignore

@@ -1,12 +1,17 @@
+# IDE Stuff
 .settings
-logs/*.log
 settings.xml
-.netbeans
+
+# Logs
+logs/*.log
+
+# Test Results
 tests/results/*
-modules/cbvalidation/*
+
+# Dependenncies
 coldbox/*
 testbox/*
 artifacts/*
 apidocs/docbox/*
-workbench/build.number
+workbench/*
 build/*

.module.properties

@@ -1,3 +1,3 @@
 project.name=cbjavaloader
-project.version=1.3.3
+project.version=1.4.0
 module.name=cbjavaloader

box.json

@@ -1,6 +1,6 @@
 {
     "name":"cbjavaloader Builder",
-    "version":"1.3.3",
+    "version":"1.4.0",
     "slug":"cbjavaloader-shell",
     "private":false,
     "defaultPort":0,

changelog.md

@@ -1,6 +1,11 @@
 CHANGELOG
 =========
 
+## 1.4.0
+* Updated internal core Javaloader library to latest 1.2 release
+* Added automatic dynamic proxy class loading
+* Deprecating support for cf10
+
 ## 1.3.3
 * Cleanup of testing Application.cfc
 

modules/cbjavaloader/ModuleConfig.cfc

@@ -8,7 +8,7 @@ component {
 	// Module Properties
 	this.title 				= "JavaLoader";
 	this.author 			= "Ortus Solutions";
-	this.webURL 			= "http://www.ortussolutions.com";
+	this.webURL 			= "https://www.ortussolutions.com";
 	this.description 		= "A JavaLoader Module for ColdBox";
 	this.version			= "@build.version@[email protected]@";
 	// If true, looks for views in the parent first, if not found, then in the module. Else vice-versa
@@ -17,7 +17,10 @@ component {
 	this.layoutParentLookup = true;
 	// CF Mapping
 	this.cfmapping			= "cbjavaloader";
-	
+
+	/**
+	* Configure module
+	*/	
 	function configure(){
 		// Register Custom DSL, don't map it because it is too late, mapping DSLs are only good by the parent app
 		controller.getWireBox()
@@ -31,6 +34,7 @@ component {
 		var settings = controller.getConfigSettings();
 		// parse parent settings
 		parseParentSettings();
+
 		// Bind Core JavaLoader
 		binder.map( "jl@cbjavaloader" )
 			.to( "#moduleMapping#.models.javaloader.JavaLoader" )
@@ -40,6 +44,7 @@ component {
 			.initArg( name="sourceDirectories", 		value=settings.modules.cbjavaloader.settings.sourceDirectories )
 			.initArg( name="compileDirectory", 			value=settings.modules.cbjavaloader.settings.compileDirectory )
 			.initArg( name="trustedSource", 			value=settings.modules.cbjavaloader.settings.trustedSource );
+		
 		// Load JavaLoader and class loading
 		wirebox.getInstance( "loader@cbjavaloader" ).setup();
 	}
@@ -59,7 +64,13 @@ component {
 			throw( message="Invalid library path", detail="The path is #arguments.dirPath#", type="JavaLoader.DirectoryNotFoundException" );
 		}
 
-		return directoryList( arguments.dirPath, true, "array", arguments.filter, "name desc" );
+		return directoryList( 
+			arguments.dirPath, 
+			true, 
+			"array", 
+			arguments.filter, 
+			"name desc" 
+		);
 	}
 
 	/**
@@ -90,6 +101,7 @@ component {
 		if( !structKeyExists( javaLoaderDSL, "loadPaths" ) ){
 			javaLoaderDSL.loadPaths = [];
 		}
+
 		// Array of locations
 		if( isArray( javaLoaderDSL.loadPaths ) ){
 			var aJarPaths = [];
@@ -102,19 +114,30 @@ component {
 			}
 			javaLoaderDSL.loadPaths = aJarPaths;
 		}
+
 		// Single directory? Get all Jars in it
 		if( isSimpleValue( javaLoaderDSL.loadPaths ) and directoryExists( javaLoaderDSL.loadPaths ) ){
 			javaLoaderDSL.loadPaths = getJars( javaLoaderDSL.loadPaths );
-		} 
+		}
+		
 		// Single Jar?
 		if( isSimpleValue( javaLoaderDSL.loadPaths ) and fileExists( javaLoaderDSL.loadPaths ) ){
 			javaLoaderDSL.loadPaths = [ javaLoaderDSL.loadPaths ];
 		} 
+
 		// If simple value and no length
 		if( isSimpleValue( javaLoaderDSL.loadPaths ) and !len( javaLoaderDSL.loadPaths ) ){
 			javaLoaderDSL.loadPaths = [];
 		} 
 
+		// Now that we have figured out the user's settings, let's incorporate ours
+
+		// Dynamic Proxy
+		arrayPrepend(
+			javaLoaderDSL.loadPaths,
+			variables.modulePath & "/models/javaloader/support/cfcdynamicproxy/lib/cfcdynamicproxy.jar"
+		);
+
 		// incorporate settings		
 		structAppend( configStruct.modules.cbjavaloader.settings, javaLoaderDSL, true );
 	}

modules/cbjavaloader/models/javaloader/JavaCompiler.cfc

@@ -1,4 +1,4 @@
-<cfcomponent hint="Compiles Java source dirs to an array of .jar files." output="false">
+<cfcomponent hint="Compiles Java source dirs to an array of .jar files." output="false">
 
 <!------------------------------------------- PUBLIC ------------------------------------------->
 

modules/cbjavaloader/models/javaloader/JavaLoader.cfc

@@ -1,4 +1,4 @@
-<!--- Document Information -----------------------------------------------------
+<!--- Document Information -----------------------------------------------------
 
 Title:      JavaLoader.cfc
 
@@ -17,6 +17,7 @@ Purpose:    Utlitity class for loading Java Classes
 	instance.static.uuid = "A0608BEC-0AEB-B46A-0E1E1EC5F3CE7C9C";
 </cfscript>
 
+
 <!------------------------------------------- PUBLIC ------------------------------------------->
 
 <cffunction name="init" hint="Constructor" access="public" returntype="JavaLoader" output="false">
@@ -95,8 +96,122 @@ Purpose:    Utlitity class for loading Java Classes
 	<cfreturn instance.ClassLoader />
 </cffunction>
 
+<cffunction name="getClassLoadPaths" access="public" returntype="array" output="false">
+	<cfreturn instance.classLoadPaths />
+</cffunction>
+
+	
+<cffunction name="switchThreadContextClassLoader" hint="Sometimes you will need to switch out the ThreadContextClassLoader with the classloader used by JavaLoader.<br/>
+			It has :
+			switchThreadContextClassLoader(function object, [struct function arguments], [classLoader=getURLClassLoader()])
+			switchThreadContextClassLoader(function name, [struct function arguments], [classLoader=getURLClassLoader()])
+			switchThreadContextClassLoader(object, function name, [struct function arguments], [classLoader=getURLClassLoader()])
+			This method can be used in 3 different ways:
+			<ol>
+				<li>Pass it the UDF itself</li>
+				<li>Pass it the current object and method name that you wish to have called</li>
+				<li>Inject it into your CFC/Page that you want to use, and call it from there, telling it what function to call (you will need to pass in the URLClassLoader)</li>
+			</ol>"
+			access="public" returntype="any" output="false">
+	<cfscript>
+		var local = {};
+		var func = 0; //need this as cf8 doesn't like the structure with functions.
+		var System = createObject("java", "java.lang.System");
+		var Thread = createObject("java", "java.lang.Thread");
+		var currentClassloader = Thread.currentThread().getContextClassLoader();
+		var classLoader = "";
+
+		if (structCount(arguments) == 4) 
+		{	
+			// the last 2 arguments are the function arguments and class loader
+			classLoader = arguments[4];
+			local.funcArgs = arguments[3];
+		} 
+		else if (structCount(arguments) == 3) 
+		{	
+			// 2nd argument could be classloader or function arguments
+			if (isInstanceOf(arguments[2],"java.lang.ClassLoader")) 
+			{
+				classLoader = arguments[2];
+			}
+			else if (isStruct(arguments[2])) 
+			{
+				local.funcArgs = arguments[2];	
+			}
+			
+			// 3rd argument could be classloader or function arguments
+			if (isInstanceOf(arguments[3],"java.lang.ClassLoader")) 
+			{
+				classLoader = arguments[3];
+			} 
+			else if (isStruct(arguments[3])) 
+			{
+				local.funcArgs = arguments[3];	
+			}
+		} 
+		else if (structCount(arguments) == 2) 
+		{	
+			// the 2nd argument could be a class loader or function arguments
+			if (isInstanceOf(arguments[2],"java.lang.ClassLoader")) 
+			{
+				classLoader = arguments[2];	
+			} 
+			else if (isStruct(arguments[2])) 
+			{
+				local.funcArgs = arguments[2];	
+			}
+		}
+		
+		if (!structKeyExists(local,"funcArgs")) 
+		{
+			local.funcArgs = {};	
+		}
+		
+		if (isSimpleValue(classLoader)) 
+		{
+			classLoader = getURLClassLoader();	
+		}
+	</cfscript>
+
+	<cftry>
+		<cfscript>
+			Thread.currentThread().setContextClassLoader(classloader);
+		</cfscript>
+
+		<cfif isSimpleValue(arguments[1])>
+			<cfinvoke method="#arguments[1]#" returnvariable="local.return" argumentCollection="#local.funcArgs#" />
+		<cfelseif isCustomFunction(arguments[1])>
+			<cfscript>
+				func = arguments[1];
+				local.return = func(argumentCollection = local.funcArgs);
+			</cfscript>
+		<cfelseif isObject(arguments[1]) AND isSimpleValue(arguments[2])>
+			<cfinvoke component="#arguments[1]#" method="#arguments[2]#" returnvariable="local.return" argumentCollection="#local.funcArgs#" />
+		<cfelse>
+			<cfthrow type="javaloader.InvalidInvocationException" message="Unable to determine what method to invoke" detail="Please check the documentation for switchThreadContextClassLoader."/>
+		</cfif>
+
+		<cfcatch>
+			<cfscript>
+				Thread.currentThread().setContextClassLoader(currentClassloader);
+			</cfscript>
+			<cfrethrow>
+		</cfcatch>
+	</cftry>
+
+	<cfscript>
+		//need to do this twice, as cf8 has no finally.
+		Thread.currentThread().setContextClassLoader(currentClassloader);
+
+		if(structKeyExists(local, "return"))
+		{
+			return local.return;
+		}
+	</cfscript>
+</cffunction>
+	
 <cffunction name="getVersion" hint="Retrieves the version of the loader you are using" access="public" returntype="string" output="false">
-	<cfreturn "1.0">
+	<cfreturn "1.2">
 </cffunction>
 
 <!------------------------------------------- PACKAGE ------------------------------------------->
@@ -199,7 +314,7 @@ Purpose:    Utlitity class for loading Java Classes
 			for(; counter lte len; counter = counter + 1)
 			{
 				dir = directories[counter];
-				directoryCopy(dir, path);
+				$directoryCopy(dir, path);
 			}
 
 			//then we compile it, and grab that jar
@@ -254,14 +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]>
-
-		<cfdirectory 
-					action="list" 
-					directory="#dir#" 
-					recurse="true"
+		<cfdirectory action="list" directory="#dir#" recurse="true"
 					type="file"
 					sort="dateLastModified desc"
 					name="qLastModified">
@@ -366,11 +476,11 @@ Purpose:    Utlitity class for loading Java Classes
 	<cfdirectory action="list" name="qJars" directory="#path#" filter="*.jar" sort="name desc"/>
 	<cfloop query="qJars">
 		<cfscript>
-			libName = ListGetAt(name, 1, "-");
+			libName = ListGetAt(qJars.name, 1, "-");
 			//let's not use the lib's that have the same name, but a lower datestamp
 			if(NOT ListFind(jarList, libName))
 			{
-				ArrayAppend(aJars, path & "/" & name);
+				ArrayAppend(aJars, path & "/" & qJars.name);
 				jarList = ListAppend(jarList, libName);
 			}
 		</cfscript>
@@ -379,10 +489,6 @@ Purpose:    Utlitity class for loading Java Classes
 	<cfreturn aJars>
 </cffunction>
 
-<cffunction name="getClassLoadPaths" access="private" returntype="array" output="false">
-	<cfreturn instance.classLoadPaths />
-</cffunction>
-
 <cffunction name="setClassLoadPaths" access="private" returntype="void" output="false">
 	<cfargument name="classLoadPaths" type="array" required="true">
 	<cfset instance.classLoadPaths = arguments.classLoadPaths />
@@ -476,7 +582,7 @@ Copies a directory.
 @author Joe Rinehart ([email protected])
 @version 1, July 27, 2005
 --->
-<cffunction name="directoryCopy" access="private" output="true">
+<cffunction name="$directoryCopy" access="private" output="true">
     <cfargument name="source" required="true" type="string">
     <cfargument name="destination" required="true" type="string">
     <cfargument name="nameconflict" required="true" default="overwrite">
@@ -494,9 +600,9 @@ Copies a directory.
         <cfif contents.type eq "file">
             <cffile action="copy" source="#arguments.source#/#name#" destination="#arguments.destination#/#name#" nameconflict="#arguments.nameConflict#">
         <cfelseif contents.type eq "dir">
-            <cfset directoryCopy(arguments.source & dirDelim & name, arguments.destination & dirDelim & name) />
+            <cfset $directoryCopy(arguments.source & dirDelim & name, arguments.destination & dirDelim & name) />
         </cfif>
     </cfloop>
 </cffunction>
 
-</cfcomponent>
+</cfcomponent>

modules/cbjavaloader/models/javaloader/JavaProxy.cfc

@@ -1,4 +1,4 @@
-<!--- Document Information -----------------------------------------------------
+<!--- Document Information -----------------------------------------------------
 
 Title:      JavaProxy.cfc
 

modules/cbjavaloader/models/javaloader/README.md

@@ -0,0 +1,35 @@
+JavaLoader 1.2
+==============
+
+JavaLoader is a library that has been built to ease the use, development and integration of Java within ColdFusion applications.
+
+It has several key features:
+
+1. Dynamically loading Java libraries without having to place them on the ColdFusion classpath
+1. Dynamically compiling Java code to be utilised within ColdFusion Applications
+1. Providing a Java Dynamic Proxy for ColdFusion Components to allow for seamless interoperability between Java  and ColdFusion Components
+1. Spring integration with ColdFusion Components
+1. and more...
+
+Resources
+---------
+
+The homepage for JavaLoader can be found at:
+http://www.compoundtheory.com/?action=javaloader.index
+
+To download JavaLoader, [visit RiaForge][1]. ( Trying to keep JavaLoader as the project most downloaded! :) )
+
+Documentation for JavaLoader can be found on the [GitHub Wiki][2].
+
+The source code can be found in the [GitHub repository][3].
+
+Bugs and feature requests can be entered into the [GitHub issue tracker][4].
+
+Support can be found through the [JavaLoader Mailing list][5].
+
+
+[1]: http://javaloader.riaforge.org/index.cfm?event=action.download
+[2]: https://github.com/markmandel/JavaLoader/wiki
+[3]: https://github.com/markmandel/JavaLoader
+[4]: https://github.com/markmandel/JavaLoader/issues
+[5]: https://groups.google.com/forum/#!forum/javaloader-dev