Merge remote-tracking branch 'github/development' into development

Author: sanaullah

modules/cbjavaloader/changelog.md renamed to changelog.md

@@ -1,7 +1,14 @@
 CHANGELOG
 =========
 
+## 1.3.0
+* Adobe CF Compatiblity
+
 ## 1.2.0
+* Travis Updates	
+* Changing the array of locations check so that it doesn't fail if a JAR file is passed in the array.
+* Readme Updates
+* ForgeBox2 Updates
 
 ## 1.1.0
 * Travis Integration

modules/cbjavaloader/ModuleConfig.cfc

@@ -96,11 +96,12 @@ component {
 		if( isArray( javaLoaderDSL.loadPaths ) ){
 			var aJarPaths = [];
 			for( var thisLocation in javaLoaderDSL.loadPaths ){
-				if( !directoryExists( thisLocation ) ){
-					throw( "Cannot load #thisLocation# as it is not a valid path" );
+				if( directoryExists( thisLocation ) ) {
+					aJarPaths.addAll( getJars( thisLocation ) );
+				} else if ( !fileExists( thisLocation ) ) {
+					throw( "Cannot load #thisLocation# as it is not a valid path or file" );
 				}
-				aJarPaths.addAll( getJars( thisLocation ) );
-			}	
+			}
 			javaLoaderDSL.loadPaths = aJarPaths;
 		}
 		// Single directory? Get all Jars in it

modules/cbjavaloader/box.json

@@ -1,6 +1,7 @@
 {
 	"name" 		: "JavaLoader",
 	"version"	: "@version.number@[email protected]@",
+	"location"	: "http://downloads.ortussolutions.com.s3.amazonaws.com/ortussolutions/coldbox-modules/cbjavaloader/@version.number@/[email protected]@.zip",
 	"author" 	: "Ortus Solutions.com <[email protected]",
 	"slug"		: "cbjavaloader",
 	"type"		: "modules",
@@ -14,13 +15,8 @@
 	"contributors"		: [
 		"Brad Wood <[email protected]>", "Curt Gratz <[email protected]>"
 	],
-	"engines"	: [
-		{ "type" : "lucee", "version" : ">4.5" },
-		{ "type" : "adobe", "version" : ">9.02" }
-	],
 	"ignore":[
         "**/.*",
-        "tests",
-        "*/.md"
+        "tests"
     ]
 }

readme.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/ColdBox/cbox-javaloader.svg?branch=development)](https://travis-ci.org/ColdBox/cbox-javaloader)
+[![Build Status](https://travis-ci.org/coldbox-modules/cbox-javaloader.svg?branch=development)](https://travis-ci.org/coldbox-modules/cbox-javaloader)
 
 # Welcome to the CBJavaloader Project
 
@@ -11,6 +11,7 @@ Apache License, Version 2.0.
 - https://github.com/ColdBox/cbox-javaloder
 - http://forgebox.io/view/javaloader
 - Docs: https://github.com/Ortus-Solutions/JavaLoader/wiki
+- [Changelog](changelog.md)
 
 ## System Requirements
 - Lucee 4.5+

workbench/build.xml

@@ -3,7 +3,7 @@
 	<!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
 	<property name="project.name" 		value="cbjavaloader" />
 	<property name="module.name" 		value="cbjavaloader" />
-	<property name="project.version" 	value="1.2.0"/>
+	<property name="project.version" 	value="1.3.0"/>
 	<property name="groupID" 			value="ortussolutions" />
 
 	<!-- Build Labels -->
@@ -68,6 +68,7 @@
         </copy>
         <!-- Copy readme -->
         <copy todir="${dir.build}" encoding="UTF-8" file="readme.md" overwrite="true" />
+        <copy todir="${dir.build}" encoding="UTF-8" file="changelog.md" overwrite="true" />
 
         <!-- Replace Version + Build Numbers -->
 		<replaceregexp match='@version.number@' replace="${project.version}" flags="ig" byline="true" encoding="UTF-8">