diff --git a/flow/Rakefile b/flow/Rakefile index 633bffa619..d9976e887c 100644 --- a/flow/Rakefile +++ b/flow/Rakefile @@ -1,16 +1,18 @@ #!/usr/bin/env rake + # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/bin/appflow-server b/flow/bin/appflow-server index dce651e03b..2ce6653c78 100755 --- a/flow/bin/appflow-server +++ b/flow/bin/appflow-server @@ -1,17 +1,18 @@ #! /bin/sh # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/client/bin/appflow b/flow/client/bin/appflow index 34ed6ebc21..d011d694d9 100755 --- a/flow/client/bin/appflow +++ b/flow/client/bin/appflow @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/client/bin/appflow-template b/flow/client/bin/appflow-template index 6670873433..bf1912e6f1 100755 --- a/flow/client/bin/appflow-template +++ b/flow/client/bin/appflow-template @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/client/lib/appflow_client.rb b/flow/client/lib/appflow_client.rb index 8b9580af61..4d3fcc9d8b 100644 --- a/flow/client/lib/appflow_client.rb +++ b/flow/client/lib/appflow_client.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/config.ru b/flow/config.ru index 84e4ce2f37..36be3de671 100644 --- a/flow/config.ru +++ b/flow/config.ru @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/config/appflow-server.conf b/flow/config/appflow-server.conf index a47f0c4587..2f04058fc8 100644 --- a/flow/config/appflow-server.conf +++ b/flow/config/appflow-server.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/controllers/appflow-server.rb b/flow/controllers/appflow-server.rb index 0efca35d09..7b868ccd62 100644 --- a/flow/controllers/appflow-server.rb +++ b/flow/controllers/appflow-server.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/install.sh b/flow/install.sh index 9368bed704..9d28ede07e 100755 --- a/flow/install.sh +++ b/flow/install.sh @@ -1,17 +1,18 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/lcm/LifeCycleManager.rb b/flow/lcm/LifeCycleManager.rb index f3ca6c4061..0557a0ae33 100644 --- a/flow/lcm/LifeCycleManager.rb +++ b/flow/lcm/LifeCycleManager.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/lcm/strategy.rb b/flow/lcm/strategy.rb index d057884e00..58997ad346 100644 --- a/flow/lcm/strategy.rb +++ b/flow/lcm/strategy.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/lcm/strategy/straight.rb b/flow/lcm/strategy/straight.rb index cfe03d8bf0..06dba65108 100644 --- a/flow/lcm/strategy/straight.rb +++ b/flow/lcm/strategy/straight.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/lib/log.rb b/flow/lib/log.rb index d340d0d8bf..7435d4245c 100644 --- a/flow/lib/log.rb +++ b/flow/lib/log.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/lib/validator.rb b/flow/lib/validator.rb index 9590f1a4a0..0b0cfcda73 100644 --- a/flow/lib/validator.rb +++ b/flow/lib/validator.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/models.rb b/flow/models.rb index 6a8f30bcca..cf1bd02c5e 100644 --- a/flow/models.rb +++ b/flow/models.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/models/Role.rb b/flow/models/Role.rb index 3bf0def768..87904cf029 100644 --- a/flow/models/Role.rb +++ b/flow/models/Role.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/models/Service.rb b/flow/models/Service.rb index 320b10de48..da539be259 100644 --- a/flow/models/Service.rb +++ b/flow/models/Service.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/models/ServicePool.rb b/flow/models/ServicePool.rb index cf646b5efd..d7ebf9cb31 100644 --- a/flow/models/ServicePool.rb +++ b/flow/models/ServicePool.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/models/ServiceTemplate.rb b/flow/models/ServiceTemplate.rb index cb79a98fcd..000932d33e 100644 --- a/flow/models/ServiceTemplate.rb +++ b/flow/models/ServiceTemplate.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/models/ServiceTemplatePool.rb b/flow/models/ServiceTemplatePool.rb index 31c675a909..4eeb2fcf78 100644 --- a/flow/models/ServiceTemplatePool.rb +++ b/flow/models/ServiceTemplatePool.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/sunstone/etc/sunstone-appflow.conf b/flow/sunstone/etc/sunstone-appflow.conf index 2b66ee924b..d9a1c9454e 100644 --- a/flow/sunstone/etc/sunstone-appflow.conf +++ b/flow/sunstone/etc/sunstone-appflow.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js b/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js index 0699e81ab9..60546ff742 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow-dashboard.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // function updateAppFlowDashboard(what, json_info){ var db = $('#appflow_dashboard_tab',main_tabs_context); diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js index d111a24023..f61555a287 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.services.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // var Service = { "resource" : 'DOCUMENT', diff --git a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js index 470dbe578d..e8ecb5296f 100644 --- a/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js +++ b/flow/sunstone/public/js/user-plugins/apptools.appflow.templates.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // var ServiceTemplate = { "resource" : 'DOCUMENT', diff --git a/flow/sunstone/routes/appflow.rb b/flow/sunstone/routes/appflow.rb index 3a1932052f..aa131ef6e8 100644 --- a/flow/sunstone/routes/appflow.rb +++ b/flow/sunstone/routes/appflow.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/gen_package.sh b/gen_package.sh index 394bc1bb34..f31b4195fa 100755 --- a/gen_package.sh +++ b/gen_package.sh @@ -1,7 +1,7 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # # 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 # @@ -16,7 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # -VERSION=${VERSION:-3.8.2} +VERSION=${VERSION:-3.8.3} MAINTAINER=${MAINTAINER:-C12G Labs } LICENSE=${LICENSE:-Apache} PACKAGE_NAME=${PACKAGE_NAME:-oneapps} @@ -36,16 +36,27 @@ DIRS="oneapps stage flow market" export DESTDIR=$PWD/tmp if [ "$(id -u)" = "0" ]; then - OWNER_FLAGS='-u oneadmin -g oneadmin' + FLAGS='-u oneadmin -g oneadmin' fi +FLAVOR="other" +if [ "$PACKAGE_TYPE" = "deb" ]; then + FLAGS="$FLAGS -f debian" + FLAVOR="debian" +fi + +# Generate postinstall +sed "s/#FLAVOR#/$FLAVOR/" < $SCRIPTS_DIR/oneapps/postinstall.sh > \ + $SCRIPTS_DIR/oneapps/postinstall +chmod +x $SCRIPTS_DIR/oneapps/postinstall + rm -rf $DESTDIR mkdir $DESTDIR for TOOL in $DIRS; do ( cd $TOOL - ./install.sh $OWNER_FLAGS + ./install.sh $FLAGS ) done @@ -54,7 +65,7 @@ cd tmp fpm -n "$PACKAGE_NAME" -t "$PACKAGE_TYPE" -s dir --vendor "$VENDOR" \ --license "$LICENSE" --description "$DESCRIPTION" --url "$URL" \ -m "$MAINTAINER" -v "$VERSION" \ - --after-install $SCRIPTS_DIR/oneapps/postinstall.sh \ + --after-install $SCRIPTS_DIR/oneapps/postinstall \ -a all -p $SCRIPTS_DIR/$NAME * diff --git a/install_lib.sh b/install_lib.sh index 799e1571ee..5a4cfd82bd 100644 --- a/install_lib.sh +++ b/install_lib.sh @@ -1,23 +1,25 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # usage() { echo - echo "Usage: install.sh [-u install_user] [-g install_group]" + echo "Usage: install.sh [-u install_user] [-g install_group] [-f flavour]" echo " [-d ONE_LOCATION] [-l] [-h]" echo + echo "-f: distribution, debian or other" echo "-d: target installation directory, if not defined it'd be root. Must be" echo " an absolute path." echo "-l: creates symlinks instead of copying files, useful for development" @@ -43,6 +45,7 @@ LINK="no" ONEADMIN_USER=`id -u` ONEADMIN_GROUP=`id -g` SRC_DIR=$PWD +FLAVOR="other" while true ; do case "$1" in @@ -51,18 +54,33 @@ while true ; do -l) LINK="yes" ; shift ;; -u) ONEADMIN_USER="$2" ; shift 2;; -g) ONEADMIN_GROUP="$2"; shift 2;; + -f) FLAVOR="$2"; shift 2;; --) shift ; break ;; *) usage; exit 1 ;; esac done +echo $FLAVOR + if [ -z "$ROOT" ]; then - LIB_LOCATION="/usr/lib/one/ruby/oneapps" - BIN_LOCATION="/usr/bin" - PACKAGES_LOCATION="/usr/share/one/oneapps" - SHARE_LOCATION="/usr/share/one/oneapps" - ETC_LOCATION="/etc/one" - SUNSTONE_LOCATION="/usr/lib/one/sunstone" + case "$FLAVOR" in + "debian") + LIB_LOCATION="/usr/lib/one/ruby/oneapps" + BIN_LOCATION="/usr/bin" + PACKAGES_LOCATION="/usr/share/opennebula/oneapps" + SHARE_LOCATION="/usr/share/opennebula/oneapps" + ETC_LOCATION="/etc/one" + SUNSTONE_LOCATION="/usr/share/opennebula/sunstone" + ;; + *) + LIB_LOCATION="/usr/lib/one/ruby/oneapps" + BIN_LOCATION="/usr/bin" + PACKAGES_LOCATION="/usr/share/one/oneapps" + SHARE_LOCATION="/usr/share/one/oneapps" + ETC_LOCATION="/etc/one" + SUNSTONE_LOCATION="/usr/lib/one/sunstone" + ;; + esac else LIB_LOCATION="$ROOT/lib/ruby/oneapps" BIN_LOCATION="$ROOT/bin" diff --git a/market/Gemfile b/market/Gemfile index 92a322c9ad..5ebbf6725c 100644 --- a/market/Gemfile +++ b/market/Gemfile @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/Rakefile b/market/Rakefile index 0a27807db9..e2a78bfbd2 100644 --- a/market/Rakefile +++ b/market/Rakefile @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/bin/appmarket-server b/market/bin/appmarket-server index 85bb43841d..eaf138108d 100755 --- a/market/bin/appmarket-server +++ b/market/bin/appmarket-server @@ -1,7 +1,7 @@ #! /bin/sh # -------------------------------------------------------------------------- # -# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org) # +# Copyright 2010-2013, C12G Labs S.L. # # # # 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 # diff --git a/market/client/bin/appmarket b/market/client/bin/appmarket index 09c6c64d21..2c99d0d6a9 100755 --- a/market/client/bin/appmarket +++ b/market/client/bin/appmarket @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/client/bin/appmarket-user b/market/client/bin/appmarket-user index a8c927517c..2d21f7ac41 100755 --- a/market/client/bin/appmarket-user +++ b/market/client/bin/appmarket-user @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/client/lib/appmarket_client.rb b/market/client/lib/appmarket_client.rb index b58a3378bb..ef0a6aa26b 100644 --- a/market/client/lib/appmarket_client.rb +++ b/market/client/lib/appmarket_client.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/config.ru b/market/config.ru index 5cccbbd51f..e46c82fadf 100644 --- a/market/config.ru +++ b/market/config.ru @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/config/appmarket-server.conf b/market/config/appmarket-server.conf index 5df7d4dcef..4d254f79f9 100644 --- a/market/config/appmarket-server.conf +++ b/market/config/appmarket-server.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/config/init.rb b/market/config/init.rb index fd46e3227f..60d2ff968a 100644 --- a/market/config/init.rb +++ b/market/config/init.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/controllers/appmarket-server.rb b/market/controllers/appmarket-server.rb index ca600eaf00..d643869c5e 100644 --- a/market/controllers/appmarket-server.rb +++ b/market/controllers/appmarket-server.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/install.sh b/market/install.sh index c1dcec144e..a365f05a07 100755 --- a/market/install.sh +++ b/market/install.sh @@ -1,17 +1,18 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/lib/mailer.rb b/market/lib/mailer.rb index 25fa2d018e..2681fbdd34 100644 --- a/market/lib/mailer.rb +++ b/market/lib/mailer.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/lib/parser.rb b/market/lib/parser.rb index 6ff302dc25..bdbd66eb87 100644 --- a/market/lib/parser.rb +++ b/market/lib/parser.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/lib/session.rb b/market/lib/session.rb index 524cb5cf41..85a79e4ea9 100644 --- a/market/lib/session.rb +++ b/market/lib/session.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/lib/validator.rb b/market/lib/validator.rb index 9590f1a4a0..0b0cfcda73 100644 --- a/market/lib/validator.rb +++ b/market/lib/validator.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/models.rb b/market/models.rb index c02fe76ec1..25c631dba8 100644 --- a/market/models.rb +++ b/market/models.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/models/appliance.rb b/market/models/appliance.rb index 077b9c70c4..3fb7aa5158 100644 --- a/market/models/appliance.rb +++ b/market/models/appliance.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/models/user.rb b/market/models/user.rb index d5c3da7905..75556f5245 100644 --- a/market/models/user.rb +++ b/market/models/user.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/sunstone/etc/sunstone-appmarket.conf b/market/sunstone/etc/sunstone-appmarket.conf index f907793d39..a2ff846d58 100644 --- a/market/sunstone/etc/sunstone-appmarket.conf +++ b/market/sunstone/etc/sunstone-appmarket.conf @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js b/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js index a59c44d38b..28dc59ce3b 100644 --- a/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js +++ b/market/sunstone/public/js/user-plugins/apptools.appmarket-dashboard.js @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // function updateAppMarketDashboard(what, json_info){ var db = $('#appmarket_dashboard_tab',main_tabs_context); diff --git a/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js b/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js index dfafe288b6..1caf48e078 100644 --- a/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js +++ b/market/sunstone/public/js/user-plugins/apptools.appmarket.appliances.js @@ -1,18 +1,18 @@ -/* -------------------------------------------------------------------------- */ -/* Copyright 2010-2012, C12G Labs S.L */ -/* */ -/* 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. */ -/* -------------------------------------------------------------------------- */ +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // +// // +// 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. // +//------------------------------------------------------------------------- // /* Marketpplace tab plugin */ var dataTable_appmarket; diff --git a/market/sunstone/routes/appmarket.rb b/market/sunstone/routes/appmarket.rb index e6e1c86df7..49124f91a3 100644 --- a/market/sunstone/routes/appmarket.rb +++ b/market/sunstone/routes/appmarket.rb @@ -1,15 +1,16 @@ # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/market/views/app_form.haml b/market/views/app_form.haml index 0d2d099e60..79b05a2f80 100644 --- a/market/views/app_form.haml +++ b/market/views/app_form.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %fieldset .control-group diff --git a/market/views/appliance_index.haml b/market/views/appliance_index.haml index 4b8377df5f..417b3e89f5 100644 --- a/market/views/appliance_index.haml +++ b/market/views/appliance_index.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/market/views/appliance_show.haml b/market/views/appliance_show.haml index 447ed90994..2d348936ae 100644 --- a/market/views/appliance_show.haml +++ b/market/views/appliance_show.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/market/views/custom/banner.haml b/market/views/custom/banner.haml index 79ff2577a1..935f5ec7e9 100644 --- a/market/views/custom/banner.haml +++ b/market/views/custom/banner.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .row-fluid .span4 diff --git a/market/views/custom/footer.haml b/market/views/custom/footer.haml index 1e16ade778..c1c9b5c9cc 100644 --- a/market/views/custom/footer.haml +++ b/market/views/custom/footer.haml @@ -1,20 +1,21 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %p - © 2012 C12G Labs S.L. All Rights Reserved. + © 2013 C12G Labs S.L. All Rights Reserved. %a{'href' => "http://www.c12g.com/legal-notice"} Legal Notice. Please send comments to %a{'href' => "mailto:marketplace@opennebula.org"} webmaster. diff --git a/market/views/custom/logos.haml b/market/views/custom/logos.haml index b8d71641fc..40601f3418 100644 --- a/market/views/custom/logos.haml +++ b/market/views/custom/logos.haml @@ -1,19 +1,20 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %a.span4{'href' => "http://www.opennebula.org/"} %img{'src' => "#{settings.root_path}img/opennebula_gray.png"} %a.pull-right{'href' => "http://www.c12g.com/"} - %img{'src' => "#{settings.root_path}img/c12g.png"} \ No newline at end of file + %img{'src' => "#{settings.root_path}img/c12g.png"} diff --git a/market/views/custom/terms_of_use.haml b/market/views/custom/terms_of_use.haml index 5a0d556322..ef43e4883c 100644 --- a/market/views/custom/terms_of_use.haml +++ b/market/views/custom/terms_of_use.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // Accept %a{'href' => 'http://www.c12g.com//marketplace-terms-of-use', 'target' => 'blank'} Terms of Use \ No newline at end of file diff --git a/market/views/custom/tittle.haml b/market/views/custom/tittle.haml index 1671958df0..be3d2a8f97 100644 --- a/market/views/custom/tittle.haml +++ b/market/views/custom/tittle.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %i.icon-shopping-cart.icon-white OpenNebula AppMarket \ No newline at end of file diff --git a/market/views/layout.haml b/market/views/layout.haml index c3c66100c7..7d97b2dccc 100644 --- a/market/views/layout.haml +++ b/market/views/layout.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // !!! %html{:lang => "en"} diff --git a/market/views/nav_login.haml b/market/views/nav_login.haml index 28e017b9cf..a8fa770a49 100644 --- a/market/views/nav_login.haml +++ b/market/views/nav_login.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %ul.nav.pull-right.nav-pills %li.divider-vertical diff --git a/market/views/user_form.haml b/market/views/user_form.haml index 71a68cccbb..b051edec00 100644 --- a/market/views/user_form.haml +++ b/market/views/user_form.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // %fieldset .control-group diff --git a/market/views/user_index.haml b/market/views/user_index.haml index 455ad926a4..e213c3cd67 100644 --- a/market/views/user_index.haml +++ b/market/views/user_index.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/market/views/user_show.haml b/market/views/user_show.haml index 739f02fa92..bc4a7d768f 100644 --- a/market/views/user_show.haml +++ b/market/views/user_show.haml @@ -1,17 +1,18 @@ -//--------------------------------------------------------------------------// -// Copyright 2010-2012, C12G Labs S.L. // +// ------------------------------------------------------------------------ // +// Copyright 2010-2013, C12G Labs S.L. // // // -// Licensed under the C12G Commercial Open-source License (the // -// "License"); you may not use this file except in compliance // -// with the License. You may obtain a copy of the License as part // -// of the software distribution. // +// 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 // // // -// Unless 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 // +// 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. // -//--------------------------------------------------------------------------// +//------------------------------------------------------------------------- // .navbar.navbar-static .navbar-inner diff --git a/oneapps/gen_man b/oneapps/gen_man index f9e3e4b37a..8118e3e161 100755 --- a/oneapps/gen_man +++ b/oneapps/gen_man @@ -1,17 +1,18 @@ #!/usr/bin/env ruby # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # diff --git a/oneapps/install.sh b/oneapps/install.sh index 75d8ccddfd..14234ae7e5 100755 --- a/oneapps/install.sh +++ b/oneapps/install.sh @@ -1,22 +1,23 @@ #!/bin/bash # -------------------------------------------------------------------------- # -# Copyright 2010-2012, C12G Labs S.L. # +# Copyright 2010-2013, C12G Labs S.L. # # # -# Licensed under the C12G Commercial Open-source License (the # -# "License"); you may not use this file except in compliance # -# with the License. You may obtain a copy of the License as part # -# of the software distribution. # +# 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 # # # -# Unless 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 # +# 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. # #--------------------------------------------------------------------------- # . ../install_lib.sh -copy_files "share/sunstone/* share/LICENSE" "$SHARE_LOCATION" +copy_files "share/sunstone/* share/LICENSE share/NOTICE" "$SHARE_LOCATION" copy_files "share/version.rb" "$LIB_LOCATION" diff --git a/oneapps/postinstall.sh b/oneapps/postinstall.sh index d70a8fed12..39807e6a13 100755 --- a/oneapps/postinstall.sh +++ b/oneapps/postinstall.sh @@ -1,11 +1,26 @@ #!/bin/bash -SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml -SUNSTONE_SERVER=/etc/one/sunstone-server.conf -OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js -OPENNEBULA_JS_NEW=/usr/share/one/oneapps/sunstone/public/js/opennebula.js -SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" -APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" +FLAVOR="#FLAVOR#" + +case "$FLAVOR" in +debian) + SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml + SUNSTONE_SERVER=/etc/one/sunstone-server.conf + OPENNEBULA_JS=/usr/share/opennebula/sunstone/public/js/opennebula.js + OPENNEBULA_JS_NEW=/usr/share/opennebula/oneapps/public/js/opennebula.js + SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" + APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" + ;; + +*) + SUNSTONE_PLUGINS=/etc/one/sunstone-plugins.yaml + SUNSTONE_SERVER=/etc/one/sunstone-server.conf + OPENNEBULA_JS=/usr/lib/one/sunstone/public/js/opennebula.js + OPENNEBULA_JS_NEW=/usr/share/one/oneapps/public/js/opennebula.js + SUNSTONE_AUTH="/var/lib/one/.one/sunstone_auth" + APPFLOW_AUTH="/var/lib/one/.one/appflow_auth" + ;; +esac function print_install_message() { cat <