diff --git a/pom.xml b/pom.xml index 74e9c782f7..45f67aba87 100644 --- a/pom.xml +++ b/pom.xml @@ -129,6 +129,7 @@ pageTracker._trackPageview(); maven-assembly-plugin + 2.2-beta-5 false diff --git a/project/pom.xml b/project/pom.xml index dc24ef89a7..2909909cbf 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -22,6 +22,11 @@ 4.0.0 + + org.sonatype.oss + oss-parent + 4 + org.jclouds jclouds-project 1.0-SNAPSHOT @@ -57,7 +62,7 @@ http://groups.google.com/group/jclouds-contributors - SVN Commits + Repository Commits http://groups.google.com/group/jclouds-commits http://groups.google.com/group/jclouds-commits jclouds-commits@googlegroups.com @@ -66,19 +71,12 @@ - scm:svn:http://jclouds.googlecode.com/svn/trunk - scm:svn:https://jclouds.googlecode.com/svn/trunk - http://jclouds.googlecode.com/svn/trunk + scm:git:git://github.com/jclouds/jclouds.git + scm:git:ssh://git@github.com/jclouds/jclouds.git + http://github.com/jclouds/jclouds - - repo2 - http://repo2.maven.org/maven2 - - false - - jclouds-googlecode-deploy http://jclouds.googlecode.com/svn/repo @@ -95,7 +93,7 @@ jboss - http://repository.jboss.org/maven2/ + http://repository.jboss.org/nexus/content/groups/public-jboss false @@ -131,15 +129,6 @@ - - jclouds-googlecode-deploy - dav:https://jclouds.googlecode.com/svn/repo - false - - - jclouds-rimu-snapshots-nexus - http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots - website website @@ -147,13 +136,6 @@ - - central - http://repo1.maven.org/maven2 - - false - - jclouds-googlecode-deploy http://jclouds.googlecode.com/svn/repo @@ -230,7 +212,6 @@ - UTF-8 1.6 1.6 true @@ -289,23 +270,23 @@ - - - src/main/clojure - - - src/main/resources - - - - - src/test/clojure - - - src/test/resources - - - + + + src/main/clojure + + + src/main/resources + + + + + src/test/clojure + + + src/test/resources + + + com.theoryinpractise clojure-maven-plugin @@ -334,6 +315,7 @@ maven-surefire-plugin + 2.5 integration @@ -414,6 +396,7 @@ maven-javadoc-plugin + 2.7 javadoc @@ -425,7 +408,7 @@ -J-Xmx128m - ${sourceEncoding} + ${project.build.sourceEncoding} true http://download.oracle.com/javase/6/docs/api/ @@ -446,6 +429,7 @@ pageTracker._trackPageview(); maven-enforcer-plugin + 1.0-beta-1 enforce-banned-dependencies @@ -482,20 +466,23 @@ pageTracker._trackPageview(); maven-compiler-plugin + 2.3 - ${sourceEncoding} + ${project.build.sourceEncoding} ${maven.compile.source} ${maven.compile.target} maven-resources-plugin + 2.4.2 - ${sourceEncoding} + ${project.build.sourceEncoding} maven-jar-plugin + 2.3.1 @@ -506,21 +493,34 @@ pageTracker._trackPageview(); - jclouds ${pom.name} + jclouds ${project.name} jclouds jclouds org.jclouds.aws.s3 - ${pom.version} + ${project.version} ${maven.compile.source} ${maven.compile.target} - - - maven-site-plugin - + + + + + maven-site-plugin + 2.1 + + + maven-deploy-plugin + 2.5 + + + maven-install-plugin + 2.3 + + + @@ -529,6 +529,7 @@ pageTracker._trackPageview(); maven-surefire-plugin + 2.5 integration @@ -568,7 +569,7 @@ pageTracker._trackPageview(); --> file.encoding - ${sourceEncoding} + ${project.build.sourceEncoding} jclouds.test.initializer @@ -657,28 +658,50 @@ pageTracker._trackPageview(); - - clojure-1.1 - - - org.clojure - clojure - 1.1.0 - true - - - org.clojure - clojure-contrib - 1.1.0 - true - - - + + + sonatype-release-profile-extension + + + performRelease + true + + + + + + maven-gpg-plugin + + ${gpg.command} + ${gpg.passphrase} + + + + + + + clojure-1.1 + + + org.clojure + clojure + 1.1.0 + true + + + org.clojure + clojure-contrib + 1.1.0 + true + + + maven-project-info-reports-plugin + 2.1.2 @@ -700,7 +723,7 @@ pageTracker._trackPageview(); maven-javadoc-plugin 2.6.1 - ${sourceEncoding} + ${project.build.sourceEncoding} true @@ -713,21 +736,25 @@ pageTracker._trackPageview(); - org.codehaus.mojo + org.sonatype.maven.plugin emma-maven-plugin + 1.2 org.codehaus.mojo surefire-report-maven-plugin + 2.0-beta-1 true org.codehaus.mojo rat-maven-plugin + 1.0-alpha-3 true maven-pmd-plugin + 2.4 ${maven.compile.source} @@ -736,6 +763,7 @@ pageTracker._trackPageview(); org.codehaus.mojo findbugs-maven-plugin + 2.3.1 true diff --git a/thirdparty/pom.xml b/thirdparty/pom.xml index 533461c965..d099a049d9 100644 --- a/thirdparty/pom.xml +++ b/thirdparty/pom.xml @@ -33,4 +33,17 @@ resteasy-jaxrs-client + + + + + jclouds-googlecode-deploy + dav:https://jclouds.googlecode.com/svn/repo + false + + + jclouds-rimu-snapshots-nexus + http://jclouds.rimuhosting.com:8081/nexus/content/repositories/snapshots + + diff --git a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeClient.java b/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeClient.java index c3fb7c564e..4352c40fad 100644 --- a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeClient.java +++ b/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudDirectorComputeClient.java @@ -1,62 +1,62 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.bluelock.compute; - -import java.net.URI; -import java.util.Map; - -import javax.inject.Inject; -import javax.inject.Singleton; - -import org.jclouds.compute.domain.NodeState; -import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy; -import org.jclouds.domain.Credentials; -import org.jclouds.vcloud.VCloudClient; -import org.jclouds.vcloud.compute.internal.VCloudComputeClientImpl; -import org.jclouds.vcloud.domain.Status; -import org.jclouds.vcloud.domain.VApp; -import org.jclouds.vcloud.domain.VAppTemplate; - -import com.google.common.base.Predicate; - -/** - * @author Adrian Cole - */ -@Singleton -public class BlueLockVCloudDirectorComputeClient extends VCloudComputeClientImpl { - private final PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider; - - @Inject - protected BlueLockVCloudDirectorComputeClient(PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider, - VCloudClient client, Predicate successTester, Map vAppStatusToNodeState) { - super(client, successTester, vAppStatusToNodeState); - this.credentialsProvider = credentialsProvider; - } - - @Override - protected Map parseAndValidateResponse(VAppTemplate template, VApp vAppResponse) { - Credentials credentials = credentialsProvider.execute(template); - Map toReturn = super.parseResponse(template, vAppResponse); - toReturn.put("username", credentials.identity); - toReturn.put("password", credentials.credential); - return toReturn; - } - +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +package org.jclouds.vcloud.bluelock.compute; + +import java.net.URI; +import java.util.Map; + +import javax.inject.Inject; +import javax.inject.Singleton; + +import org.jclouds.compute.domain.NodeState; +import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy; +import org.jclouds.domain.Credentials; +import org.jclouds.vcloud.VCloudClient; +import org.jclouds.vcloud.compute.internal.VCloudComputeClientImpl; +import org.jclouds.vcloud.domain.Status; +import org.jclouds.vcloud.domain.VApp; +import org.jclouds.vcloud.domain.VAppTemplate; + +import com.google.common.base.Predicate; + +/** + * @author Adrian Cole + */ +@Singleton +public class BlueLockVCloudDirectorComputeClient extends VCloudComputeClientImpl { + private final PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider; + + @Inject + protected BlueLockVCloudDirectorComputeClient(PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider, + VCloudClient client, Predicate successTester, Map vAppStatusToNodeState) { + super(client, successTester, vAppStatusToNodeState); + this.credentialsProvider = credentialsProvider; + } + + @Override + protected Map parseAndValidateResponse(VAppTemplate template, VApp vAppResponse) { + Credentials credentials = credentialsProvider.execute(template); + Map toReturn = super.parseResponse(template, vAppResponse); + toReturn.put("username", credentials.identity); + toReturn.put("password", credentials.credential); + return toReturn; + } + } \ No newline at end of file diff --git a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudExpressComputeClient.java b/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudExpressComputeClient.java index 382bcd87c9..c12cc1247b 100644 --- a/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudExpressComputeClient.java +++ b/vcloud/bluelock/src/main/java/org/jclouds/vcloud/bluelock/compute/BlueLockVCloudExpressComputeClient.java @@ -1,63 +1,63 @@ -/** - * - * Copyright (C) 2010 Cloud Conscious, LLC. - * - * ==================================================================== - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - */ - -package org.jclouds.vcloud.bluelock.compute; - -import java.net.URI; -import java.util.Map; - -import javax.inject.Inject; -import javax.inject.Singleton; - -import org.jclouds.compute.domain.NodeState; -import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy; -import org.jclouds.domain.Credentials; -import org.jclouds.vcloud.VCloudExpressClient; -import org.jclouds.vcloud.compute.internal.VCloudExpressComputeClientImpl; -import org.jclouds.vcloud.domain.Status; -import org.jclouds.vcloud.domain.VCloudExpressVApp; -import org.jclouds.vcloud.domain.VCloudExpressVAppTemplate; - -import com.google.common.base.Predicate; - -/** - * @author Adrian Cole - */ -@Singleton -public class BlueLockVCloudExpressComputeClient extends VCloudExpressComputeClientImpl { - private final PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider; - - @Inject - protected BlueLockVCloudExpressComputeClient(PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider, - VCloudExpressClient client, Predicate successTester, Map vAppStatusToNodeState) { - super(client, successTester, vAppStatusToNodeState); - this.credentialsProvider = credentialsProvider; - } - - @Override - protected Map parseAndValidateResponse(VCloudExpressVAppTemplate template, - VCloudExpressVApp vAppResponse) { - Credentials credentials = credentialsProvider.execute(template); - Map toReturn = super.parseResponse(template, vAppResponse); - toReturn.put("username", credentials.identity); - toReturn.put("password", credentials.credential); - return toReturn; - } - +/** + * + * Copyright (C) 2010 Cloud Conscious, LLC. + * + * ==================================================================== + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + */ + +package org.jclouds.vcloud.bluelock.compute; + +import java.net.URI; +import java.util.Map; + +import javax.inject.Inject; +import javax.inject.Singleton; + +import org.jclouds.compute.domain.NodeState; +import org.jclouds.compute.strategy.PopulateDefaultLoginCredentialsForImageStrategy; +import org.jclouds.domain.Credentials; +import org.jclouds.vcloud.VCloudExpressClient; +import org.jclouds.vcloud.compute.internal.VCloudExpressComputeClientImpl; +import org.jclouds.vcloud.domain.Status; +import org.jclouds.vcloud.domain.VCloudExpressVApp; +import org.jclouds.vcloud.domain.VCloudExpressVAppTemplate; + +import com.google.common.base.Predicate; + +/** + * @author Adrian Cole + */ +@Singleton +public class BlueLockVCloudExpressComputeClient extends VCloudExpressComputeClientImpl { + private final PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider; + + @Inject + protected BlueLockVCloudExpressComputeClient(PopulateDefaultLoginCredentialsForImageStrategy credentialsProvider, + VCloudExpressClient client, Predicate successTester, Map vAppStatusToNodeState) { + super(client, successTester, vAppStatusToNodeState); + this.credentialsProvider = credentialsProvider; + } + + @Override + protected Map parseAndValidateResponse(VCloudExpressVAppTemplate template, + VCloudExpressVApp vAppResponse) { + Credentials credentials = credentialsProvider.execute(template); + Map toReturn = super.parseResponse(template, vAppResponse); + toReturn.put("username", credentials.identity); + toReturn.put("password", credentials.credential); + return toReturn; + } + } \ No newline at end of file