You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ab...@apache.org on 2013/05/13 22:07:47 UTC
[3/3] git commit: JCLOUDS-30. Switch to 2 space indents for POM files.
JCLOUDS-30. Switch to 2 space indents for POM files.
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/commit/8a1a423c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/tree/8a1a423c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/diff/8a1a423c
Branch: refs/heads/master
Commit: 8a1a423c455ed0511094a7cbc1a9b32074b4795e
Parents: 7907576
Author: Andrew Bayer <an...@gmail.com>
Authored: Mon May 13 10:29:06 2013 -0700
Committer: Andrew Bayer <an...@gmail.com>
Committed: Mon May 13 10:29:06 2013 -0700
----------------------------------------------------------------------
compute/pom.xml | 274 +++++++++++-----------
core/pom.xml | 236 +++++++++---------
demos/gae/pom.xml | 522 ++++++++++++++++++++--------------------
labs/hostedchef/pom.xml | 200 ++++++++--------
labs/pom.xml | 58 +++---
labs/privatechef/pom.xml | 224 +++++++++---------
pom.xml | 42 ++--
project/pom.xml | 140 ++++++------
servlet/pom.xml | 28 +-
9 files changed, 862 insertions(+), 862 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/compute/pom.xml
----------------------------------------------------------------------
diff --git a/compute/pom.xml b/compute/pom.xml
index 20e49ab..c54c3d3 100644
--- a/compute/pom.xml
+++ b/compute/pom.xml
@@ -1,149 +1,149 @@
<?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 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
+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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../project/pom.xml</relativePath>
- </parent>
- <artifactId>chef-compute</artifactId>
- <name>JClouds Chef :: Compute</name>
- <description>provisions nodes with jclouds and kick's off chef to configure and integrate</description>
- <properties>
- <test.chef.endpoint>http://localhost:4000</test.chef.endpoint>
- <test.chef.api-version />
- <test.chef.build-version />
- <test.chef.identity>chef-validator</test.chef.identity>
- <test.chef.credential>${user.home}/.chef/validation.pem</test.chef.credential>
- <test.chef.compute.provider>aws-ec2</test.chef.compute.provider>
- <test.chef.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.chef.compute.endpoint>
- <test.chef.compute.api-version>2010-06-15</test.chef.compute.api-version>
- <test.chef.compute.build-version />
- <test.chef.compute.identity>${test.aws.identity}</test.chef.compute.identity>
- <test.chef.compute.credential>${test.aws.credential}</test.chef.compute.credential>
- <test.chef.compute.template />
- </properties>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds.chef</groupId>
+ <artifactId>chef-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../project/pom.xml</relativePath>
+ </parent>
+ <artifactId>chef-compute</artifactId>
+ <name>JClouds Chef :: Compute</name>
+ <description>provisions nodes with jclouds and kick's off chef to configure and integrate</description>
+ <properties>
+ <test.chef.endpoint>http://localhost:4000</test.chef.endpoint>
+ <test.chef.api-version />
+ <test.chef.build-version />
+ <test.chef.identity>chef-validator</test.chef.identity>
+ <test.chef.credential>${user.home}/.chef/validation.pem</test.chef.credential>
+ <test.chef.compute.provider>aws-ec2</test.chef.compute.provider>
+ <test.chef.compute.endpoint>https://ec2.us-east-1.amazonaws.com</test.chef.compute.endpoint>
+ <test.chef.compute.api-version>2010-06-15</test.chef.compute.api-version>
+ <test.chef.compute.build-version />
+ <test.chef.compute.identity>${test.aws.identity}</test.chef.compute.identity>
+ <test.chef.compute.credential>${test.aws.credential}</test.chef.compute.credential>
+ <test.chef.compute.template />
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-compute</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-allcompute</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-sshj</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <version>${project.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-compute</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-allcompute</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-sshj</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.chef.endpoint>${test.chef.endpoint}</test.chef.endpoint>
- <test.chef.api-version>${test.chef.api-version}</test.chef.api-version>
- <test.chef.build-version>${test.chef.build-version}</test.chef.build-version>
- <test.chef.identity>${test.chef.identity}</test.chef.identity>
- <test.chef.credential>${test.chef.credential}</test.chef.credential>
- <test.chef.compute.provider>${test.chef.compute.provider}</test.chef.compute.provider>
- <test.chef.compute.endpoint>${test.chef.compute.endpoint}</test.chef.compute.endpoint>
- <test.chef.compute.build-version>${test.chef.compute.build-version}</test.chef.compute.build-version>
- <test.chef.compute.api-version>${test.chef.compute.api-version}</test.chef.compute.api-version>
- <test.chef.compute.identity>${test.chef.compute.identity}</test.chef.compute.identity>
- <test.chef.compute.credential>${test.chef.compute.credential}</test.chef.compute.credential>
- <test.chef.compute.template>${test.chef.compute.template}</test.chef.compute.template>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.chef.endpoint>${test.chef.endpoint}</test.chef.endpoint>
+ <test.chef.api-version>${test.chef.api-version}</test.chef.api-version>
+ <test.chef.build-version>${test.chef.build-version}</test.chef.build-version>
+ <test.chef.identity>${test.chef.identity}</test.chef.identity>
+ <test.chef.credential>${test.chef.credential}</test.chef.credential>
+ <test.chef.compute.provider>${test.chef.compute.provider}</test.chef.compute.provider>
+ <test.chef.compute.endpoint>${test.chef.compute.endpoint}</test.chef.compute.endpoint>
+ <test.chef.compute.build-version>${test.chef.compute.build-version}</test.chef.compute.build-version>
+ <test.chef.compute.api-version>${test.chef.compute.api-version}</test.chef.compute.api-version>
+ <test.chef.compute.identity>${test.chef.compute.identity}</test.chef.compute.identity>
+ <test.chef.compute.credential>${test.chef.compute.credential}</test.chef.compute.credential>
+ <test.chef.compute.template>${test.chef.compute.template}</test.chef.compute.template>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index 1975808..c10bb3f 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -1,130 +1,130 @@
<?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 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
+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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <packaging>bundle</packaging>
- <name>JClouds Chef :: Core</name>
- <description>jclouds components to access Chef</description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds.chef</groupId>
+ <artifactId>chef-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../project/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <packaging>bundle</packaging>
+ <name>JClouds Chef :: Core</name>
+ <description>jclouds components to access Chef</description>
- <properties>
- <test.chef.endpoint>http://localhost:4000</test.chef.endpoint>
- <test.chef.api-version />
- <test.chef.build-version />
- <test.chef.identity>chef-webui</test.chef.identity>
- <test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
- <jclouds.osgi.import>
- org.jclouds;version=${jclouds.version},
- org.jclouds*;version=${jclouds.version},
- *
- </jclouds.osgi.import>
- <jclouds.osgi.export>
- org.jclouds.chef*;version=${project.version};-noimport:=true,
- org.jclouds.ohai*;version=${project.version};-noimport:=true,
- </jclouds.osgi.export>
- </properties>
+ <properties>
+ <test.chef.endpoint>http://localhost:4000</test.chef.endpoint>
+ <test.chef.api-version />
+ <test.chef.build-version />
+ <test.chef.identity>chef-webui</test.chef.identity>
+ <test.chef.credential>${user.home}/.chef/webui.pem</test.chef.credential>
+ <jclouds.osgi.import>
+ org.jclouds;version=${jclouds.version},
+ org.jclouds*;version=${jclouds.version},
+ *
+ </jclouds.osgi.import>
+ <jclouds.osgi.export>
+ org.jclouds.chef*;version=${project.version};-noimport:=true,
+ org.jclouds.ohai*;version=${project.version};-noimport:=true,
+ </jclouds.osgi.export>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-scriptbuilder</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-scriptbuilder</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <!-- for transient chef provider -->
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-blobstore</artifactId>
- <version>${jclouds.version}</version>
- <optional>true</optional>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-scriptbuilder</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-scriptbuilder</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <!-- for transient chef provider -->
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-blobstore</artifactId>
+ <version>${jclouds.version}</version>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.chef.endpoint>${test.chef.endpoint}</test.chef.endpoint>
- <test.chef.api-version>${test.chef.api-version}</test.chef.api-version>
- <test.chef.build-version>${test.chef.build-version}</test.chef.build-version>
- <test.chef.identity>${test.chef.identity}</test.chef.identity>
- <test.chef.credential>${test.chef.credential}</test.chef.credential>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.chef.endpoint>${test.chef.endpoint}</test.chef.endpoint>
+ <test.chef.api-version>${test.chef.api-version}</test.chef.api-version>
+ <test.chef.build-version>${test.chef.build-version}</test.chef.build-version>
+ <test.chef.identity>${test.chef.identity}</test.chef.identity>
+ <test.chef.credential>${test.chef.credential}</test.chef.credential>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/demos/gae/pom.xml
----------------------------------------------------------------------
diff --git a/demos/gae/pom.xml b/demos/gae/pom.xml
index 0b8ca13..9031fab 100644
--- a/demos/gae/pom.xml
+++ b/demos/gae/pom.xml
@@ -1,275 +1,275 @@
<?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 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
+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">
- <modelVersion>4.0.0</modelVersion>
- <artifactId>jclouds-chef-demo-googleappengine</artifactId>
- <groupId>jclouds</groupId>
- <version>1.7.0-SNAPSHOT</version>
- <packaging>war</packaging>
- <name>JClouds Sample for Google App Engine</name>
- <description>JClouds Sample for Google App Engine</description>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>jclouds-chef-demo-googleappengine</artifactId>
+ <groupId>jclouds</groupId>
+ <version>1.7.0-SNAPSHOT</version>
+ <packaging>war</packaging>
+ <name>JClouds Sample for Google App Engine</name>
+ <description>JClouds Sample for Google App Engine</description>
- <properties>
- <!--
- note you must set the property ${appengine.home} to a valid
- extraction of appengine-java-sdk
- -->
- <maven.compile.source>1.6</maven.compile.source>
- <maven.compile.target>1.6</maven.compile.target>
- <appengine.home>${env.APPENGINE_HOME}</appengine.home>
- <appengine.applicationid>YOUR_APPLICATION_ID</appengine.applicationid>
- <devappserver.address>localhost</devappserver.address>
- <devappserver.port>8088</devappserver.port>
- <jclouds.chef.identity>${appengine.applicationid}</jclouds.chef.identity>
- <jclouds.chef.identity.pem>${user.home}/.chef/${jclouds.chef.identity}.pem</jclouds.chef.identity.pem>
- <jclouds.opscodeplatform.org>YOUR_ORG</jclouds.opscodeplatform.org>
- <jclouds.chef.endpoint>https://api.opscode.com/organizations/${jclouds.opscodeplatform.org}</jclouds.chef.endpoint>
- </properties>
+ <properties>
+ <!--
+ note you must set the property ${appengine.home} to a valid
+ extraction of appengine-java-sdk
+ -->
+ <maven.compile.source>1.6</maven.compile.source>
+ <maven.compile.target>1.6</maven.compile.target>
+ <appengine.home>${env.APPENGINE_HOME}</appengine.home>
+ <appengine.applicationid>YOUR_APPLICATION_ID</appengine.applicationid>
+ <devappserver.address>localhost</devappserver.address>
+ <devappserver.port>8088</devappserver.port>
+ <jclouds.chef.identity>${appengine.applicationid}</jclouds.chef.identity>
+ <jclouds.chef.identity.pem>${user.home}/.chef/${jclouds.chef.identity}.pem</jclouds.chef.identity.pem>
+ <jclouds.opscodeplatform.org>YOUR_ORG</jclouds.opscodeplatform.org>
+ <jclouds.chef.endpoint>https://api.opscode.com/organizations/${jclouds.opscodeplatform.org}</jclouds.chef.endpoint>
+ </properties>
- <repositories>
- <repository>
- <id>jclouds-gae-depedencies</id>
- <url>http://jclouds.googlecode.com/svn/repo</url>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
+ <repositories>
+ <repository>
+ <id>jclouds-gae-depedencies</id>
+ <url>http://jclouds.googlecode.com/svn/repo</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-chef-servlet</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymockclassextension</artifactId>
- <version>2.4</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-log4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.14</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.testng</groupId>
- <artifactId>testng</artifactId>
- <version>5.10</version>
- <scope>test</scope>
- <classifier>jdk15</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-gae</artifactId>
- <version>${jclouds.version}</version>
- </dependency>
- <dependency>
- <groupId>com.google.code.guice</groupId>
- <artifactId>guice-servlet</artifactId>
- <version>2.1-r1201</version>
- </dependency>
- <dependency>
- <groupId>displaytag</groupId>
- <artifactId>displaytag</artifactId>
- <version>1.2</version>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-log4j12</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-jdk14</artifactId>
- <version>1.5.6</version>
- </dependency>
- <dependency>
- <artifactId>standard</artifactId>
- <groupId>taglibs</groupId>
- <version>1.1.2</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <artifactId>jstl</artifactId>
- <groupId>javax.servlet</groupId>
- <version>1.1.2</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-el_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jsp_2.1_spec</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
- <version>1.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-api-labs</artifactId>
- <version>1.3.5</version>
- </dependency>
- <dependency>
- <groupId>com.google.appengine</groupId>
- <artifactId>appengine-tools-api</artifactId>
- <version>1.3.5</version>
- <scope>system</scope>
- <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
- </dependency>
- </dependencies>
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <encoding>${sourceEncoding}</encoding>
- <source>${maven.compile.source}</source>
- <target>${maven.compile.target}</target>
- </configuration>
- </plugin>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-chef-servlet</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymockclassextension</artifactId>
+ <version>2.4</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-log4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.14</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.testng</groupId>
+ <artifactId>testng</artifactId>
+ <version>5.10</version>
+ <scope>test</scope>
+ <classifier>jdk15</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-gae</artifactId>
+ <version>${jclouds.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.code.guice</groupId>
+ <artifactId>guice-servlet</artifactId>
+ <version>2.1-r1201</version>
+ </dependency>
+ <dependency>
+ <groupId>displaytag</groupId>
+ <artifactId>displaytag</artifactId>
+ <version>1.2</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-jdk14</artifactId>
+ <version>1.5.6</version>
+ </dependency>
+ <dependency>
+ <artifactId>standard</artifactId>
+ <groupId>taglibs</groupId>
+ <version>1.1.2</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <artifactId>jstl</artifactId>
+ <groupId>javax.servlet</groupId>
+ <version>1.1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-el_1.0_spec</artifactId>
+ <version>1.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-jsp_2.1_spec</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <version>1.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-api-labs</artifactId>
+ <version>1.3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.appengine</groupId>
+ <artifactId>appengine-tools-api</artifactId>
+ <version>1.3.5</version>
+ <scope>system</scope>
+ <systemPath>${appengine.home}/lib/appengine-tools-api.jar</systemPath>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>${project.artifactId}</finalName>
+ <plugins>
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <encoding>${sourceEncoding}</encoding>
+ <source>${maven.compile.source}</source>
+ <target>${maven.compile.target}</target>
+ </configuration>
+ </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <configuration>
- <webResources>
- <resource>
- <directory>src/main/appengine</directory>
- <targetPath>WEB-INF/</targetPath>
- <filtering>true</filtering>
- </resource>
- </webResources>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <excludes>
- <exclude>**/*LiveTest.java</exclude>
- </excludes>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>src/main/appengine</directory>
+ <targetPath>WEB-INF/</targetPath>
+ <filtering>true</filtering>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>**/*LiveTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <excludes>
- <exclude>none</exclude>
- </excludes>
- <includes>
- <include>**/*LiveTest.java</include>
- </includes>
- <systemProperties>
- <property>
- <name>jclouds.chef.identity</name>
- <value>${jclouds.chef.identity}</value>
- </property>
- <property>
- <name>jclouds.chef.identity.pem</name>
- <value>${jclouds.chef.identity.pem}</value>
- </property>
- <property>
- <name>jclouds.chef.endpoint</name>
- <value>${jclouds.chef.endpoint}</value>
- </property>
- <property>
- <name>jclouds.chef.validator</name>
- <value>${jclouds.chef.validator}</value>
- </property>
- <property>
- <name>jclouds.chef.validator.pem</name>
- <value>${jclouds.chef.validator.pem}</value>
- </property>
- <property>
- <name>appengine.applicationid</name>
- <value>${appengine.applicationid}</value>
- </property>
- <property>
- <name>appengine.home</name>
- <value>${appengine.home}</value>
- </property>
- <property>
- <name>devappserver.address</name>
- <value>${devappserver.address}</value>
- </property>
- <property>
- <name>devappserver.port</name>
- <value>${devappserver.port}</value>
- </property>
- <property>
- <name>warfile</name>
- <value>${project.build.directory}/${project.artifactId}</value>
- </property>
- </systemProperties>
- <additionalClasspathElements>
- <additionalClasspathElement>${appengine.home}/lib/appengine-tools-api.jar</additionalClasspathElement>
- </additionalClasspathElements>
- <environmentVariables>
- <DEBUG>true</DEBUG>
- <SDK_BIN>${appengine.home}/bin</SDK_BIN>
- <SDK_LIB>${appengine.home}/lib</SDK_LIB>
- <SDK_CONFIG>${appengine.home}/config/sdk</SDK_CONFIG>
- </environmentVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <excludes>
+ <exclude>none</exclude>
+ </excludes>
+ <includes>
+ <include>**/*LiveTest.java</include>
+ </includes>
+ <systemProperties>
+ <property>
+ <name>jclouds.chef.identity</name>
+ <value>${jclouds.chef.identity}</value>
+ </property>
+ <property>
+ <name>jclouds.chef.identity.pem</name>
+ <value>${jclouds.chef.identity.pem}</value>
+ </property>
+ <property>
+ <name>jclouds.chef.endpoint</name>
+ <value>${jclouds.chef.endpoint}</value>
+ </property>
+ <property>
+ <name>jclouds.chef.validator</name>
+ <value>${jclouds.chef.validator}</value>
+ </property>
+ <property>
+ <name>jclouds.chef.validator.pem</name>
+ <value>${jclouds.chef.validator.pem}</value>
+ </property>
+ <property>
+ <name>appengine.applicationid</name>
+ <value>${appengine.applicationid}</value>
+ </property>
+ <property>
+ <name>appengine.home</name>
+ <value>${appengine.home}</value>
+ </property>
+ <property>
+ <name>devappserver.address</name>
+ <value>${devappserver.address}</value>
+ </property>
+ <property>
+ <name>devappserver.port</name>
+ <value>${devappserver.port}</value>
+ </property>
+ <property>
+ <name>warfile</name>
+ <value>${project.build.directory}/${project.artifactId}</value>
+ </property>
+ </systemProperties>
+ <additionalClasspathElements>
+ <additionalClasspathElement>${appengine.home}/lib/appengine-tools-api.jar</additionalClasspathElement>
+ </additionalClasspathElements>
+ <environmentVariables>
+ <DEBUG>true</DEBUG>
+ <SDK_BIN>${appengine.home}/bin</SDK_BIN>
+ <SDK_LIB>${appengine.home}/lib</SDK_LIB>
+ <SDK_CONFIG>${appengine.home}/config/sdk</SDK_CONFIG>
+ </environmentVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/labs/hostedchef/pom.xml
----------------------------------------------------------------------
diff --git a/labs/hostedchef/pom.xml b/labs/hostedchef/pom.xml
index fcc3d76..dad7aea 100644
--- a/labs/hostedchef/pom.xml
+++ b/labs/hostedchef/pom.xml
@@ -1,112 +1,112 @@
<?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 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
+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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>hostedchef</artifactId>
- <name>JClouds Chef :: Hosted Chef</name>
- <description>jclouds components to access Hosted Chef</description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds.chef</groupId>
+ <artifactId>chef-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../../project/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>hostedchef</artifactId>
+ <name>JClouds Chef :: Hosted Chef</name>
+ <description>jclouds components to access Hosted Chef</description>
- <properties>
- <test.hostedchef.org>YOUR_ORG</test.hostedchef.org>
- <test.hostedchef.endpoint>https://api.opscode.com/organizations/${test.hostedchef.org}</test.hostedchef.endpoint>
- <test.hostedchef.api-version />
- <test.hostedchef.build-version />
- <test.hostedchef.identity>YOUR_USER</test.hostedchef.identity>
- <test.hostedchef.credential>${user.home}/.chef/${test.hostedchef.org}/${test.hostedchef.identity}.pem</test.hostedchef.credential>
- <jclouds.osgi.export>org.jclouds.hostedchef*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
- </properties>
+ <properties>
+ <test.hostedchef.org>YOUR_ORG</test.hostedchef.org>
+ <test.hostedchef.endpoint>https://api.opscode.com/organizations/${test.hostedchef.org}</test.hostedchef.endpoint>
+ <test.hostedchef.api-version />
+ <test.hostedchef.build-version />
+ <test.hostedchef.identity>YOUR_USER</test.hostedchef.identity>
+ <test.hostedchef.credential>${user.home}/.chef/${test.hostedchef.org}/${test.hostedchef.identity}.pem</test.hostedchef.credential>
+ <jclouds.osgi.export>org.jclouds.hostedchef*;version="${project.version}"</jclouds.osgi.export>
+ <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.hostedchef.org>${test.hostedchef.org}</test.hostedchef.org>
- <test.hostedchef.endpoint>${test.hostedchef.endpoint}</test.hostedchef.endpoint>
- <test.hostedchef.api-version>${test.hostedchef.api-version}</test.hostedchef.api-version>
- <test.hostedchef.build-version>${test.hostedchef.build-version}</test.hostedchef.build-version>
- <test.hostedchef.identity>${test.hostedchef.identity}</test.hostedchef.identity>
- <test.hostedchef.credential>${test.hostedchef.credential}</test.hostedchef.credential>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.hostedchef.org>${test.hostedchef.org}</test.hostedchef.org>
+ <test.hostedchef.endpoint>${test.hostedchef.endpoint}</test.hostedchef.endpoint>
+ <test.hostedchef.api-version>${test.hostedchef.api-version}</test.hostedchef.api-version>
+ <test.hostedchef.build-version>${test.hostedchef.build-version}</test.hostedchef.build-version>
+ <test.hostedchef.identity>${test.hostedchef.identity}</test.hostedchef.identity>
+ <test.hostedchef.credential>${test.hostedchef.credential}</test.hostedchef.credential>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/labs/pom.xml
----------------------------------------------------------------------
diff --git a/labs/pom.xml b/labs/pom.xml
index 4e2c885..fd535bf 100644
--- a/labs/pom.xml
+++ b/labs/pom.xml
@@ -1,38 +1,38 @@
<?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 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
+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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>chef-labs-project</artifactId>
- <packaging>pom</packaging>
- <name>JClouds Chef :: Labs</name>
- <modules>
- <module>privatechef</module>
- <module>hostedchef</module>
- </modules>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds.chef</groupId>
+ <artifactId>chef-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../project/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>chef-labs-project</artifactId>
+ <packaging>pom</packaging>
+ <name>JClouds Chef :: Labs</name>
+ <modules>
+ <module>privatechef</module>
+ <module>hostedchef</module>
+ </modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/labs/privatechef/pom.xml
----------------------------------------------------------------------
diff --git a/labs/privatechef/pom.xml b/labs/privatechef/pom.xml
index e303513..54251cd 100644
--- a/labs/privatechef/pom.xml
+++ b/labs/privatechef/pom.xml
@@ -1,124 +1,124 @@
<?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 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
+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">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>../../project/pom.xml</relativePath>
- </parent>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>privatechef</artifactId>
- <name>JClouds Chef :: Private Chef</name>
- <description>jclouds components to access Private Chef</description>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.jclouds.chef</groupId>
+ <artifactId>chef-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>../../project/pom.xml</relativePath>
+ </parent>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>privatechef</artifactId>
+ <name>JClouds Chef :: Private Chef</name>
+ <description>jclouds components to access Private Chef</description>
- <properties>
- <test.privatechef.org>YOUR_ORG</test.privatechef.org>
- <test.privatechef.endpoint>https://api.opscode.com/organizations/${test.privatechef.org}</test.privatechef.endpoint>
- <test.privatechef.api-version />
- <test.privatechef.build-version />
- <test.privatechef.identity>YOUR_USER</test.privatechef.identity>
- <test.privatechef.credential>${user.home}/.chef/${test.privatechef.org}/${jclouds.privatechef.identity}.pem</test.privatechef.credential>
- <jclouds.osgi.export>org.jclouds.privatechef*;version="${project.version}"</jclouds.osgi.export>
- <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
- </properties>
+ <properties>
+ <test.privatechef.org>YOUR_ORG</test.privatechef.org>
+ <test.privatechef.endpoint>https://api.opscode.com/organizations/${test.privatechef.org}</test.privatechef.endpoint>
+ <test.privatechef.api-version />
+ <test.privatechef.build-version />
+ <test.privatechef.identity>YOUR_USER</test.privatechef.identity>
+ <test.privatechef.credential>${user.home}/.chef/${test.privatechef.org}/${jclouds.privatechef.identity}.pem</test.privatechef.credential>
+ <jclouds.osgi.export>org.jclouds.privatechef*;version="${project.version}"</jclouds.osgi.export>
+ <jclouds.osgi.import>org.jclouds*;version="${jclouds.version}",*</jclouds.osgi.import>
+ </properties>
- <dependencies>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>hostedchef</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.labs</groupId>
- <artifactId>hostedchef</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.api</groupId>
- <artifactId>chef</artifactId>
- <version>${project.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds</groupId>
- <artifactId>jclouds-core</artifactId>
- <version>${jclouds.version}</version>
- <type>test-jar</type>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.jclouds.driver</groupId>
- <artifactId>jclouds-slf4j</artifactId>
- <version>${jclouds.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>ch.qos.logback</groupId>
- <artifactId>logback-classic</artifactId>
- <version>1.0.9</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>hostedchef</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.labs</groupId>
+ <artifactId>hostedchef</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.api</groupId>
+ <artifactId>chef</artifactId>
+ <version>${project.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds</groupId>
+ <artifactId>jclouds-core</artifactId>
+ <version>${jclouds.version}</version>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jclouds.driver</groupId>
+ <artifactId>jclouds-slf4j</artifactId>
+ <version>${jclouds.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ <version>1.0.9</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
- <profiles>
- <profile>
- <id>live</id>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <executions>
- <execution>
- <id>integration</id>
- <phase>integration-test</phase>
- <goals>
- <goal>test</goal>
- </goals>
- <configuration>
- <systemPropertyVariables>
- <test.privatechef.org>${test.privatechef.org}</test.privatechef.org>
- <test.privatechef.endpoint>${test.privatechef.endpoint}</test.privatechef.endpoint>
- <test.privatechef.api-version>${test.privatechef.api-version}</test.privatechef.api-version>
- <test.privatechef.build-version>${test.privatechef.build-version}</test.privatechef.build-version>
- <test.privatechef.identity>${test.privatechef.identity}</test.privatechef.identity>
- <test.privatechef.credential>${test.privatechef.credential}</test.privatechef.credential>
- </systemPropertyVariables>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
+ <profiles>
+ <profile>
+ <id>live</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>integration</id>
+ <phase>integration-test</phase>
+ <goals>
+ <goal>test</goal>
+ </goals>
+ <configuration>
+ <systemPropertyVariables>
+ <test.privatechef.org>${test.privatechef.org}</test.privatechef.org>
+ <test.privatechef.endpoint>${test.privatechef.endpoint}</test.privatechef.endpoint>
+ <test.privatechef.api-version>${test.privatechef.api-version}</test.privatechef.api-version>
+ <test.privatechef.build-version>${test.privatechef.build-version}</test.privatechef.build-version>
+ <test.privatechef.identity>${test.privatechef.identity}</test.privatechef.identity>
+ <test.privatechef.credential>${test.privatechef.credential}</test.privatechef.credential>
+ </systemPropertyVariables>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 7d2cae7..9127239 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,32 +1,32 @@
<?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 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
+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">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.jclouds.chef</groupId>
- <artifactId>chef-parent</artifactId>
- <version>1.7.0-SNAPSHOT</version>
- <relativePath>project/pom.xml</relativePath>
- </parent>
+ <parent>
+ <groupId>org.apache.jclouds.chef</groupId>
+ <artifactId>chef-parent</artifactId>
+ <version>1.7.0-SNAPSHOT</version>
+ <relativePath>project/pom.xml</relativePath>
+ </parent>
<artifactId>chef-project</artifactId>
<name>JClouds Chef :: Project POM</name>
<description>JClouds Chef top level project pom for builds</description>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index abf3fd1..5e76d7c 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -1,22 +1,22 @@
<?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 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
+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">
@@ -240,27 +240,27 @@
</plugins>
</build>
<profiles>
- <!-- modifies the plugin config inherited from oss-parent -->
- <profile>
- <id>sonatype-release-profile-extension</id>
- <activation>
- <property>
- <name>performRelease</name>
- <value>true</value>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-gpg-plugin</artifactId>
- <configuration>
- <executable>${gpg.command}</executable>
- <passphrase>${gpg.passphrase}</passphrase>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <!-- modifies the plugin config inherited from oss-parent -->
+ <profile>
+ <id>sonatype-release-profile-extension</id>
+ <activation>
+ <property>
+ <name>performRelease</name>
+ <value>true</value>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-gpg-plugin</artifactId>
+ <configuration>
+ <executable>${gpg.command}</executable>
+ <passphrase>${gpg.passphrase}</passphrase>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
<profile>
<id>live</id>
<build>
@@ -289,22 +289,22 @@
</properties>
<systemProperties>
<!--
- If you're behind a proxy, set this here
- http://java.sun.com/javase/6/docs/technotes/guides/net/proxies.html
+ If you're behind a proxy, set this here
+ http://java.sun.com/javase/6/docs/technotes/guides/net/proxies.html
- <property>
- <name>https.proxyHost</name>
- <value>proxy</value>
- </property>
- <property>
- <name>https.proxyPort</name>
- <value>port</value>
- </property>
- <property>
- <name>https.noProxyHosts</name>
- <value>localhost|10.150.4.49</value>
- </property>
- -->
+<property>
+<name>https.proxyHost</name>
+<value>proxy</value>
+</property>
+<property>
+<name>https.proxyPort</name>
+<value>port</value>
+</property>
+<property>
+<name>https.noProxyHosts</name>
+<value>localhost|10.150.4.49</value>
+</property>
+ -->
<property>
<name>file.encoding</name>
<value>${project.build.sourceEncoding}</value>
@@ -352,25 +352,25 @@
</plugins>
</build>
</profile>
- <profile>
- <id>doc</id>
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>2.8.1</version>
- <executions>
- <execution>
- <id>javadoc</id>
- <phase>package</phase>
- <goals>
- <goal>jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
+ <profile>
+ <id>doc</id>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>2.8.1</version>
+ <executions>
+ <execution>
+ <id>javadoc</id>
+ <phase>package</phase>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-jclouds-chef/blob/8a1a423c/servlet/pom.xml
----------------------------------------------------------------------
diff --git a/servlet/pom.xml b/servlet/pom.xml
index e6a6e09..d8f9902 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -1,22 +1,22 @@
<?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 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
+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">