Skip to content

Commit d9850ab

Browse files
lmajanolmajano
committed
Merge branch 'development'
2 parents 5b7c89d + 61f7883 commit d9850ab

File tree

9 files changed

+102
-120
lines changed

9 files changed

+102
-120
lines changed

‎.travis.yml‎

Lines changed: 53 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,62 @@
11
language: java
2-
notifications:
3-
slack:
4-
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=
2+
53
branches:
64
only:
75
- development
6+
- master
7+
88
sudo: required
9+
910
dist: trusty
11+
1012
before_install:
11-
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
12-
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
13-
/etc/apt/sources.list.d/commandbox.list
13+
# CommandBox Keys
14+
- sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
15+
- sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a
16+
/etc/apt/sources.list.d/commandbox.list
17+
1418
install:
15-
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
16-
- box install
17-
- box server start
18-
before_script:
19-
# Startup the app
20-
- curl http://localhost:49616/
19+
# Install Commandbox
20+
- sudo apt-get update && sudo apt-get --assume-yes install commandbox
21+
# Test that the box binary is available and ready for our tests
22+
- box version
23+
# Install Dependencies
24+
- box install
25+
# Store the Ortus API Key for forgebox publishing in `master`
26+
- box config set endpoints.forgebox.APIToken=$FORGEBOX_API_TOKEN > /dev/null
27+
# Startup Server
28+
- box server start
29+
2130
script:
22-
- ant -f workbench/build.xml
31+
# Execute build via ANT
32+
- ant -DisTravis=true -Dbuild.number=$TRAVIS_BUILD_NUMBER -f workbench/build.xml
33+
#- curl http://localhost:49616/tests/runner.cfm > log.html && cat log.html
34+
# Spit out log just in case we need to debug
35+
- box server log
36+
37+
# Only executed when merging to master
38+
before_deploy:
39+
- mkdir s3deploy
40+
- cp -r ./artifacts/cbjavaloader/* ./s3deploy/
41+
- rm -f ./s3deploy/box-repo.json
42+
43+
deploy:
44+
on:
45+
branch:
46+
- master
47+
skip_cleanup: true
48+
provider: s3
49+
#AWS Credentials need to be set in Travis
50+
access_key_id: $AWS_ACCESS_KEY
51+
secret_access_key: $AWS_ACCESS_SECRET
52+
bucket: "downloads.ortussolutions.com"
53+
local-dir: s3deploy
54+
upload-dir: ortussolutions/coldbox-modules/cbjavaloader
55+
acl: public_read
56+
57+
after_deploy:
58+
- cd $TRAVIS_BUILD_DIR/build && box forgebox publish
59+
60+
notifications:
61+
slack:
62+
secure: FIHlTn/YO7Wgumm1uIqmoEsqjQA7fV0AE94Rjc5yKzM3AquQa8HicgDVVk0d2GrKRnl0xt3j4ZJV//VJyIjlCd/QVKuj48R2ChjEY2im3+99HFPafCUI5/S2uyowKU6mJTFonH9v6p41eqxdbiAxJdDGOT0V2Gpt3UBSNuHz8ED9/aIHqv+P7M+VD6Xd2XYwctPniWlaSWx57sWcnG/VkFG45qFQAyha64uxOOe4M3ZmG/n5FfauZ8cBVLiRKEIr+CyNhh1ujfzi7+4uzMlSNL5t/BbZamAQuZzqGzGQ9RVvIlyPgUGNJtDEE/hWS09aagXF5T6EMj00szizErh4J1/x4qZwml5+TcBN31E0QmAhCtZe85sr3tYgic+hEz9XX1yymQzf/C7n4to2yNvq0r4g51xDk8IuP95WEh7zaqLlvFZvBFgxpHZBMYlRvhytjOYDeIFRMcGwHZcXosaG2ejqDwcGq/LC4oeG4sSwmg9sdRrtcmcanrNqrBka86WYO6LntI3JdZ86/1ACEUHzhCCwvrKELc9Ji1xxGAgS7QKH+s2/hnJuiMyv73gOVLKYC+wPMLt+fvOmPLSEl+PJiAIlToBq1KUBg03RSQLfPOLD7OrJ8VvDZsEPwejqlGDyc4wRglS9OTi7SnN5LYHSDNDdGdREegWqq9qDHEYEVLI=

‎apidocs/box.json‎

Lines changed: 1 addition & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,15 @@
11
{
22
"name":"API Docs",
33
"version":"1.0.0",
4-
"author":"",
5-
"location":"",
6-
"directory":"",
7-
"createPackageDirectory":true,
8-
"packageDirectory":"",
9-
"homepage":"",
10-
"documentation":"",
11-
"repository":{
12-
"type":"",
13-
"URL":""
14-
},
15-
"bugs":"",
164
"slug":"module-apidocs",
17-
"shortDescription":"",
18-
"description":"",
19-
"instructions":"",
20-
"changelog":"",
21-
"type":"",
22-
"keywords":[
23-
24-
],
255
"private":true,
26-
"engines":[
27-
{
28-
"type":"",
29-
"version":""
30-
}
31-
],
32-
"defaultEngine":"",
33-
"projectURL":"",
34-
"license":[
35-
{
36-
"type":"",
37-
"URL":""
38-
}
39-
],
40-
"contributors":[
41-
42-
],
436
"dependencies":{
44-
"docbox":"https://github.com/Ortus-Solutions/DocBox/archive/v2.0.4.zip"
7+
"docbox":"^2.0.7+00005"
458
},
469
"devDependencies":{
4710

4811
},
4912
"installPaths":{
5013
"docbox":"docbox"
51-
},
52-
"ignore":[
53-
"**/.*",
54-
"tests"
55-
],
56-
"testbox":{
57-
"runner":[
58-
{
59-
"default":""
60-
}
61-
],
62-
"labels":[
63-
64-
],
65-
"reporter":"",
66-
"reporterResults":"",
67-
"bundles":[
68-
""
69-
],
70-
"directory":{
71-
"mapping":"",
72-
"recurse":true
73-
},
74-
"watchers":[
75-
76-
],
77-
"notify":{
78-
"emails":[
79-
80-
],
81-
"growl":"",
82-
"URL":""
83-
}
8414
}
8515
}

