diff --git a/compute/pom.xml b/compute/pom.xml index fc60206..f77e15b 100644 --- a/compute/pom.xml +++ b/compute/pom.xml @@ -1,149 +1,149 @@ - 4.0.0 - - org.jclouds.chef - chef-parent - 1.7.0-SNAPSHOT - ../project/pom.xml - - chef-compute - JClouds Chef :: Compute - provisions nodes with jclouds and kick's off chef to configure and integrate - - http://localhost:4000 - - - chef-validator - ${user.home}/.chef/validation.pem - aws-ec2 - https://ec2.us-east-1.amazonaws.com - 2010-06-15 - - ${test.aws.identity} - ${test.aws.credential} - - + 4.0.0 + + org.jclouds.chef + chef-parent + 1.7.0-SNAPSHOT + ../project/pom.xml + + chef-compute + JClouds Chef :: Compute + provisions nodes with jclouds and kick's off chef to configure and integrate + + http://localhost:4000 + + + chef-validator + ${user.home}/.chef/validation.pem + aws-ec2 + https://ec2.us-east-1.amazonaws.com + 2010-06-15 + + ${test.aws.identity} + ${test.aws.credential} + + - - - org.jclouds.api - chef - ${project.version} - test - - - org.jclouds.api - chef - ${project.version} - test-jar - test - - - org.jclouds - jclouds-compute - ${jclouds.version} - test-jar - test - - - org.jclouds - jclouds-core - ${jclouds.version} - test-jar - test - - - org.jclouds - jclouds-compute - ${jclouds.version} - test-jar - test - - - org.jclouds - jclouds-allcompute - ${jclouds.version} - test - true - - - org.jclouds.driver - jclouds-slf4j - ${jclouds.version} - test - - - org.jclouds.driver - jclouds-sshj - ${jclouds.version} - test - - - ch.qos.logback - logback-classic - 1.0.9 - test - - + + + org.jclouds.api + chef + ${project.version} + test + + + org.jclouds.api + chef + ${project.version} + test-jar + test + + + org.jclouds + jclouds-compute + ${jclouds.version} + test-jar + test + + + org.jclouds + jclouds-core + ${jclouds.version} + test-jar + test + + + org.jclouds + jclouds-compute + ${jclouds.version} + test-jar + test + + + org.jclouds + jclouds-allcompute + ${jclouds.version} + test + true + + + org.jclouds.driver + jclouds-slf4j + ${jclouds.version} + test + + + org.jclouds.driver + jclouds-sshj + ${jclouds.version} + test + + + ch.qos.logback + logback-classic + 1.0.9 + test + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - ${test.chef.endpoint} - ${test.chef.api-version} - ${test.chef.build-version} - ${test.chef.identity} - ${test.chef.credential} - ${test.chef.compute.provider} - ${test.chef.compute.endpoint} - ${test.chef.compute.build-version} - ${test.chef.compute.api-version} - ${test.chef.compute.identity} - ${test.chef.compute.credential} - ${test.chef.compute.template} - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + ${test.chef.endpoint} + ${test.chef.api-version} + ${test.chef.build-version} + ${test.chef.identity} + ${test.chef.credential} + ${test.chef.compute.provider} + ${test.chef.compute.endpoint} + ${test.chef.compute.build-version} + ${test.chef.compute.api-version} + ${test.chef.compute.identity} + ${test.chef.compute.credential} + ${test.chef.compute.template} + + + + + + + + + diff --git a/core/pom.xml b/core/pom.xml index 13c3279..6ce9d2b 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -1,130 +1,130 @@ - 4.0.0 - - org.jclouds.chef - chef-parent - 1.7.0-SNAPSHOT - ../project/pom.xml - - org.jclouds.api - chef - bundle - JClouds Chef :: Core - jclouds components to access Chef + 4.0.0 + + org.jclouds.chef + chef-parent + 1.7.0-SNAPSHOT + ../project/pom.xml + + org.jclouds.api + chef + bundle + JClouds Chef :: Core + jclouds components to access Chef - - http://localhost:4000 - - - chef-webui - ${user.home}/.chef/webui.pem - - org.jclouds;version=${jclouds.version}, - org.jclouds*;version=${jclouds.version}, - * - - - org.jclouds.chef*;version=${project.version};-noimport:=true, - org.jclouds.ohai*;version=${project.version};-noimport:=true, - - + + http://localhost:4000 + + + chef-webui + ${user.home}/.chef/webui.pem + + org.jclouds;version=${jclouds.version}, + org.jclouds*;version=${jclouds.version}, + * + + + org.jclouds.chef*;version=${project.version};-noimport:=true, + org.jclouds.ohai*;version=${project.version};-noimport:=true, + + - - - org.jclouds - jclouds-core - ${jclouds.version} - - - org.jclouds - jclouds-core - ${jclouds.version} - test-jar - test - - - org.jclouds - jclouds-scriptbuilder - ${jclouds.version} - - - org.jclouds - jclouds-scriptbuilder - ${jclouds.version} - test-jar - test - - - - org.jclouds - jclouds-blobstore - ${jclouds.version} - true - - - org.jclouds.driver - jclouds-slf4j - ${jclouds.version} - test - - - ch.qos.logback - logback-classic - 1.0.9 - test - - + + + org.jclouds + jclouds-core + ${jclouds.version} + + + org.jclouds + jclouds-core + ${jclouds.version} + test-jar + test + + + org.jclouds + jclouds-scriptbuilder + ${jclouds.version} + + + org.jclouds + jclouds-scriptbuilder + ${jclouds.version} + test-jar + test + + + + org.jclouds + jclouds-blobstore + ${jclouds.version} + true + + + org.jclouds.driver + jclouds-slf4j + ${jclouds.version} + test + + + ch.qos.logback + logback-classic + 1.0.9 + test + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - ${test.chef.endpoint} - ${test.chef.api-version} - ${test.chef.build-version} - ${test.chef.identity} - ${test.chef.credential} - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + ${test.chef.endpoint} + ${test.chef.api-version} + ${test.chef.build-version} + ${test.chef.identity} + ${test.chef.credential} + + + + + + + + + diff --git a/demos/gae/pom.xml b/demos/gae/pom.xml index ee66075..6f15b14 100644 --- a/demos/gae/pom.xml +++ b/demos/gae/pom.xml @@ -1,275 +1,275 @@ - 4.0.0 - jclouds-chef-demo-googleappengine - jclouds - 1.7.0-SNAPSHOT - war - JClouds Sample for Google App Engine - JClouds Sample for Google App Engine + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + 4.0.0 + jclouds-chef-demo-googleappengine + jclouds + 1.7.0-SNAPSHOT + war + JClouds Sample for Google App Engine + JClouds Sample for Google App Engine - - - 1.6 - 1.6 - ${env.APPENGINE_HOME} - YOUR_APPLICATION_ID - localhost - 8088 - ${appengine.applicationid} - ${user.home}/.chef/${jclouds.chef.identity}.pem - YOUR_ORG - https://api.opscode.com/organizations/${jclouds.opscodeplatform.org} - + + + 1.6 + 1.6 + ${env.APPENGINE_HOME} + YOUR_APPLICATION_ID + localhost + 8088 + ${appengine.applicationid} + ${user.home}/.chef/${jclouds.chef.identity}.pem + YOUR_ORG + https://api.opscode.com/organizations/${jclouds.opscodeplatform.org} + - - - jclouds-gae-depedencies - http://jclouds.googlecode.com/svn/repo - - false - - - + + + jclouds-gae-depedencies + http://jclouds.googlecode.com/svn/repo + + false + + + - - - org.jclouds - jclouds-chef-servlet - ${project.version} - - - org.easymock - easymockclassextension - 2.4 - test - - - org.jclouds - jclouds-log4j - ${jclouds.version} - test - - - log4j - log4j - 1.2.14 - test - - - org.testng - testng - 5.10 - test - jdk15 - - - org.jclouds - jclouds-gae - ${jclouds.version} - - - com.google.code.guice - guice-servlet - 2.1-r1201 - - - displaytag - displaytag - 1.2 - - - org.slf4j - slf4j-log4j12 - - - - - org.slf4j - slf4j-jdk14 - 1.5.6 - - - standard - taglibs - 1.1.2 - runtime - - - jstl - javax.servlet - 1.1.2 - - - org.apache.geronimo.specs - geronimo-el_1.0_spec - 1.0.1 - - - org.apache.geronimo.specs - geronimo-jsp_2.1_spec - 1.0.1 - provided - - - org.apache.geronimo.specs - geronimo-servlet_2.5_spec - 1.2 - provided - - - com.google.appengine - appengine-api-labs - 1.3.5 - - - com.google.appengine - appengine-tools-api - 1.3.5 - system - ${appengine.home}/lib/appengine-tools-api.jar - - - - ${project.artifactId} - - - maven-compiler-plugin - - ${sourceEncoding} - ${maven.compile.source} - ${maven.compile.target} - - + + + org.jclouds + jclouds-chef-servlet + ${project.version} + + + org.easymock + easymockclassextension + 2.4 + test + + + org.jclouds + jclouds-log4j + ${jclouds.version} + test + + + log4j + log4j + 1.2.14 + test + + + org.testng + testng + 5.10 + test + jdk15 + + + org.jclouds + jclouds-gae + ${jclouds.version} + + + com.google.code.guice + guice-servlet + 2.1-r1201 + + + displaytag + displaytag + 1.2 + + + org.slf4j + slf4j-log4j12 + + + + + org.slf4j + slf4j-jdk14 + 1.5.6 + + + standard + taglibs + 1.1.2 + runtime + + + jstl + javax.servlet + 1.1.2 + + + org.apache.geronimo.specs + geronimo-el_1.0_spec + 1.0.1 + + + org.apache.geronimo.specs + geronimo-jsp_2.1_spec + 1.0.1 + provided + + + org.apache.geronimo.specs + geronimo-servlet_2.5_spec + 1.2 + provided + + + com.google.appengine + appengine-api-labs + 1.3.5 + + + com.google.appengine + appengine-tools-api + 1.3.5 + system + ${appengine.home}/lib/appengine-tools-api.jar + + + + ${project.artifactId} + + + maven-compiler-plugin + + ${sourceEncoding} + ${maven.compile.source} + ${maven.compile.target} + + - - org.apache.maven.plugins - maven-war-plugin - - - - src/main/appengine - WEB-INF/ - true - - - - - - org.apache.maven.plugins - maven-surefire-plugin - - - **/*LiveTest.java - - - - - + + org.apache.maven.plugins + maven-war-plugin + + + + src/main/appengine + WEB-INF/ + true + + + + + + org.apache.maven.plugins + maven-surefire-plugin + + + **/*LiveTest.java + + + + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - none - - - **/*LiveTest.java - - - - jclouds.chef.identity - ${jclouds.chef.identity} - - - jclouds.chef.identity.pem - ${jclouds.chef.identity.pem} - - - jclouds.chef.endpoint - ${jclouds.chef.endpoint} - - - jclouds.chef.validator - ${jclouds.chef.validator} - - - jclouds.chef.validator.pem - ${jclouds.chef.validator.pem} - - - appengine.applicationid - ${appengine.applicationid} - - - appengine.home - ${appengine.home} - - - devappserver.address - ${devappserver.address} - - - devappserver.port - ${devappserver.port} - - - warfile - ${project.build.directory}/${project.artifactId} - - - - ${appengine.home}/lib/appengine-tools-api.jar - - - true - ${appengine.home}/bin - ${appengine.home}/lib - ${appengine.home}/config/sdk - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + none + + + **/*LiveTest.java + + + + jclouds.chef.identity + ${jclouds.chef.identity} + + + jclouds.chef.identity.pem + ${jclouds.chef.identity.pem} + + + jclouds.chef.endpoint + ${jclouds.chef.endpoint} + + + jclouds.chef.validator + ${jclouds.chef.validator} + + + jclouds.chef.validator.pem + ${jclouds.chef.validator.pem} + + + appengine.applicationid + ${appengine.applicationid} + + + appengine.home + ${appengine.home} + + + devappserver.address + ${devappserver.address} + + + devappserver.port + ${devappserver.port} + + + warfile + ${project.build.directory}/${project.artifactId} + + + + ${appengine.home}/lib/appengine-tools-api.jar + + + true + ${appengine.home}/bin + ${appengine.home}/lib + ${appengine.home}/config/sdk + + + + + + + + + diff --git a/labs/hostedchef/pom.xml b/labs/hostedchef/pom.xml index aa3e8f2..10f8c57 100644 --- a/labs/hostedchef/pom.xml +++ b/labs/hostedchef/pom.xml @@ -1,112 +1,112 @@ - 4.0.0 - - org.jclouds.chef - chef-parent - 1.7.0-SNAPSHOT - ../../project/pom.xml - - org.jclouds.labs - hostedchef - JClouds Chef :: Hosted Chef - jclouds components to access Hosted Chef + 4.0.0 + + org.jclouds.chef + chef-parent + 1.7.0-SNAPSHOT + ../../project/pom.xml + + org.jclouds.labs + hostedchef + JClouds Chef :: Hosted Chef + jclouds components to access Hosted Chef - - YOUR_ORG - https://api.opscode.com/organizations/${test.hostedchef.org} - - - YOUR_USER - ${user.home}/.chef/${test.hostedchef.org}/${test.hostedchef.identity}.pem - org.jclouds.hostedchef*;version="${project.version}" - org.jclouds*;version="${jclouds.version}",* - + + YOUR_ORG + https://api.opscode.com/organizations/${test.hostedchef.org} + + + YOUR_USER + ${user.home}/.chef/${test.hostedchef.org}/${test.hostedchef.identity}.pem + org.jclouds.hostedchef*;version="${project.version}" + org.jclouds*;version="${jclouds.version}",* + - - - org.jclouds.api - chef - ${project.version} - - - org.jclouds.api - chef - ${project.version} - test-jar - test - - - org.jclouds - jclouds-core - ${jclouds.version} - test-jar - test - - - org.jclouds.driver - jclouds-slf4j - ${jclouds.version} - test - - - ch.qos.logback - logback-classic - 1.0.9 - test - - + + + org.jclouds.api + chef + ${project.version} + + + org.jclouds.api + chef + ${project.version} + test-jar + test + + + org.jclouds + jclouds-core + ${jclouds.version} + test-jar + test + + + org.jclouds.driver + jclouds-slf4j + ${jclouds.version} + test + + + ch.qos.logback + logback-classic + 1.0.9 + test + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - ${test.hostedchef.org} - ${test.hostedchef.endpoint} - ${test.hostedchef.api-version} - ${test.hostedchef.build-version} - ${test.hostedchef.identity} - ${test.hostedchef.credential} - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + ${test.hostedchef.org} + ${test.hostedchef.endpoint} + ${test.hostedchef.api-version} + ${test.hostedchef.build-version} + ${test.hostedchef.identity} + ${test.hostedchef.credential} + + + + + + + + + diff --git a/labs/pom.xml b/labs/pom.xml index 17e19e1..19c30cb 100644 --- a/labs/pom.xml +++ b/labs/pom.xml @@ -1,38 +1,38 @@ - 4.0.0 - - org.jclouds.chef - chef-parent - 1.7.0-SNAPSHOT - ../project/pom.xml - - org.jclouds.labs - chef-labs-project - pom - JClouds Chef :: Labs - - privatechef - hostedchef - + 4.0.0 + + org.jclouds.chef + chef-parent + 1.7.0-SNAPSHOT + ../project/pom.xml + + org.jclouds.labs + chef-labs-project + pom + JClouds Chef :: Labs + + privatechef + hostedchef + diff --git a/labs/privatechef/pom.xml b/labs/privatechef/pom.xml index 84213a8..0d6855d 100644 --- a/labs/privatechef/pom.xml +++ b/labs/privatechef/pom.xml @@ -1,124 +1,124 @@ - 4.0.0 - - org.jclouds.chef - chef-parent - 1.7.0-SNAPSHOT - ../../project/pom.xml - - org.jclouds.labs - privatechef - JClouds Chef :: Private Chef - jclouds components to access Private Chef + 4.0.0 + + org.jclouds.chef + chef-parent + 1.7.0-SNAPSHOT + ../../project/pom.xml + + org.jclouds.labs + privatechef + JClouds Chef :: Private Chef + jclouds components to access Private Chef - - YOUR_ORG - https://api.opscode.com/organizations/${test.privatechef.org} - - - YOUR_USER - ${user.home}/.chef/${test.privatechef.org}/${jclouds.privatechef.identity}.pem - org.jclouds.privatechef*;version="${project.version}" - org.jclouds*;version="${jclouds.version}",* - + + YOUR_ORG + https://api.opscode.com/organizations/${test.privatechef.org} + + + YOUR_USER + ${user.home}/.chef/${test.privatechef.org}/${jclouds.privatechef.identity}.pem + org.jclouds.privatechef*;version="${project.version}" + org.jclouds*;version="${jclouds.version}",* + - - - org.jclouds.labs - hostedchef - ${project.version} - - - org.jclouds.labs - hostedchef - ${project.version} - test-jar - test - - - org.jclouds.api - chef - ${project.version} - - - org.jclouds.api - chef - ${project.version} - test-jar - test - - - org.jclouds - jclouds-core - ${jclouds.version} - test-jar - test - - - org.jclouds.driver - jclouds-slf4j - ${jclouds.version} - test - - - ch.qos.logback - logback-classic - 1.0.9 - test - - + + + org.jclouds.labs + hostedchef + ${project.version} + + + org.jclouds.labs + hostedchef + ${project.version} + test-jar + test + + + org.jclouds.api + chef + ${project.version} + + + org.jclouds.api + chef + ${project.version} + test-jar + test + + + org.jclouds + jclouds-core + ${jclouds.version} + test-jar + test + + + org.jclouds.driver + jclouds-slf4j + ${jclouds.version} + test + + + ch.qos.logback + logback-classic + 1.0.9 + test + + - - - live - - - - org.apache.maven.plugins - maven-surefire-plugin - - - integration - integration-test - - test - - - - ${test.privatechef.org} - ${test.privatechef.endpoint} - ${test.privatechef.api-version} - ${test.privatechef.build-version} - ${test.privatechef.identity} - ${test.privatechef.credential} - - - - - - - - - + + + live + + + + org.apache.maven.plugins + maven-surefire-plugin + + + integration + integration-test + + test + + + + ${test.privatechef.org} + ${test.privatechef.endpoint} + ${test.privatechef.api-version} + ${test.privatechef.build-version} + ${test.privatechef.identity} + ${test.privatechef.credential} + + + + + + + + + diff --git a/pom.xml b/pom.xml index a0f0a62..ff7b240 100644 --- a/pom.xml +++ b/pom.xml @@ -1,32 +1,32 @@ 4.0.0 - - org.jclouds.chef - chef-parent - 1.7.0-SNAPSHOT - project/pom.xml - + + org.jclouds.chef + chef-parent + 1.7.0-SNAPSHOT + project/pom.xml + chef-project JClouds Chef :: Project POM JClouds Chef top level project pom for builds @@ -51,7 +51,7 @@ true
project/src/etc/header.txt
-     SEMICOLON_STYLE +     SEMICOLON_STYLE **/src/**/resources/** diff --git a/project/pom.xml b/project/pom.xml index 5973e41..e874e1c 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -1,22 +1,22 @@ @@ -230,27 +230,27 @@ - - - sonatype-release-profile-extension - - - performRelease - true - - - - - - maven-gpg-plugin - - ${gpg.command} - ${gpg.passphrase} - - - - - + + + sonatype-release-profile-extension + + + performRelease + true + + + + + + maven-gpg-plugin + + ${gpg.command} + ${gpg.passphrase} + + + + + live @@ -279,22 +279,22 @@ + +https.proxyHost +proxy + + +https.proxyPort +port + + +https.noProxyHosts +localhost|10.150.4.49 + + --> file.encoding ${project.build.sourceEncoding} @@ -342,25 +342,25 @@ - - doc - - - - maven-javadoc-plugin - 2.8.1 - - - javadoc - package - - jar - - - - - - - + + doc + + + + maven-javadoc-plugin + 2.8.1 + + + javadoc + package + + jar + + + + + + + diff --git a/servlet/pom.xml b/servlet/pom.xml index 73fd2dd..9ab73b9 100644 --- a/servlet/pom.xml +++ b/servlet/pom.xml @@ -1,22 +1,22 @@