Skip to content

Commit

Permalink
v4.07.020
Browse files Browse the repository at this point in the history
  • Loading branch information
changkejun committed Sep 11, 2024
1 parent 62a9b35 commit c5eea9f
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 4 deletions.
30 changes: 30 additions & 0 deletions bin/application template/META-INF/context.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,34 @@
description = "E-Mail Resource"
/>
-->
<!-- for jakarta
<Resource
name = "jdbc/efw"
auth = "Container"
type = "jakarta.sql.DataSource"
driverClassName = "org.postgresql.Driver"
url = "jdbc:postgresql://localhost:5432/skeletonSample"
username = "postgres"
password = "postgres"
maxTotal = "10"
maxIdle = "10"
maxWaitMillis = "10"
/>
<Resource
name = "mail/efw"
auth = "Container"
type = "jakarta.mail.Session"
username = "username"
password = "password"
mail.debug = "false"
mail.user = "user"
mail.from = "from@host"
mail.transport.protocol="smtp"
mail.smtp.host = "mailhost"
mail.smtp.auth = "true"
mail.smtp.port = "25"
mail.smtp.starttls.enable="true"
description = "E-Mail Resource"
/>
-->
</Context>
2 changes: 1 addition & 1 deletion src/META-INF/resources/efw/efw.client.nopromise.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ EfwClient.prototype.fire = function(eventParams) {
self._consoleLog("First calling result", result);
// if it is success,the result must be a json object.
if (result.actions){
self._showActions(result.actions);
self._showActions(eventId,result.actions);
} else {// if no error, run the second fire, in this case , result is paramsFormat
self._fire2nd(eventId, result, manualParams, servletUrl, uploadUrl, downloadUrl);
}
Expand Down
2 changes: 1 addition & 1 deletion src/efw/framework.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public final class framework {
/**
* バージョンを表す。
*/
public static final String version="4.07.019";// change it when releasing jar.
public static final String version="4.07.020";// change it when releasing jar.
/**
* webHome
*/
Expand Down
2 changes: 1 addition & 1 deletion src4jakarta/META-INF/resources/efw/efw.client.nopromise.js
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ EfwClient.prototype.fire = function(eventParams) {
self._consoleLog("First calling result", result);
// if it is success,the result must be a json object.
if (result.actions){
self._showActions(result.actions);
self._showActions(eventId,result.actions);
} else {// if no error, run the second fire, in this case , result is paramsFormat
self._fire2nd(eventId, result, manualParams, servletUrl, uploadUrl, downloadUrl);
}
Expand Down
2 changes: 1 addition & 1 deletion src4jakarta/efw/framework.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public final class framework {
/**
* バージョンを表す。
*/
public static final String version="4.07.019_jakarta";// change it when releasing jar.
public static final String version="4.07.020_jakarta";// change it when releasing jar.
/**
* webHome
*/
Expand Down

0 comments on commit c5eea9f

Please sign in to comment.