Merge remote-tracking branch 'refs/remotes/origin/development'

.gitignore

@@ -3,6 +3,7 @@
 /build/temp
 /build/requires.txt
 /lib
+/src/cfml/box.json
 settings.xml
 .project
 WEB-INF
@@ -19,4 +20,5 @@ build/resources
 src/cfml/.version
 org.eclipse.jdt.ui.prefs
 apidocs/docbox
-commandbox.rb
+commandbox.rb
+/testbox

apidocs/box.json

@@ -3,9 +3,9 @@
     "version":"1.0.0",
     "slug":"commandbox-apidocs",
     "private":true,
-    "defaultPort":8511,
+    "defaultPort":8989,
     "dependencies":{
-        "docbox":"https://github.com/Ortus-Solutions/DocBox/archive/v2.0.3.zip"
+        "docbox":"https://github.com/Ortus-Solutions/DocBox/archive/v2.0.4.zip"
     },
     "devDependencies":{
 

apidocs/index.cfm

@@ -7,13 +7,21 @@ try{
 		strategy = "strategy.commandbox.CommandBoxStrategy",
 		properties = {
 			projectTitle 	= "CommandBox v#url.version#",
-			outputDir 		= url.path
+			outputDir 		= url.path 
 		} 
 	);
+	baseDir = expandPath( '/commandbox' );
+	commandDirs = directoryList(path='/commandbox/system/modules', recurse=true, filter=function(path){ return reFindNoCase( '.*[/\\]commands$', arguments.path ); } );
 	source = [
-		{ dir = expandPath( "/commandbox/commands" ), mapping = "commandbox.commands" },
-		{ dir = expandPath( "/commandbox/system/commands" ), mapping = "commandbox.system.commands" }
 	];
+	for( dir in commandDirs ) {
+		source.append(
+			{
+				dir : dir,
+				mapping : listChangeDelims( replaceNoCase( dir, baseDir, 'commandbox' ), '.', '/\' )
+			}
+		);
+	}
 	docbox.generate( source );
 } catch ( Any e ){
 	rethrow;

apidocs/strategy/commandbox/resources/templates/overview-frame.cfm

@@ -138,7 +138,7 @@
 				.on("changed.jstree", function (e, data) {
 					var obj = data.instance.get_node(data.selected[0]).li_attr;
 					if( obj.linkhref ) {
-						window.parent.frames['classFrame'].location.assign( obj.linkhref );						
+						window.parent.frames['classFrame'].location.href = obj.linkhref;				
 					}
 			});
 			

build/brew-template.rb

@@ -1,26 +1,40 @@
 require "formula"
-
-class Commandbox@be@ < Formula
+# Version update PR to Homebrew requires only the information below:
+class Commandbox < Formula
+  desc "CFML embedded server, package manager, and app scaffolding tools"
   homepage "http://www.ortussolutions.com/products/commandbox"
   url "@repoURL@/ortussolutions/commandbox/@version@/commandbox-bin-@[email protected]"
-  sha1 "@sha1@"
-  version "@version@"
-
+  sha256 "@sha256@"
+
   depends_on :arch => :x86_64
+  depends_on :java => "1.7+"
 
-  resource 'apidocs' do
+  resource "apidocs" do
     url "@repoURL@/ortussolutions/commandbox/@version@/commandbox-apidocs-@[email protected]"
-    sha1 "@apidocs.sha1@"
+    sha256 "@apidocs.sha256@"
   end
 
   def install
-    bin.install 'box'
-    doc.install resource( "apidocs" )
+    bin.install "box"
+    doc.install resource("apidocs")
   end
 
-  def caveats
-    "You will need at least Java JDK 1.7+ to run CommandBox"
-  end
+  def caveats; <<-EOS.undent
+    CommandBox is licensed as open source software under the GNU Lesser General Public License v3
+
+    License information at:
+    http://www.gnu.org/licenses/lgpl-3.0.en.html
 
+    For full CommandBox documentation visit:
+    https://ortus.gitbooks.io/commandbox-documentation/
 
+    Source Code:
+    https://github.com/Ortus-Solutions/commandbox
+    EOS
+  end
+
+  test do
+    system "box", "install"
+    system "box", "--version"
+  end
 end

build/build-auto.properties

@@ -12,4 +12,6 @@ api.dir=/var/www/vhosts/stg.ortussolutions.com/integration/box-cli/build/temp/ap
 #debian+rpm repos
 rpm.repo=/var/www/vhosts/stg.ortussolutions.com/integration/artifacts/RPMS/noarch
 deb.repo=/var/www/vhosts/stg.ortussolutions.com/integration/artifacts/debs/noarch
+rpm.repo.stable=/var/www/vhosts/stg.ortussolutions.com/integration/artifacts/RPMS-stable/noarch
+deb.repo.stable=/var/www/vhosts/stg.ortussolutions.com/integration/artifacts/debs-stable/noarch
 #mvn.type=snapshot#

build/build.properties

@@ -12,12 +12,12 @@ java.pack200=false
 #dependencies
 dependencies.dir=${basedir}/lib
 cfml.version=4.5.2.018
-cfml.loader.version=1.0.7
+cfml.loader.version=1.1.0
 cfml.cli.version=${cfml.loader.version}.${cfml.version}
 lucee.version=4.5.2.018
-jre.version=1.8.0_60
+jre.version=1.8.0_72
 launch4j.version=3.4
-runwar.version=3.2.0
+runwar.version=3.3.3
 
 #build locations
 build.type=localdev
@@ -35,6 +35,8 @@ api.dir=${basedir}/temp/apidocs
 #debian+rpm repos
 rpm.repo=${dist.dir}/RPMS/noarch
 deb.repo=${dist.dir}/debs/noarch
+rpm.repo.stable=${dist.dir}/RPMS-stable/noarch
+deb.repo.stable=${dist.dir}/debs-stable/noarch
 #mvn.type=snapshot
 
 #remote repos

build/build.xml

@@ -15,8 +15,8 @@ External Dependencies:
     <!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
  	<property name="distro.groupID"				value="ortussolutions" />
  	<property name="distro.name"				value="commandbox"/>
- 	<property name="commandbox.version"			value="2.2.0"/>
- 	<property name="commandbox.stableVersion"	value="2.2.0"/>
+ 	<property name="commandbox.version"			value="3.0.1"/>
+ 	<property name="commandbox.stableVersion"	value="3.0.1"/>
 
     <!-- Time Label -->
 	<tstamp prefix="start"/>
@@ -52,6 +52,16 @@ External Dependencies:
 	<import file="${cfdistro.build.file}"/>
 	<property name="maven.repo.local" value="${cfdistro.basedir}/artifacts"/>
 
+	<if>
+	    <equals arg1="${commandbox.version}" arg2="${commandbox.stableVersion}"/>
+	    <then>
+		 	<property name="isStable"	value="true"/>
+	    </then>
+	    <else>
+		 	<property name="isStable"	value="false"/>
+	    </else>
+	</if>
+
 	<!-- Init Build -->
 	<target name="init" description="Init build" unless="src.isInit">
 		<!-- cleanup -->
@@ -321,29 +331,29 @@ External Dependencies:
  	<target name="build.homebrew" description="Builds the Homebrew Recipe" depends="">
 
 		<!-- Check sum properties -->
-		<checksum file="${dist.dir}/${distro.name}-bin-${commandbox.version}.zip" property="commandbox.sha1" algorithm="SHA"/>
-		<checksum file="${dist.dir}/${distro.name}-apidocs-${commandbox.version}.zip" property="commandbox.apidocs.sha1" algorithm="SHA"/>
+		<checksum file="${dist.dir}/${distro.name}-bin-${commandbox.version}.zip" property="commandbox.sha256" algorithm="SHA-256"/>
+		<checksum file="${dist.dir}/${distro.name}-apidocs-${commandbox.version}.zip" property="commandbox.apidocs.sha256" algorithm="SHA-256"/>
 
 		<!-- copy over prd file -->
 		<copy file="brew-template.rb" 
-			  tofile="${artifact.dir}/commandbox.rb"
+			  tofile="${dist.dir}/commandbox.rb"
 			  overwrite="true"
 			  encoding="UTF-8" />
 
-		<replace file="${artifact.dir}/commandbox.rb" value="" summary="yes" encoding="UTF-8">
+		<replace file="${dist.dir}/commandbox.rb" value="" summary="yes" encoding="UTF-8">
 		  	<replacetoken>@be@</replacetoken>
 		</replace>
-		<replace file="${artifact.dir}/commandbox.rb" value="${commandbox.version}" summary="yes" encoding="UTF-8">
+		<replace file="${dist.dir}/commandbox.rb" value="${commandbox.version}" summary="yes" encoding="UTF-8">
 		  	<replacetoken>@version@</replacetoken>
 		</replace>
-		<replace file="${artifact.dir}/commandbox.rb" value="${ortus.repoPRDURL}" summary="yes" encoding="UTF-8">
+		<replace file="${dist.dir}/commandbox.rb" value="${ortus.repoPRDURL}" summary="yes" encoding="UTF-8">
 		  	<replacetoken>@repoURL@</replacetoken>
 		</replace>
-		<replace file="${artifact.dir}/commandbox.rb" value="${commandbox.sha1}" summary="yes" encoding="UTF-8">
-		  	<replacetoken>@sha1@</replacetoken>
+		<replace file="${dist.dir}/commandbox.rb" value="${commandbox.sha256}" summary="yes" encoding="UTF-8">
+		  	<replacetoken>@sha256@</replacetoken>
 		</replace>
-		<replace file="${artifact.dir}/commandbox.rb" value="${commandbox.apidocs.sha1}" summary="yes" encoding="UTF-8">
-		  	<replacetoken>@apidocs.sha1@</replacetoken>
+		<replace file="${dist.dir}/commandbox.rb" value="${commandbox.apidocs.sha256}" summary="yes" encoding="UTF-8">
+		  	<replacetoken>@apidocs.sha256@</replacetoken>
 		</replace>
 
 		<!-- copy over be file -->
@@ -361,11 +371,11 @@ External Dependencies:
 		<replace file="${artifact.dir}/commandbox-be.rb" value="${ortus.repoURL}" summary="yes" encoding="UTF-8">
 		  	<replacetoken>@repoURL@</replacetoken>
 		</replace>
-		<replace file="${artifact.dir}/commandbox-be.rb" value="${commandbox.sha1}" summary="yes" encoding="UTF-8">
-		  	<replacetoken>@sha1@</replacetoken>
+		<replace file="${artifact.dir}/commandbox-be.rb" value="${commandbox.sha256}" summary="yes" encoding="UTF-8">
+		  	<replacetoken>@sha256@</replacetoken>
 		</replace>
-		<replace file="${artifact.dir}/commandbox-be.rb" value="${commandbox.apidocs.sha1}" summary="yes" encoding="UTF-8">
-		  	<replacetoken>@apidocs.sha1@</replacetoken>
+		<replace file="${artifact.dir}/commandbox-be.rb" value="${commandbox.apidocs.sha256}" summary="yes" encoding="UTF-8">
+		  	<replacetoken>@apidocs.sha256@</replacetoken>
 		</replace>
 
  	</target>
@@ -556,7 +566,28 @@ External Dependencies:
         key="${ortus.sign.key.id}"
         passphrase="${ortus.sign.key.passphrase}"
         keyring="${ortus.sign.keyring}" />
+
+	<antcall target="build.cli.deb.stablerepo" />
+
+    <!-- Update stable Repo -->
+    <deb-repo dir="${deb.repo.stable}"
+        label="ortus" description="ortussolutions.com debian repository"
+        key="${ortus.sign.key.id}"
+        passphrase="${ortus.sign.key.passphrase}"
+        keyring="${ortus.sign.keyring}" />
+
   </target>
+
+	<target name="build.cli.deb.stablerepo" if="${isStable}">
+		<echo>This is a stable build, let's update the stable Debian repo</echo>
+
+    	<mkdir dir="${deb.repo.stable}"/>
+
+	    <!-- Copy deb package to stable dist dir too -->
+	    <copy file="${deb.repo}/${distro.name}_${commandbox.version}-1_all.deb" toFile="${deb.repo.stable}/${distro.name}_${commandbox.version}-1_all.deb"/>
+	    <copy file="${deb.repo}/${distro.name}_${commandbox.version}-1_all.changes" toFile="${deb.repo.stable}/${distro.name}_${commandbox.version}-1_all.changes"/>
+
+	</target>
 
   <!-- Build RPM: Leverages redline task -->
   <target name="build.cli.rpm" depends="build.cli.bin">
@@ -578,7 +609,31 @@ External Dependencies:
     <copy file="${rpm.repo}/${distro.name}-${commandbox.version}-1.noarch.rpm" tofile="${dist.dir}/${distro.name}-rpm-${commandbox.version}.rpm" />
     <!-- Build Checksum -->
     <checksum file="${dist.dir}/${distro.name}-rpm-${commandbox.version}.rpm" forceoverwrite="true" fileext=".md5" />
+
+	<antcall target="build.cli.rpm.stablerepo" />
+
+	<rpm-repo name="${distro.name}" baseurl="${commandbox.rpm.repourl.stable}" dir="${rpm.repo.stable}" failonerror="false"/>
   </target>
+
+	<target name="build.cli.rpm.stablerepo" if="${isStable}">
+		<echo message="This is a stable build, let's update the stable RPM repo" />
+
+	    <mkdir dir="${rpm.repo.stable}" />
+	    <echo message="Making stable rpm in ${rpm.repo.stable} Packager:${commandbox.packager.name} ${commandbox.packager.email} Version: ${commandbox.version}" />
+	    <!-- execute rpm -->
+	    <property name="commandbox.rpm.repourl.stable" value="${ortus.repoURL}/RPMS-stable/noarch" />
+	    <echo message="RPM repository location: ${commandbox.rpm.repourl.stable}" />
+	    <rpm-create rpm.repo="${rpm.repo.stable}" rpm.release="1"
+	      rpm.reponame="ortus" rpm.baseurl="${commandbox.rpm.repourl.stable}"
+	      rpm.group="com.ortussolutions" rpm.name="${distro.name}" rpm.version="${commandbox.version}"
+	      rpm.packager="${commandbox.packager.name} ${commandbox.packager.email}"
+	      rpm.url="${commandbox.supportURL}" failonerror="false"
+	      rpm.keyring="${ortus.sign.keyring}" rpm.key="${ortus.sign.key.id}" 
+	      rpm.passphrase="${ortus.sign.key.passphrase}">
+	      <tarfileset file="${dist.dir}/box" prefix="/usr/bin" filemode="744" username="root" group="root"/>
+	    </rpm-create>
+
+	</target>
 
 	<!-- ********************************************************************************************-->
 	<!--						DEPENDENCY TARGETS 													 -->

src/cfml/Application.cfc

@@ -34,6 +34,7 @@ component{
 		// Try to log this to LogBox
 		try {
     		application.wireBox.getLogBox().getRootLogger().error( '#exception.message# #exception.detail ?: ''#', exception.stackTrace );
+			application.wireBox.getInstance( 'interceptorService' ).announceInterception( 'onException', { exception=exception } );
     	// If it fails no worries, LogBox just probably isn't loaded yet.
 		} catch ( Any e ) {}