‎box.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"private":false,
66
"defaultPort":0,
77
"dependencies":{
8-
"coldbox":"4.1.0+00002"
8+
"coldbox":"^4.3.0"
99
},
1010
"devDependencies":{
11-
"testbox":"2.3.0+00044"
11+
"testbox":"^2.4.0+80"
1212
},
1313
"installPaths":{
1414
"coldbox":"coldbox",

‎changelog.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
CHANGELOG
22
=========
33

4+
## 1.3.1
5+
* Travis Update Builds
6+
* Adobe CF 2016,11,10 compatiblity fixes
7+
48
## 1.3.0
59
* Adobe CF Compatiblity
610

‎config/Coldbox.cfc‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ component{
66
// coldbox directives
77
coldbox = {
88
//Application Setup
9-
appName = "JavaLoader Shell",
9+
appName = "App Shell",
1010

1111
//Development Settings
1212
reinitPassword = "",
@@ -47,22 +47,14 @@ component{
4747
settings = {
4848
};
4949

50-
// Activate WireBox
51-
wirebox = { enabled = true, singletonReload=false };
52-
53-
// Module Directives
54-
modules = {
55-
//Turn to false in production, on for dev
56-
autoReload = false
57-
};
5850

5951
//LogBox DSL
6052
logBox = {
6153
// Define Appenders
6254
appenders = {
6355
files={class="coldbox.system.logging.appenders.RollingFileAppender",
6456
properties = {
65-
filename = "javaloader", filePath="/#appMapping#/logs"
57+
filename = "appshell", filePath="/#appMapping#/logs"
6658
}
6759
}
6860
},

‎modules/cbjavaloader/box.json‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name" : "JavaLoader",
3+
"author" : "Ortus Solutions.com <[email protected]>",
34
"version" : "@version.number@[email protected]@",
4-
"location" : "http://downloads.ortussolutions.com.s3.amazonaws.com/ortussolutions/coldbox-modules/cbjavaloader/@version.number@/[email protected]@.zip",
5-
"author" : "Ortus Solutions.com <[email protected]",
5+
"location" : "http://downloads.ortussolutions.com/ortussolutions/coldbox-modules/cbjavaloader/@build.version@/[email protected]@.zip",
66
"slug" : "cbjavaloader",
77
"type" : "modules",
8-
"homepage" : "https://github.com/ColdBox/cbox-javaloader",
9-
"documentation" : "https://github.com/ColdBox/cbox-javaloader",
10-
"repository" : { "type" : "git", "url" : "https://github.com/ColdBox/cbox-javaloader" },
8+
"homepage" : "https://github.com/coldbox-modules/cbox-javaloader",
9+
"documentation" : "https://github.com/coldbox-modules/cbox-javaloader",
10+
"repository" : { "type" : "git", "url" : "https://github.com/coldbox-modules/cbox-javaloader" },
1111
"shortDescription" : "A module to class load, compile and do much more with Java",
1212
"license" : [
1313
{ "type" : "Apache2", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" }
@@ -17,6 +17,7 @@
1717
],
1818
"ignore":[
1919
"**/.*",
20-
"tests"
20+
"tests",
21+
"*/.md"
2122
]
2223
}

‎modules/cbjavaloader/models/javaloader/JavaProxy.cfc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,16 +121,16 @@ Mark Mandel 27/08/2007 Created
121121
</cffunction>
122122

123123
<cffunction name="_buildArgumentArray" hint="builds an argument array out of the arguments" access="private" returntype="array" output="false">
124-
<cfargument name="arguments" hint="the arguments passed through" type="struct" required="Yes">
124+
<cfargument name="args" hint="the arguments passed through" type="struct" required="Yes">
125125
<cfscript>
126-
var len = StructCount(arguments);
126+
var len = StructCount(args);
127127
var objArray = _getArray().newInstance(_getObjectClass(), len);
128128
var counter = 1;
129129
var obj = 0;
130130

131131
for(; counter <= len; counter++)
132132
{
133-
obj = arguments[counter];
133+
obj = args[counter];
134134
_getArray().set(objArray, counter - 1, obj);
135135
}
136136

‎readme.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ The CB JavaLoader module will interface with Mark Mandel's JavaLoader to allow y
88
Apache License, Version 2.0.
99

1010
## Important Links
11-
- https://github.com/ColdBox/cbox-javaloder
12-
- http://forgebox.io/view/javaloader
13-
- Docs: https://github.com/Ortus-Solutions/JavaLoader/wiki
11+
- https://github.com/coldbox-modules/cbox-javaloader
12+
- https://forgebox.io/view/javaloader
13+
- Docs: https://github.com/Ortus-Solutions/JavaLoader
1414
- [Changelog](changelog.md)
1515

1616
## System Requirements
1717
- Lucee 4.5+
18-
- ColdFusion 9+
18+
- ColdFusion 10+
1919

2020
## Instructions
2121

‎workbench/build.xml‎

Lines changed: 26 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
<!-- Version: UPDATE ON EACH RELEASE AS NEEDED -->
44
<property name="project.name" value="cbjavaloader" />
55
<property name="module.name" value="cbjavaloader" />
6-
<property name="project.version" value="1.3.0"/>
6+
<property name="project.version" value="1.3.1"/>
77
<property name="groupID" value="ortussolutions" />
88

9+
<condition property="isTravis" else="false">
10+
<isset property="isTravis"/>
11+
</condition>
12+
913
<!-- Build Labels -->
1014
<tstamp prefix="start"/>
1115
<path id="cp">
@@ -37,14 +41,20 @@
3741
<loadproperties srcFile="workbench/build.properties"/>
3842

3943
<!-- Build Number -->
40-
<propertyfile file="workbench/build.number" comment="Build Number for ANT. Edit not!">
41-
<entry key="build.number"
42-
type="int"
43-
operation="+"
44-
pattern="00000"
45-
default="1" />
46-
</propertyfile>
47-
<property file="workbench/build.number"/>
44+
<if>
45+
<not><isset property="build.number" /></not>
46+
<then>
47+
<propertyfile file="workbench/build.number" comment="Build Number for ANT. Edit not!">
48+
<entry key="build.number"
49+
type="int"
50+
operation="+"
51+
pattern="00000"
52+
default="1" />
53+
</propertyfile>
54+
55+
<property file="workbench/build.number"/>
56+
</then>
57+
</if>
4858

4959
<!-- Build Label -->
5060
<property name="build.label" value="${project.name}-${project.version}.${build.number}-${start.DSTAMP}${start.TSTAMP}"/>
@@ -107,8 +117,13 @@
107117
<!-- Copy over box.json to root for convenience -->
108118
<copy todir="${dir.exports}" file="${dir.build}/box.json" overwrite="true" encoding="UTF-8" />
109119

110-
<!-- Cleanup -->
111-
<delete dir="${dir.build}" />
120+
<!-- Cleanup -->
121+
<if>
122+
<equals arg1="$isTravis" arg2="false" />
123+
<then>
124+
<delete dir="${dir.build}" />
125+
</then>
126+
</if>
112127
</target>
113128

114129
<!-- Build API Docs -->

0 commit comments

Comments
 (0)