Updated Branches: refs/heads/1.6.x 66a377dd3 -> 2dc6e6559
Fixing a couple license headers Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/commit/2dc6e655 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/tree/2dc6e655 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/diff/2dc6e655 Branch: refs/heads/1.6.x Commit: 2dc6e655959ac293dcac998c206e24a58a8675fe Parents: 66a377d Author: Andrew Bayer <[email protected]> Authored: Wed May 22 10:58:20 2013 -0400 Committer: Andrew Bayer <[email protected]> Committed: Wed May 22 11:00:35 2013 -0400 ---------------------------------------------------------------------- chef/pom.xml | 35 ++++++++------- .../org/jclouds/karaf/core/CredentialStore.java | 28 +++++------ 2 files changed, 31 insertions(+), 32 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/2dc6e655/chef/pom.xml ---------------------------------------------------------------------- diff --git a/chef/pom.xml b/chef/pom.xml index 4a1aeac..430b362 100644 --- a/chef/pom.xml +++ b/chef/pom.xml @@ -1,24 +1,25 @@ <?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 - -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. --> -<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/xsd/maven-4.0.0.xsd";> + +<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/xsd/maven-4.0.0.xsd";> <parent> <artifactId>jclouds-karaf-pom</artifactId> <groupId>org.apache.jclouds</groupId> http://git-wip-us.apache.org/repos/asf/incubator-jclouds-karaf/blob/2dc6e655/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java b/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java index 214f30d..2bfb95c 100644 --- a/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java +++ b/core/src/main/java/org/jclouds/karaf/core/CredentialStore.java @@ -1,20 +1,18 @@ -/** - * 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. */ package org.jclouds.karaf.core;
