Skip to content

Commit

Permalink
add multi server.conf support
Browse files Browse the repository at this point in the history
  • Loading branch information
2betop committed Sep 23, 2014
1 parent 2695690 commit d486d33
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 7 deletions.
8 changes: 2 additions & 6 deletions jello.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ fis.cli.info = fis.util.readJSON(__dirname + '/package.json');
fis.cli.help.commands = [ 'release', 'server' ];

fis.config.merge({
namespace: '',
statics: '/static',
templates: '/WEB-INF/views',

Expand Down Expand Up @@ -48,11 +49,6 @@ fis.config.merge({

path: [

{
reg: /\/lang\/([^\/]+)\.po/i,
release: '/WEB-INF/config/lang/${namespace}.$1.po'
},

{
reg: /^\/widget\/(.*\.vm)$/i,
isMod: true,
Expand Down Expand Up @@ -94,7 +90,7 @@ fis.config.merge({

{
reg: 'server.conf',
release: '/WEB-INF/server.conf'
release: '/WEB-INF/server${namespace}.conf'
},

{
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jello",
"version": "0.1.2",
"version": "0.1.3",
"description": "Front End Integrated Solution for J2EE Velocity.",
"main": "jello.js",
"bin": {
Expand Down

0 comments on commit d486d33

Please sign in to comment.