Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

without .pub, it is treated as folder and can not pass make #157

Open
wants to merge 4,526 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4526 commits
Select commit Hold shift + click to select a range
ba9aa89
Update README-Tutorial.md
May 10, 2016
a5213d3
Update README-Tutorial.md
May 10, 2016
8c0eb66
Update README-Tutorial.md
May 10, 2016
4669d8b
Add "Logging into XOS on CloudLab" section.
May 10, 2016
2a81488
Update README.md
May 10, 2016
9e7e125
Update README.md
May 10, 2016
e54c8b2
Update README-Tutorial.md
May 10, 2016
8762f6d
Update README-Tutorial.md
May 10, 2016
691bfe4
Removed copyrighted images and setup folder
teone May 10, 2016
62c62d6
Developer view first draft
teone May 10, 2016
a9ddb63
Merge branch 'feature/api-cleanup' of github.com:open-cloud/xos into …
teone May 10, 2016
6045edc
Fixed inject bug in generator
teone May 10, 2016
53f4ed6
Added developer to common fixtures
teone May 10, 2016
daa4cd0
Merge branch 'master' of github.com:open-cloud/xos
teone May 10, 2016
eb9de70
Merge branch 'master' into feature/api-cleanup
teone May 10, 2016
41d9f72
Started generator tests
teone May 11, 2016
c9c9739
Basic tests for yeoman generator
teone May 11, 2016
4ec7c18
Added generator tests
teone May 11, 2016
9069d59
Tested generator and gulp build
teone May 11, 2016
02cbf99
ACORD UI fix: query_params
srikanthvavila May 10, 2016
d6b9645
another merging with master branch
xmaruto May 12, 2016
f248c3e
another merging with master branch
xmaruto May 12, 2016
fc3a41e
add ExampleTenant, move to separate custom_types, move macros to sepa…
smbaker May 12, 2016
f39358f
stop running m4 automatically
smbaker May 12, 2016
b24d036
pull in the exampleservice custom defs
smbaker May 12, 2016
24d70c9
TenantOfService is the right relation, not MemberOfService
smbaker May 12, 2016
7d00d60
Fixed conflicts
teone May 12, 2016
2e0fc2c
TOSCA for ExampleTenant
May 12, 2016
0835963
another merge with master branch
xmaruto May 13, 2016
7630e6e
another merge with master branch
xmaruto May 13, 2016
80ede1f
fix passthrough of tenant_message
smbaker May 13, 2016
b8be568
Tenant created by TOSCA
May 13, 2016
5b6f55a
Merge branch 'feature/test-exampleservice'
May 13, 2016
0a28004
Merged master
teone May 13, 2016
ea6ef00
Added default order and icon formatter to xosTable component
teone May 13, 2016
cb8d9b3
Default order and custom icons for status
teone May 13, 2016
f8167f1
Builded service grid
teone May 13, 2016
fee32e4
ACORD UI fix: query_params
srikanthvavila May 10, 2016
f30e91e
Merge branch 'acord_post_ons_fixes' of https://github.com/open-cloud/…
srikanthvavila May 14, 2016
c145c9d
another merge with master branch
xmaruto May 16, 2016
8e6b4ba
Skeleton for vOLT and vRouter configuration
May 16, 2016
7725233
Removed copyrighted login background
teone May 16, 2016
f5f3531
Removed bowerDeps from auto-scale framework
teone May 16, 2016
1d3f50a
Merge pull request #142 from open-cloud/feature/serviceGrid
teone May 16, 2016
b3b0317
Upgraded truckroll view
teone May 16, 2016
f2ec12b
Fixed tests
teone May 16, 2016
1a5a44e
Merged branch api-cleanup
teone May 16, 2016
c44effa
Updated path in view generator readme
teone May 17, 2016
47e141c
Build local certificates into xos docker container
zdw May 17, 2016
78e9d0e
updated diagnostic dashboard
teone May 17, 2016
c959e4f
added Username check from Git
arpiagariu May 17, 2016
81ef176
Merge pull request #145 from arpiagariu/master
teone May 17, 2016
b21da2f
Defined a karma config to test all builded views
teone May 17, 2016
57fd115
Moved Content Provider Dashboard to new generator
teone May 18, 2016
9ef11a8
Updated OpenVPN Dashboard
teone May 18, 2016
6a2b100
Updated truckroll dashboard to new generator
teone May 18, 2016
c76bec5
notes on ONS demo changes
sbconsulting May 18, 2016
835a9ac
Update README.md
sbconsulting May 18, 2016
0e8f4fa
Update README.md
sbconsulting May 18, 2016
5a46cd7
Update README.md
sbconsulting May 18, 2016
ea31ee1
Update README.md
sbconsulting May 18, 2016
7fbd25e
Update README-Tutorial.md
May 18, 2016
10d70cd
Update README-Tutorial.md
May 18, 2016
86e42d9
Update README-Tutorial.md
May 18, 2016
d24b871
Changed ngXosLib CI tests to include builded views
teone May 18, 2016
8f48f58
Merge branch 'master' of github.com:open-cloud/xos
teone May 18, 2016
a31617e
Added boolean filter to xosTable
teone May 18, 2016
72f0fe2
enable exampleservice, fixes for ubuntu vs root user
zdw May 19, 2016
bd8aaaf
vSG image builder, WIP
smbaker May 19, 2016
c89ba82
readme file
smbaker May 19, 2016
0e9282b
add cleanup target
smbaker May 19, 2016
5773d20
a newer version of ansible is required, than the one that is in the 1…
smbaker May 19, 2016
f02260d
install docker and other things
smbaker May 19, 2016
d4dc428
cleanup some debugging messages
smbaker May 19, 2016
26d31fa
download vsg custom image
smbaker May 19, 2016
859b7c0
Fixed bub CORD-147
arpiagariu May 19, 2016
2aaeafc
image must end in .img extension
smbaker May 19, 2016
375b1c4
add base_props to image
smbaker May 19, 2016
e41b3ab
Added changes for custom Logout Page
arpiagariu May 19, 2016
ca37988
tool to wait for an object to show up
smbaker May 19, 2016
b7f01a6
make sure the vSG image doesn't get installed automatically by XOS
smbaker May 20, 2016
c2cf852
service images now determined from slice.default_image
smbaker May 20, 2016
3ed192f
set default image for using vsg
smbaker May 20, 2016
06cea3f
set default_image for exampleservice
smbaker May 20, 2016
4814eda
xos container gets public, not private, key
zdw May 20, 2016
10172cb
Merge branch 'master' into feature/container_ssl
zdw May 20, 2016
61bd786
remove bridgeutils, docker, pipework, and resolv.conf steps from vSG …
smbaker May 20, 2016
b897a96
Changes to CSS file
arpiagariu May 20, 2016
f313603
Merge pull request #148 from arpiagariu/master
teone May 20, 2016
c998fa3
set default_image for vcpe and vsg slices
smbaker May 20, 2016
f0a5f98
Merge branch 'feature/vsg_image'
smbaker May 20, 2016
1a889a1
Merge branch 'master' into feature/container_ssl
zdw May 22, 2016
2b345ec
remove exampleservice inclusion
zdw May 22, 2016
85b0a67
remove empty line from end to fix merge issue when adding exampleservice
zdw May 22, 2016
61f8e7f
try to prevent disk filling up with obeserver logs
smbaker May 22, 2016
91dfaa2
install requests with package manager, not pip
zdw May 23, 2016
8bdeb3d
revert requests change, as problem lies elsewhere
zdw May 23, 2016
1388b8c
specify path to CA certificates so requests doesn't fail
zdw May 23, 2016
b85a047
remove vlan_id
smbaker May 23, 2016
881fed5
Updated generator to read parent env config
teone May 23, 2016
9f87585
Merge branch 'feature/ui-dev-environmnent'
teone May 24, 2016
cfabf85
Added empty env folder
teone May 24, 2016
e708e84
fix users was renamed to devices
smbaker May 24, 2016
36d007a
eliminate debug output of db queries
smbaker May 24, 2016
27b36bc
new data modeling for vOLT service; promote VOLTTenant fields from di…
smbaker May 24, 2016
999750c
fix django unable to find user model
smbaker May 24, 2016
42be9e9
make vOLT a first-class tosca service
smbaker May 24, 2016
99677fd
fix image downloaded when it shouldn't be
smbaker May 24, 2016
4912b5c
Merge branch 'master' into feature/container_ssl
zdw May 24, 2016
4e5d824
remove testing code
zdw May 24, 2016
b9f8821
make SSL cert inclusion changes to all dockerfiles
zdw May 24, 2016
a9831c5
Resolve conlict with XOS master
teone May 24, 2016
3d7fcc8
fix class name
smbaker May 24, 2016
acbe9ff
Added filtering by site to sliceplus API
teone May 24, 2016
3424ab1
gave VOLTDevice and AccessAgent names
smbaker May 24, 2016
fa8b4e8
gave VOLTDevice and AccessAgent names
smbaker May 24, 2016
b86e594
first cut at Tosca for VOLT Devices
smbaker May 24, 2016
7940aad
allow AccessDevice to be specified as a comma-separated list in VOLTD…
smbaker May 24, 2016
314bf35
add cord-volt-devices.yaml to makefiles
smbaker May 24, 2016
2f5d0bc
add logging options to limit size of log files
smbaker May 24, 2016
02550c3
Merge branch 'master' of github.com:open-cloud/xos
smbaker May 24, 2016
b5aa09d
add admin hyperlinks
smbaker May 24, 2016
2c65caf
use root instead of ubuntu user
zdw May 25, 2016
0a3a89d
Merge branch 'master' into feature/container_ssl
zdw May 25, 2016
1476149
Fix case where no certs in /usr/local/share/ca-certificates, per acb
zdw May 25, 2016
1c368a9
Let certain steps be run always
sb98052 May 25, 2016
af68061
Sketched Diag API
teone May 25, 2016
e5be182
Started refactoring of Subscriber Dashboard
teone May 25, 2016
4196a01
4255 instead of $ to avoid replacement in Makefile
zdw May 25, 2016
1afc6e0
fix conflict
smbaker May 25, 2016
b624923
reconcile with master
smbaker May 25, 2016
ea77c3e
do not allocate default start_ip/end_ip
smbaker May 25, 2016
4d72c7d
eliminate duplicate code
smbaker May 25, 2016
2293f98
First to subscriber dashboard
teone May 25, 2016
2241ed5
fixed certificate loop
zdw May 25, 2016
1854d66
Merge branch 'mcord-merge'
smbaker May 25, 2016
0a1bbf5
fix check of vsg image name
smbaker May 25, 2016
7b4fae0
Fixed UI tests after merge
teone May 25, 2016
bf6d084
Fix typo, dependency based image downloads, only run nodes.yaml tosca…
zdw May 25, 2016
f074e8a
finished merge
zdw May 25, 2016
741d6b4
Splitted form component
teone May 25, 2016
df23cdb
New subscriber view
teone May 26, 2016
030296d
remove rebuild of CA list, as it's done in the xos container build
zdw May 26, 2016
e31bf9f
Merge pull request #149 from open-cloud/feature/container_ssl
May 26, 2016
02deb14
Fix path
May 26, 2016
2aca9ab
Finished subscriber view
teone May 26, 2016
9260134
Merge branch 'master' of github.com:open-cloud/xos
teone May 26, 2016
9720ebf
Fixed mock command in frontend config
teone May 26, 2016
e9c1b72
Rebuild ngXosLib
teone May 26, 2016
a4b9786
log to sync
teone May 26, 2016
fda7f2c
creating diag objects
teone May 27, 2016
9f8fef7
Initial cut at vOLT config
May 27, 2016
0c3273b
creating diag objects
teone May 27, 2016
b1c7055
Creating diag object with readable name
teone May 27, 2016
730bc60
For development
May 27, 2016
68d447a
Fix syntax error
May 27, 2016
02f30b5
For development
May 27, 2016
78994e8
Frontend dev: Don't download image
May 27, 2016
66317a6
Add vOLT and Fabric ONOS apps
May 27, 2016
90c80ed
rework xos Dockerfiles to have a 'base' image that isn't run but hand…
zdw May 27, 2016
b80f3e7
Prevent no_container from getting deleted
May 27, 2016
17667c9
imports
May 27, 2016
2906911
Integrated notification panel in header
teone May 27, 2016
b18b81b
update diag more frequently
smbaker May 27, 2016
c3a5590
Merge branch 'feature/sync_feedback' of https://github.com/open-cloud…
smbaker May 27, 2016
d4b402f
Fix addition of ansible-hosts to xos-base Dockerfile
zdw May 27, 2016
2d2eb42
fix/consolidate phantomjs portions of Dockerfike.base
zdw May 27, 2016
fb24b51
rework Dockerfiles to depend on xosproject/xos-base
zdw May 27, 2016
ce9d635
Change test container to install nodejs with a local key and install …
zdw May 27, 2016
45b102d
Merge branch 'master' into feature/docker_base
zdw May 27, 2016
9d2e980
update Makefiles to run a docker-compose build before up
zdw May 28, 2016
8896862
exclude cord-pod images dir from docker builds
zdw May 28, 2016
be6c927
path and other fixes
zdw May 28, 2016
4142a0d
remove extraneous build commands
zdw May 28, 2016
0e2da4b
apply best practice of emptying /var/lib/apt/lists/* after apt-get run
zdw May 28, 2016
6dfa91c
Merge branch 'master' into feature/docker_base
zdw May 28, 2016
24e7f6d
make heat-translator (TOSCA tool) download/install part of Dockerfile
zdw May 29, 2016
84e4b6c
Best practices and remove tosca script install
zdw May 29, 2016
a60b12f
make heat-translator (TOSCA tool) download/install part of Dockerfile
zdw May 29, 2016
e8a8d9e
clean up unused parts of heat-translator git clone
zdw May 29, 2016
c0feb8c
Merge branch 'master' into feature/docker_base
zdw May 31, 2016
7744190
Apply changes to TOSCA setup to Dockerfile.devel, as they are in Dock…
zdw May 31, 2016
f634806
need to truncate /opt/tosca/translator/__init__.py, not just create it
zdw May 31, 2016
24464a6
Work in progress on Synchronizer notification
teone May 31, 2016
ba41821
Use 'REF' to generically refer to branch/commit/etc.
zdw May 31, 2016
62e0c61
Merged xosValidation pull-request
teone May 31, 2016
80114de
rebuild Docker containers by default
zdw May 31, 2016
00db9ee
Running sync fixes this issue: https://github.com/docker/docker/issue…
zdw May 31, 2016
5a5ff4c
volt autoconfig for access agent
alshabib May 31, 2016
0c989e0
ali stopped
teone May 31, 2016
94b454f
aligning indent
alshabib Jun 1, 2016
34756cf
add comma
smbaker Jun 1, 2016
c710153
remove 'objects'
smbaker Jun 1, 2016
3bedb26
remove extraneous code
smbaker Jun 1, 2016
4189cf5
remove extraneous code
smbaker Jun 1, 2016
c806574
First working draft with notifications
teone Jun 1, 2016
af52d45
Merged master
teone Jun 1, 2016
4c4440b
pulled
teone Jun 1, 2016
f0958b1
Sync notification working, need to be tested
teone Jun 1, 2016
585c884
Remove volt_component_config from autogenerate
Jun 1, 2016
9b6d11f
Tested notification
teone Jun 1, 2016
ab8a455
Set interval for production
teone Jun 1, 2016
44cef4f
Merge pull request #151 from open-cloud/feature/docker_base
zdw Jun 1, 2016
64faee4
Updated observer.py to read the default Diag object
teone Jun 1, 2016
a613309
Merge branch 'master' of github.com:open-cloud/xos
teone Jun 1, 2016
db196ab
fix test-standalone configuration by building xos-base
zdw Jun 1, 2016
67ee76e
added pgwc service changes
xmaruto Jun 2, 2016
85e6c69
Merge branch 'feature/volt'
Jun 2, 2016
d21b006
Uncomment vsg_custom_images target
Jun 2, 2016
6774d0f
Changed test container to xos-test
teone Jun 2, 2016
d9ee3cc
Merge branch 'master' of github.com:open-cloud/xos
teone Jun 2, 2016
f07076b
doc for new Validation Rules
arpiagariu Jun 2, 2016
4a55904
Merge branch 'master' of https://github.com/open-cloud/xos
arpiagariu Jun 2, 2016
185f665
Merge pull request #153 from arpiagariu/master
teone Jun 2, 2016
e0f3305
sync devel and cord-pod target naming
zdw Jun 3, 2016
1a29b2a
ACORD UI fix: query_params
srikanthvavila May 10, 2016
9f2b42f
fix case when no SSL certs
zdw Jun 3, 2016
5a0618b
Merge branch 'acord_post_ons_fixes' of https://github.com/open-cloud/…
srikanthvavila Jun 3, 2016
0ef1b80
check in missing file
smbaker Jun 3, 2016
e45bd80
changed meta-targets to use local_containers
zdw Jun 3, 2016
7c36c68
Merge branch 'master' of github.com:open-cloud/xos
zdw Jun 3, 2016
8980ee8
Undo ExampleService changes as new framework would enable on-boarding…
srikanthvavila Jun 3, 2016
80159a9
ACORD UI fix: query_params
srikanthvavila May 10, 2016
d19b3fa
Undo ExampleService changes as new framework would enable on-boarding…
srikanthvavila Jun 3, 2016
2b28ce5
Merge branch 'acord_post_ons_fixes' of https://github.com/open-cloud/…
srikanthvavila Jun 3, 2016
c956045
fixed typo
zdw Jun 3, 2016
67af43d
Merge branch 'master' of github.com:open-cloud/xos
zdw Jun 3, 2016
7c1975d
Added select field to XOS components
arpiagariu Jun 3, 2016
70be2fc
Merge pull request #154 from arpiagariu/master
teone Jun 3, 2016
be13607
Fixed code formatting
teone Jun 3, 2016
f06606a
Merge pull request #152 from girishgc/vPGWc_Service
sbconsulting Jun 5, 2016
b037c76
fix shell globbing mistake
zdw Jun 6, 2016
d786e1b
Fixed UI - Suit tab bug
teone Jun 6, 2016
c00865d
Fixed bug in xosForm
teone Jun 6, 2016
2991945
changes for vPGWc service in MCORD
xmaruto Jun 7, 2016
a06fefd
VTN app has moved to opencord.org
Jun 8, 2016
30f6e27
BUG: Prevent repetitive processing of already sync'd objects
sb98052 Jun 8, 2016
42d2689
add onos workaround dockerfile
zdw Jun 8, 2016
aaa9b7e
revert a06fefdb8 until we get a working version of the ONOS vtn
zdw Jun 8, 2016
e59cd4c
Added ability to configure an object field in xosField
teone Jun 8, 2016
a23cf6c
Merge branch 'master' of github.com:open-cloud/xos
teone Jun 8, 2016
56930d9
another guess at a possibly valid ONOS commit
zdw Jun 8, 2016
be952e9
Merge branch 'master' of github.com:open-cloud/xos
zdw Jun 8, 2016
6f66e23
Updated form.helpers service to support configuration of field object
teone Jun 8, 2016
18d7e06
Merge branch 'master' of github.com:open-cloud/xos
teone Jun 8, 2016
f32949c
add nova-compute for test on cloudlab
Jun 9, 2016
755741e
Merge pull request #155 from girishgc/vPGWc_Service
sbconsulting Jun 9, 2016
1fc03da
Merge branch 'master' of https://github.com/open-cloud/xos into open-…
Jun 9, 2016
3d50b13
Merge branch 'open-cloud-master'
Jun 9, 2016
33a27b3
without .pub, it is treated as folder and can not pass make
Jun 10, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 4 additions & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
views/
applications/
xos/tests/api/node_modules
xos/configurations/cord-pod/images
25 changes: 23 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,25 @@
*orig
*pyc
*.orig
*.pyc
*.swp
profile
*.moved-aside
.idea
setup/*
setup/id_rsa/*
xos/configurations/frontend/Dockerfile
xos/configurations/mcord/admin-openrc.sh
xos/configurations/setup/*
xos/configurations/common/*
xos/core/xoslib/karma-*
xos/core/xoslib/docs
xos/core/xoslib/coverage
node_modules
xos/xos_configuration/*
.idea/*
*.iml
npm-debug.log
xos/core/static/*.css
!xos/core/static/xos.css
.DS_Store
xos/configurations/setup/
migrations/
202 changes: 202 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
53 changes: 0 additions & 53 deletions Makefile

This file was deleted.

19 changes: 19 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
## Getting Started with XOS and CORD

For a general introduction to XOS and how it is used in CORD, see
http://guide.xosproject.org. The "Developer Guide" at that URL is
especially helpful, although it isn't perfectly sync'ed with master.
Additional design notes, presentations, and other collateral are
also available at http://xosproject.org and http://opencord.org.

The best way to get started is to look at the collection of
canned configurations in `xos/configurations/`. The `cord`
configuration in that directory corresponds to our current
CORD development environment, and the `README.md` you'll find there
will help you get started.

Source tree layout:
* applications -- stand-alone applications that run on top of XOS.
* containers -- common Dockerfiles used by various XOS configurations
* views -- mechanisms to extend XOS with customized views
* xos -- XOS internals
Loading