Updated Branches: refs/heads/master caba77cf9 -> 48b0c1651
JCLOUDS-31. License header cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/commit/48b0c165 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/tree/48b0c165 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/diff/48b0c165 Branch: refs/heads/master Commit: 48b0c165170a4746d4dfc3d1be02766aabd26af4 Parents: caba77c Author: Andrew Bayer <[email protected]> Authored: Fri May 24 11:57:59 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Fri May 24 11:57:59 2013 -0700 ---------------------------------------------------------------------- .../src/main/assembly/jar-with-dependencies.xml | 26 +++++----- camel-notifications/src/main/resources/logback.xml | 26 +++++----- .../src/main/assembly/jar-with-dependencies.xml | 26 +++++----- chef-basics/src/main/resources/logback.xml | 26 +++++----- .../src/main/assembly/jar-with-dependencies.xml | 26 +++++----- .../src/main/assembly/jar-with-dependencies.xml | 26 +++++----- compute-basics/src/main/resources/logback.xml | 26 +++++----- compute-clojure/resources/logback.xml | 26 +++++----- .../src/main/assembly/jar-with-dependencies.xml | 26 +++++----- .../jclouds/examples/ec2/windows/Arguments.java | 12 ++-- .../src/main/assembly/jar-with-dependencies.xml | 26 +++++----- minecraft-compute/src/main/resources/logback.xml | 26 +++++----- play-compute/app/controllers/Application.java | 12 ++-- play-compute/app/views/index.scala.html | 38 ++++++++------- play-compute/app/views/main.scala.html | 38 ++++++++------- play-compute/project/Build.scala | 12 ++-- play-compute/project/plugins.sbt | 12 ++-- play-compute/public/stylesheets/main.css | 12 ++-- pom.xml | 26 +++++----- rackspace/src/main/resources/logback.xml | 36 +++++++------- 20 files changed, 232 insertions(+), 252 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/blobstore-basics/src/main/assembly/jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/blobstore-basics/src/main/assembly/jar-with-dependencies.xml b/blobstore-basics/src/main/assembly/jar-with-dependencies.xml index 8bcedb2..aaa208c 100644 --- a/blobstore-basics/src/main/assembly/jar-with-dependencies.xml +++ b/blobstore-basics/src/main/assembly/jar-with-dependencies.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/camel-notifications/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/camel-notifications/src/main/resources/logback.xml b/camel-notifications/src/main/resources/logback.xml index 4d76c7e..a7b2c96 100644 --- a/camel-notifications/src/main/resources/logback.xml +++ b/camel-notifications/src/main/resources/logback.xml @@ -1,22 +1,20 @@ <?xml version="1.0"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/chef-basics/src/main/assembly/jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/chef-basics/src/main/assembly/jar-with-dependencies.xml b/chef-basics/src/main/assembly/jar-with-dependencies.xml index 8bcedb2..aaa208c 100644 --- a/chef-basics/src/main/assembly/jar-with-dependencies.xml +++ b/chef-basics/src/main/assembly/jar-with-dependencies.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/chef-basics/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/chef-basics/src/main/resources/logback.xml b/chef-basics/src/main/resources/logback.xml index b7871ff..46429a6 100644 --- a/chef-basics/src/main/resources/logback.xml +++ b/chef-basics/src/main/resources/logback.xml @@ -1,22 +1,20 @@ <?xml version="1.0"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/cloudwatch-basics/src/main/assembly/jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/cloudwatch-basics/src/main/assembly/jar-with-dependencies.xml b/cloudwatch-basics/src/main/assembly/jar-with-dependencies.xml index 8bcedb2..aaa208c 100644 --- a/cloudwatch-basics/src/main/assembly/jar-with-dependencies.xml +++ b/cloudwatch-basics/src/main/assembly/jar-with-dependencies.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/compute-basics/src/main/assembly/jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/compute-basics/src/main/assembly/jar-with-dependencies.xml b/compute-basics/src/main/assembly/jar-with-dependencies.xml index 8bcedb2..aaa208c 100644 --- a/compute-basics/src/main/assembly/jar-with-dependencies.xml +++ b/compute-basics/src/main/assembly/jar-with-dependencies.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/compute-basics/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/compute-basics/src/main/resources/logback.xml b/compute-basics/src/main/resources/logback.xml index b7871ff..46429a6 100644 --- a/compute-basics/src/main/resources/logback.xml +++ b/compute-basics/src/main/resources/logback.xml @@ -1,22 +1,20 @@ <?xml version="1.0"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/compute-clojure/resources/logback.xml ---------------------------------------------------------------------- diff --git a/compute-clojure/resources/logback.xml b/compute-clojure/resources/logback.xml index b7871ff..46429a6 100644 --- a/compute-clojure/resources/logback.xml +++ b/compute-clojure/resources/logback.xml @@ -1,22 +1,20 @@ <?xml version="1.0"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/ec2-windows/src/main/assembly/jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/ec2-windows/src/main/assembly/jar-with-dependencies.xml b/ec2-windows/src/main/assembly/jar-with-dependencies.xml index 4e26abc..5857f6a 100644 --- a/ec2-windows/src/main/assembly/jar-with-dependencies.xml +++ b/ec2-windows/src/main/assembly/jar-with-dependencies.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/ec2-windows/src/main/java/org/jclouds/examples/ec2/windows/Arguments.java ---------------------------------------------------------------------- diff --git a/ec2-windows/src/main/java/org/jclouds/examples/ec2/windows/Arguments.java b/ec2-windows/src/main/java/org/jclouds/examples/ec2/windows/Arguments.java index ca40065..fcbd88f 100644 --- a/ec2-windows/src/main/java/org/jclouds/examples/ec2/windows/Arguments.java +++ b/ec2-windows/src/main/java/org/jclouds/examples/ec2/windows/Arguments.java @@ -1,14 +1,14 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file + * regarding copyright ownership. The ASF licenses this file * to you 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/minecraft-compute/src/main/assembly/jar-with-dependencies.xml ---------------------------------------------------------------------- diff --git a/minecraft-compute/src/main/assembly/jar-with-dependencies.xml b/minecraft-compute/src/main/assembly/jar-with-dependencies.xml index 8bcedb2..aaa208c 100644 --- a/minecraft-compute/src/main/assembly/jar-with-dependencies.xml +++ b/minecraft-compute/src/main/assembly/jar-with-dependencies.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"; http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/minecraft-compute/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/minecraft-compute/src/main/resources/logback.xml b/minecraft-compute/src/main/resources/logback.xml index d19241d..690a944 100644 --- a/minecraft-compute/src/main/resources/logback.xml +++ b/minecraft-compute/src/main/resources/logback.xml @@ -1,22 +1,20 @@ <?xml version="1.0"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <configuration> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/play-compute/app/controllers/Application.java ---------------------------------------------------------------------- diff --git a/play-compute/app/controllers/Application.java b/play-compute/app/controllers/Application.java index d6c6c05..875559e 100644 --- a/play-compute/app/controllers/Application.java +++ b/play-compute/app/controllers/Application.java @@ -1,14 +1,14 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file + * regarding copyright ownership. The ASF licenses this file * to you 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/play-compute/app/views/index.scala.html ---------------------------------------------------------------------- diff --git a/play-compute/app/views/index.scala.html b/play-compute/app/views/index.scala.html index 11ac28b..144a401 100644 --- a/play-compute/app/views/index.scala.html +++ b/play-compute/app/views/index.scala.html @@ -1,21 +1,23 @@ -@*************************************************************** - * Licensed to jclouds, Inc. (jclouds) under one or more * - * contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. jclouds licenses this file * - * to you 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. * - ***************************************************************@ +@**************************************************************** + * * + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you 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. * + * * + ****************************************************************@ @(message: String) http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/play-compute/app/views/main.scala.html ---------------------------------------------------------------------- diff --git a/play-compute/app/views/main.scala.html b/play-compute/app/views/main.scala.html index 728a28f..f24fb43 100644 --- a/play-compute/app/views/main.scala.html +++ b/play-compute/app/views/main.scala.html @@ -1,21 +1,23 @@ -@*************************************************************** - * Licensed to jclouds, Inc. (jclouds) under one or more * - * contributor license agreements. See the NOTICE file * - * distributed with this work for additional information * - * regarding copyright ownership. jclouds licenses this file * - * to you 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. * - ***************************************************************@ +@**************************************************************** + * * + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you 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. * + * * + ****************************************************************@ @(title: String)(content: Html) http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/play-compute/project/Build.scala ---------------------------------------------------------------------- diff --git a/play-compute/project/Build.scala b/play-compute/project/Build.scala index f1645fa..f77a739 100644 --- a/play-compute/project/Build.scala +++ b/play-compute/project/Build.scala @@ -1,14 +1,14 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file + * regarding copyright ownership. The ASF licenses this file * to you 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/play-compute/project/plugins.sbt ---------------------------------------------------------------------- diff --git a/play-compute/project/plugins.sbt b/play-compute/project/plugins.sbt index e8f181c..eb5700e 100644 --- a/play-compute/project/plugins.sbt +++ b/play-compute/project/plugins.sbt @@ -1,14 +1,14 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file + * regarding copyright ownership. The ASF licenses this file * to you 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/play-compute/public/stylesheets/main.css ---------------------------------------------------------------------- diff --git a/play-compute/public/stylesheets/main.css b/play-compute/public/stylesheets/main.css index b9f33b9..a0fcb3c 100644 --- a/play-compute/public/stylesheets/main.css +++ b/play-compute/public/stylesheets/main.css @@ -1,14 +1,14 @@ -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file + * regarding copyright ownership. The ASF licenses this file * to you 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 http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9c68235..9b32297 100644 --- a/pom.xml +++ b/pom.xml @@ -1,22 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Licensed to jclouds, Inc. (jclouds) under one or more -contributor license agreements. See the NOTICE file -distributed with this work for additional information -regarding copyright ownership. jclouds licenses this file -to you 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 + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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 + 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. + 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. --> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-examples/blob/48b0c165/rackspace/src/main/resources/logback.xml ---------------------------------------------------------------------- diff --git a/rackspace/src/main/resources/logback.xml b/rackspace/src/main/resources/logback.xml index 2de2a35..4c8f8be 100644 --- a/rackspace/src/main/resources/logback.xml +++ b/rackspace/src/main/resources/logback.xml @@ -1,22 +1,22 @@ <?xml version="1.0"?> -/** - * Licensed to jclouds, Inc. (jclouds) under one or more - * contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. jclouds licenses this file - * to you 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. - */ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You 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. + +--> <configuration scan="false"> <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
