diff --git a/LICENSE b/LICENSE index 8dada3eda..7fe018dbb 100644 --- a/LICENSE +++ b/LICENSE @@ -1,3 +1,27 @@ +==== + + Copyright 2013 Apigee Corporation + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to + deal in the Software without restriction, including without limitation the + rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + sell copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in + all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS + IN THE SOFTWARE. + +==== + Apache License Version 2.0, January 2004 http://www.apache.org/licenses/ diff --git a/bin/cmd-cert.js b/cli/cmd-cert.js similarity index 100% rename from bin/cmd-cert.js rename to cli/cmd-cert.js diff --git a/bin/cmd-private.js b/cli/cmd-private.js similarity index 100% rename from bin/cmd-private.js rename to cli/cmd-private.js diff --git a/bin/cmd-token.js b/cli/cmd-token.js similarity index 100% rename from bin/cmd-token.js rename to cli/cmd-token.js diff --git a/bin/cmd.js b/cli/cmd.js similarity index 100% rename from bin/cmd.js rename to cli/cmd.js diff --git a/bin/edgemicro b/cli/edgemicro similarity index 100% rename from bin/edgemicro rename to cli/edgemicro diff --git a/bin/edgemicro-cert b/cli/edgemicro-cert similarity index 100% rename from bin/edgemicro-cert rename to cli/edgemicro-cert diff --git a/bin/edgemicro-private b/cli/edgemicro-private similarity index 100% rename from bin/edgemicro-private rename to cli/edgemicro-private diff --git a/bin/edgemicro-token b/cli/edgemicro-token similarity index 100% rename from bin/edgemicro-token rename to cli/edgemicro-token diff --git a/bin/lib/cert-lib.js b/cli/lib/cert-lib.js similarity index 100% rename from bin/lib/cert-lib.js rename to cli/lib/cert-lib.js diff --git a/bin/lib/cert.js b/cli/lib/cert.js similarity index 100% rename from bin/lib/cert.js rename to cli/lib/cert.js diff --git a/bin/lib/configure.js b/cli/lib/configure.js similarity index 100% rename from bin/lib/configure.js rename to cli/lib/configure.js diff --git a/bin/lib/deploy-auth.js b/cli/lib/deploy-auth.js similarity index 98% rename from bin/lib/deploy-auth.js rename to cli/lib/deploy-auth.js index f9253f075..3687ecef7 100644 --- a/bin/lib/deploy-auth.js +++ b/cli/lib/deploy-auth.js @@ -34,7 +34,7 @@ Deployment.prototype.deployEdgeMicroInternalProxy = function deployEdgeMicroInte debug: options.debug, verbose: options.debug, api: 'edgemicro-internal', - directory: path.join(__dirname,'..','..','auth'), + directory: path.join(__dirname,'..','..','edge'), 'import-only': false, 'resolve-modules': false, virtualhosts: this.virtualHosts || 'default' @@ -60,7 +60,7 @@ Deployment.prototype.deployWithLeanPayload = function deployWithLeanPayload( opt // copy bin folder into tmp tasks.push(function(cb) { console.log('copy auth app into tmp dir'); - cpr(path.resolve(__dirname, '..', '..', 'auth', 'app'), tmpDir.name, cb); + cpr(path.resolve(__dirname, '..', '..', 'edge', 'auth'), tmpDir.name, cb); }); // copy bin folder into tmp diff --git a/bin/lib/gateway.js b/cli/lib/gateway.js similarity index 100% rename from bin/lib/gateway.js rename to cli/lib/gateway.js diff --git a/bin/lib/micro-gateway-products-javacallout-1.0.0.jar b/cli/lib/micro-gateway-products-javacallout-1.0.0.jar similarity index 100% rename from bin/lib/micro-gateway-products-javacallout-1.0.0.jar rename to cli/lib/micro-gateway-products-javacallout-1.0.0.jar diff --git a/bin/lib/private.js b/cli/lib/private.js similarity index 99% rename from bin/lib/private.js rename to cli/lib/private.js index d3c6921dc..d5944ff9e 100755 --- a/bin/lib/private.js +++ b/cli/lib/private.js @@ -111,7 +111,7 @@ Private.prototype.configureEdgemicro = function(options, cb) { // configures Callout.xml & default.xml of apiproxy being deployed Private.prototype.configureEdgeMicroInternalProxy = function configureEdgeMicroInternalProxy(options, callback) { const that = this; - const apipath = path.join(__dirname, '..', '..', 'auth', 'apiproxy'); + const apipath = path.join(__dirname, '..', '..', 'edge', 'apiproxy'); options.proxyName = 'edgemicro-auth'; var resPath; try { diff --git a/bin/lib/token.js b/cli/lib/token.js similarity index 100% rename from bin/lib/token.js rename to cli/lib/token.js diff --git a/bin/lib/verify.js b/cli/lib/verify.js similarity index 100% rename from bin/lib/verify.js rename to cli/lib/verify.js diff --git a/bin/package.js b/cli/package.js similarity index 100% rename from bin/package.js rename to cli/package.js diff --git a/auth/README.md b/edge/README.md similarity index 76% rename from auth/README.md rename to edge/README.md index 79b276073..ac572d5a8 100644 --- a/auth/README.md +++ b/edge/README.md @@ -1,3 +1,3 @@ -#private directories +#edge dependency directories these files are for the cli configure command they are deployed to create the edge-auth proxy \ No newline at end of file diff --git a/auth/apiproxy/EdgeMicro.xml b/edge/apiproxy/EdgeMicro.xml similarity index 100% rename from auth/apiproxy/EdgeMicro.xml rename to edge/apiproxy/EdgeMicro.xml diff --git a/auth/apiproxy/policies/Authenticate.xml b/edge/apiproxy/policies/Authenticate.xml similarity index 100% rename from auth/apiproxy/policies/Authenticate.xml rename to edge/apiproxy/policies/Authenticate.xml diff --git a/auth/apiproxy/policies/Callout.xml b/edge/apiproxy/policies/Callout.xml similarity index 100% rename from auth/apiproxy/policies/Callout.xml rename to edge/apiproxy/policies/Callout.xml diff --git a/auth/apiproxy/policies/DistributedQuota.xml b/edge/apiproxy/policies/DistributedQuota.xml similarity index 100% rename from auth/apiproxy/policies/DistributedQuota.xml rename to edge/apiproxy/policies/DistributedQuota.xml diff --git a/auth/apiproxy/policies/JSSetupVariables.xml b/edge/apiproxy/policies/JSSetupVariables.xml similarity index 100% rename from auth/apiproxy/policies/JSSetupVariables.xml rename to edge/apiproxy/policies/JSSetupVariables.xml diff --git a/auth/apiproxy/policies/NoOrgOrEnv.xml b/edge/apiproxy/policies/NoOrgOrEnv.xml similarity index 100% rename from auth/apiproxy/policies/NoOrgOrEnv.xml rename to edge/apiproxy/policies/NoOrgOrEnv.xml diff --git a/auth/apiproxy/policies/Return401.xml b/edge/apiproxy/policies/Return401.xml similarity index 100% rename from auth/apiproxy/policies/Return401.xml rename to edge/apiproxy/policies/Return401.xml diff --git a/auth/apiproxy/policies/Return404.xml b/edge/apiproxy/policies/Return404.xml similarity index 100% rename from auth/apiproxy/policies/Return404.xml rename to edge/apiproxy/policies/Return404.xml diff --git a/auth/apiproxy/policies/ReturnVersion.xml b/edge/apiproxy/policies/ReturnVersion.xml similarity index 100% rename from auth/apiproxy/policies/ReturnVersion.xml rename to edge/apiproxy/policies/ReturnVersion.xml diff --git a/auth/apiproxy/policies/SetQuotaResponse.xml b/edge/apiproxy/policies/SetQuotaResponse.xml similarity index 100% rename from auth/apiproxy/policies/SetQuotaResponse.xml rename to edge/apiproxy/policies/SetQuotaResponse.xml diff --git a/auth/apiproxy/proxies/default.xml b/edge/apiproxy/proxies/default.xml similarity index 100% rename from auth/apiproxy/proxies/default.xml rename to edge/apiproxy/proxies/default.xml diff --git a/auth/apiproxy/resources/java/edge-micro-javacallout-1.0.0.jar b/edge/apiproxy/resources/java/edge-micro-javacallout-1.0.0.jar similarity index 100% rename from auth/apiproxy/resources/java/edge-micro-javacallout-1.0.0.jar rename to edge/apiproxy/resources/java/edge-micro-javacallout-1.0.0.jar diff --git a/auth/apiproxy/resources/jsc/JSSetupVariables.js b/edge/apiproxy/resources/jsc/JSSetupVariables.js similarity index 100% rename from auth/apiproxy/resources/jsc/JSSetupVariables.js rename to edge/apiproxy/resources/jsc/JSSetupVariables.js diff --git a/auth/app/api/controllers/README.md b/edge/auth/api/controllers/README.md similarity index 100% rename from auth/app/api/controllers/README.md rename to edge/auth/api/controllers/README.md diff --git a/auth/app/api/controllers/public_key.js b/edge/auth/api/controllers/public_key.js similarity index 100% rename from auth/app/api/controllers/public_key.js rename to edge/auth/api/controllers/public_key.js diff --git a/auth/app/api/controllers/verify_api_key.js b/edge/auth/api/controllers/verify_api_key.js similarity index 100% rename from auth/app/api/controllers/verify_api_key.js rename to edge/auth/api/controllers/verify_api_key.js diff --git a/auth/app/api/controllers/volos-oauth.js b/edge/auth/api/controllers/volos-oauth.js similarity index 100% rename from auth/app/api/controllers/volos-oauth.js rename to edge/auth/api/controllers/volos-oauth.js diff --git a/auth/app/api/helpers/README.md b/edge/auth/api/helpers/README.md similarity index 100% rename from auth/app/api/helpers/README.md rename to edge/auth/api/helpers/README.md diff --git a/auth/app/api/helpers/certificates.js b/edge/auth/api/helpers/certificates.js similarity index 100% rename from auth/app/api/helpers/certificates.js rename to edge/auth/api/helpers/certificates.js diff --git a/auth/app/api/helpers/jwt.js b/edge/auth/api/helpers/jwt.js similarity index 100% rename from auth/app/api/helpers/jwt.js rename to edge/auth/api/helpers/jwt.js diff --git a/auth/app/api/helpers/password_check.js b/edge/auth/api/helpers/password_check.js similarity index 100% rename from auth/app/api/helpers/password_check.js rename to edge/auth/api/helpers/password_check.js diff --git a/auth/app/api/mocks/README.md b/edge/auth/api/mocks/README.md similarity index 100% rename from auth/app/api/mocks/README.md rename to edge/auth/api/mocks/README.md diff --git a/auth/app/api/swagger/swagger.yaml b/edge/auth/api/swagger/swagger.yaml similarity index 100% rename from auth/app/api/swagger/swagger.yaml rename to edge/auth/api/swagger/swagger.yaml diff --git a/auth/app/app.js b/edge/auth/app.js similarity index 100% rename from auth/app/app.js rename to edge/auth/app.js diff --git a/auth/app/package.json b/edge/auth/package.json similarity index 100% rename from auth/app/package.json rename to edge/auth/package.json diff --git a/package.json b/package.json index f36750dc9..c294c2551 100644 --- a/package.json +++ b/package.json @@ -47,8 +47,8 @@ } }, "scripts": { - "package": "node bin/package.js", + "package": "node cli/package.js", "test": "mocha tests", - "preinstall": "pushd auth;pushd app;npm i;popd;popd;" + "preinstall": "pushd edge;pushd auth;npm i;popd;popd;" } } \ No newline at end of file