move files to new structure

apigee-internal · Mar 31, 2016 · de17dfa · de17dfa
1 parent c975718
commit de17dfa
Show file tree

Hide file tree

Showing 46 changed files with 30 additions and 6 deletions.
diff --git 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 → cli/cmd-cert.js b/bin/cmd-cert.js → cli/cmd-cert.js
diff --git a/bin/cmd-private.js → cli/cmd-private.js b/bin/cmd-private.js → cli/cmd-private.js
diff --git a/bin/cmd-token.js → cli/cmd-token.js b/bin/cmd-token.js → cli/cmd-token.js
diff --git a/bin/cmd.js → cli/cmd.js b/bin/cmd.js → cli/cmd.js
diff --git a/bin/edgemicro → cli/edgemicro b/bin/edgemicro → cli/edgemicro
diff --git a/bin/edgemicro-cert → cli/edgemicro-cert b/bin/edgemicro-cert → cli/edgemicro-cert
diff --git a/bin/edgemicro-private → cli/edgemicro-private b/bin/edgemicro-private → cli/edgemicro-private
diff --git a/bin/edgemicro-token → cli/edgemicro-token b/bin/edgemicro-token → cli/edgemicro-token
diff --git a/bin/lib/cert-lib.js → cli/lib/cert-lib.js b/bin/lib/cert-lib.js → cli/lib/cert-lib.js
diff --git a/bin/lib/cert.js → cli/lib/cert.js b/bin/lib/cert.js → cli/lib/cert.js
diff --git a/bin/lib/configure.js → cli/lib/configure.js b/bin/lib/configure.js → cli/lib/configure.js
diff --git a/bin/lib/deploy-auth.js → cli/lib/deploy-auth.js b/bin/lib/deploy-auth.js → 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 → cli/lib/gateway.js b/bin/lib/gateway.js → cli/lib/gateway.js
diff --git a/...ro-gateway-products-javacallout-1.0.0.jar → ...ro-gateway-products-javacallout-1.0.0.jar b/...ro-gateway-products-javacallout-1.0.0.jar → ...ro-gateway-products-javacallout-1.0.0.jar
diff --git a/bin/lib/private.js → cli/lib/private.js b/bin/lib/private.js → 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 → cli/lib/token.js b/bin/lib/token.js → cli/lib/token.js
diff --git a/bin/lib/verify.js → cli/lib/verify.js b/bin/lib/verify.js → cli/lib/verify.js
diff --git a/bin/package.js → cli/package.js b/bin/package.js → cli/package.js
diff --git a/auth/README.md → edge/README.md b/auth/README.md → 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
diff --git a/auth/apiproxy/EdgeMicro.xml → edge/apiproxy/EdgeMicro.xml b/auth/apiproxy/EdgeMicro.xml → edge/apiproxy/EdgeMicro.xml
diff --git a/auth/apiproxy/policies/Authenticate.xml → edge/apiproxy/policies/Authenticate.xml b/auth/apiproxy/policies/Authenticate.xml → edge/apiproxy/policies/Authenticate.xml
diff --git a/auth/apiproxy/policies/Callout.xml → edge/apiproxy/policies/Callout.xml b/auth/apiproxy/policies/Callout.xml → edge/apiproxy/policies/Callout.xml
diff --git a/auth/apiproxy/policies/DistributedQuota.xml → edge/apiproxy/policies/DistributedQuota.xml b/auth/apiproxy/policies/DistributedQuota.xml → edge/apiproxy/policies/DistributedQuota.xml
diff --git a/auth/apiproxy/policies/JSSetupVariables.xml → edge/apiproxy/policies/JSSetupVariables.xml b/auth/apiproxy/policies/JSSetupVariables.xml → edge/apiproxy/policies/JSSetupVariables.xml
diff --git a/auth/apiproxy/policies/NoOrgOrEnv.xml → edge/apiproxy/policies/NoOrgOrEnv.xml b/auth/apiproxy/policies/NoOrgOrEnv.xml → edge/apiproxy/policies/NoOrgOrEnv.xml
diff --git a/auth/apiproxy/policies/Return401.xml → edge/apiproxy/policies/Return401.xml b/auth/apiproxy/policies/Return401.xml → edge/apiproxy/policies/Return401.xml
diff --git a/auth/apiproxy/policies/Return404.xml → edge/apiproxy/policies/Return404.xml b/auth/apiproxy/policies/Return404.xml → edge/apiproxy/policies/Return404.xml
diff --git a/auth/apiproxy/policies/ReturnVersion.xml → edge/apiproxy/policies/ReturnVersion.xml b/auth/apiproxy/policies/ReturnVersion.xml → edge/apiproxy/policies/ReturnVersion.xml
diff --git a/auth/apiproxy/policies/SetQuotaResponse.xml → edge/apiproxy/policies/SetQuotaResponse.xml b/auth/apiproxy/policies/SetQuotaResponse.xml → edge/apiproxy/policies/SetQuotaResponse.xml
diff --git a/auth/apiproxy/proxies/default.xml → edge/apiproxy/proxies/default.xml b/auth/apiproxy/proxies/default.xml → edge/apiproxy/proxies/default.xml
diff --git a/...ces/java/edge-micro-javacallout-1.0.0.jar → ...ces/java/edge-micro-javacallout-1.0.0.jar b/...ces/java/edge-micro-javacallout-1.0.0.jar → ...ces/java/edge-micro-javacallout-1.0.0.jar
diff --git a/...piproxy/resources/jsc/JSSetupVariables.js → ...piproxy/resources/jsc/JSSetupVariables.js b/...piproxy/resources/jsc/JSSetupVariables.js → ...piproxy/resources/jsc/JSSetupVariables.js
diff --git a/auth/app/api/controllers/README.md → edge/auth/api/controllers/README.md b/auth/app/api/controllers/README.md → edge/auth/api/controllers/README.md
diff --git a/auth/app/api/controllers/public_key.js → edge/auth/api/controllers/public_key.js b/auth/app/api/controllers/public_key.js → edge/auth/api/controllers/public_key.js
diff --git a/auth/app/api/controllers/verify_api_key.js → edge/auth/api/controllers/verify_api_key.js b/auth/app/api/controllers/verify_api_key.js → edge/auth/api/controllers/verify_api_key.js
diff --git a/auth/app/api/controllers/volos-oauth.js → edge/auth/api/controllers/volos-oauth.js b/auth/app/api/controllers/volos-oauth.js → edge/auth/api/controllers/volos-oauth.js
diff --git a/auth/app/api/helpers/README.md → edge/auth/api/helpers/README.md b/auth/app/api/helpers/README.md → edge/auth/api/helpers/README.md
diff --git a/auth/app/api/helpers/certificates.js → edge/auth/api/helpers/certificates.js b/auth/app/api/helpers/certificates.js → edge/auth/api/helpers/certificates.js
diff --git a/auth/app/api/helpers/jwt.js → edge/auth/api/helpers/jwt.js b/auth/app/api/helpers/jwt.js → edge/auth/api/helpers/jwt.js
diff --git a/auth/app/api/helpers/password_check.js → edge/auth/api/helpers/password_check.js b/auth/app/api/helpers/password_check.js → edge/auth/api/helpers/password_check.js
diff --git a/auth/app/api/mocks/README.md → edge/auth/api/mocks/README.md b/auth/app/api/mocks/README.md → edge/auth/api/mocks/README.md
diff --git a/auth/app/api/swagger/swagger.yaml → edge/auth/api/swagger/swagger.yaml b/auth/app/api/swagger/swagger.yaml → edge/auth/api/swagger/swagger.yaml
diff --git a/auth/app/app.js → edge/auth/app.js b/auth/app/app.js → edge/auth/app.js
diff --git a/auth/app/package.json → edge/auth/package.json b/auth/app/package.json → edge/auth/package.json
diff --git 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;"
   }
 }