diff --git a/README.txt b/README.txt index 826cb8c4c9..a2e1cd7264 100644 --- a/README.txt +++ b/README.txt @@ -1,3 +1,22 @@ +==== + + 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. + ==================================================================== +==== + Overview: jclouds is an open source framework that helps you get started in the cloud diff --git a/archetypes/compute-service-archetype/pom.xml b/archetypes/compute-service-archetype/pom.xml index 250308b516..bbf39f2316 100644 --- a/archetypes/compute-service-archetype/pom.xml +++ b/archetypes/compute-service-archetype/pom.xml @@ -2,7 +2,7 @@ + ${appengine.applicationid} 1 diff --git a/aws/demos/googleappengine/src/main/appengine/logging.properties b/aws/demos/googleappengine/src/main/appengine/logging.properties index 479aec4070..b9059ceeef 100644 --- a/aws/demos/googleappengine/src/main/appengine/logging.properties +++ b/aws/demos/googleappengine/src/main/appengine/logging.properties @@ -1,6 +1,6 @@ # # -# Copyright (C) 2009 Cloud Conscious, LLC. +# Copyright (C) 2010 Cloud Conscious, LLC. # # ==================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,62 +16,6 @@ # limitations under the License. # ==================================================================== # -# -# -# Copyright (C) 2009 Cloud Conscious, LLC. -# -# ==================================================================== -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ==================================================================== -# -# -# -# Copyright (C) 2009 Global Cloud Specialists, Inc. -# -# ==================================================================== -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ==================================================================== -# -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# # Set the default logging level for all loggers to WARNING .level = INFO diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java index ddca57b87d..aa43ab0a1e 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/GetAllStatusController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine; import java.io.IOException; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java index b17fcea5e4..6614c7dcc1 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/config/GuiceServletConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.config; import static org.jclouds.compute.reference.ComputeServiceConstants.PROPERTY_TIMEOUT_NODE_RUNNING; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java index d9fbec68cf..4bae858034 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/domain/StatusResult.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.domain; import java.io.Serializable; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java index 2a90a77bbe..042d325e6f 100755 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/BlobStoreContextToStatusResult.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functions; import java.util.Map; diff --git a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java index 435d918a20..7d58e5954e 100644 --- a/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java +++ b/aws/demos/googleappengine/src/main/java/org/jclouds/samples/googleappengine/functions/ComputeServiceContextToStatusResult.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functions; import java.util.Map; diff --git a/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp b/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp index 4d1c4c9e6f..78d30ff991 100755 --- a/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp +++ b/aws/demos/googleappengine/src/main/webapp/WEB-INF/jsp/status.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + <%@ page buffer="20kb"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%> diff --git a/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml b/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml index b2e84f5e47..2ee71f16b2 100755 --- a/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml +++ b/aws/demos/googleappengine/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + diff --git a/aws/demos/googleappengine/src/main/webapp/index.jsp b/aws/demos/googleappengine/src/main/webapp/index.jsp index 7d4b453580..a00db13f7c 100755 --- a/aws/demos/googleappengine/src/main/webapp/index.jsp +++ b/aws/demos/googleappengine/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + jclouds: multi-cloud framework diff --git a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java index b65bfbffff..8a7543fc20 100755 --- a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java +++ b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleAppEngineLiveTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functest; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java index bbc4342eb3..9122436db6 100755 --- a/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java +++ b/aws/demos/googleappengine/src/test/java/org/jclouds/samples/googleappengine/functest/GoogleDevServer.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.samples.googleappengine.functest; import com.google.appengine.tools.KickStart; diff --git a/aws/demos/pom.xml b/aws/demos/pom.xml index 3ff2078cf9..b1d6a76dd1 100644 --- a/aws/demos/pom.xml +++ b/aws/demos/pom.xml @@ -2,7 +2,7 @@ + diff --git a/demos/gae-tweetstore-spring/README.txt b/demos/gae-tweetstore-spring/README.txt index 0531f59583..b333e3985d 100644 --- a/demos/gae-tweetstore-spring/README.txt +++ b/demos/gae-tweetstore-spring/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + This sample is a "port" of jclouds-demo-gae-tweetstore with the initial context setup and wiring carried out with Spring. It is intended to demonstrate how to integrate jclouds into your Spring application. diff --git a/demos/gae-tweetstore-spring/pom.xml b/demos/gae-tweetstore-spring/pom.xml index fcceff4b4a..9233720d10 100644 --- a/demos/gae-tweetstore-spring/pom.xml +++ b/demos/gae-tweetstore-spring/pom.xml @@ -2,7 +2,7 @@ + ${appengine.applicationid} 1 diff --git a/demos/gae-tweetstore-spring/src/main/appengine/logging.properties b/demos/gae-tweetstore-spring/src/main/appengine/logging.properties index 2ea5246602..d355b9e308 100644 --- a/demos/gae-tweetstore-spring/src/main/appengine/logging.properties +++ b/demos/gae-tweetstore-spring/src/main/appengine/logging.properties @@ -1,6 +1,6 @@ # # -# Copyright (C) 2009 Cloud Conscious, LLC. +# Copyright (C) 2010 Cloud Conscious, LLC. # # ==================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java index ad41ba048d..a915b53969 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/LoggingConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.config; import org.jclouds.logging.Logger; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java index 9359cab6ad..ca1f9f9692 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/config/SpringServletConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.config; import static com.google.appengine.api.labs.taskqueue.TaskOptions.Builder.url; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java index d0f1eea3b8..13853875b3 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import java.io.IOException; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java index bd408987d6..414014e20a 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java index 79159c0052..b7d183c7a2 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.domain; import java.io.Serializable; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java index 4def339f4f..eac5f3be42 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.jclouds.util.Utils.toStringAndClose; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java index 04695e5d14..13a3350134 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import java.util.Collections; diff --git a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java index 11fe6aae72..bae4e22fef 100644 --- a/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java +++ b/demos/gae-tweetstore-spring/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.reference; /** diff --git a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml index e80392f207..2cb1700537 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml +++ b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/dispatcher-servlet.xml @@ -2,7 +2,7 @@ + twitter diff --git a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml index ca16b8e186..963e2f2ff9 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml +++ b/demos/gae-tweetstore-spring/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + diff --git a/demos/gae-tweetstore-spring/src/main/webapp/index.jsp b/demos/gae-tweetstore-spring/src/main/webapp/index.jsp index f1a620f27b..86a3d70d07 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/index.jsp +++ b/demos/gae-tweetstore-spring/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + jclouds: anyweight cloudware for java diff --git a/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp b/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp index 255bab82eb..1726e552dd 100644 --- a/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp +++ b/demos/gae-tweetstore-spring/src/main/webapp/tweets.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + <%@ page buffer="20kb"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%> diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java index ff8a9f969b..74289ff97a 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java index 2b003d5884..75b665f84b 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.easymock.classextension.EasyMock.createMock; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java index 51906e2f66..347a02bc5b 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java index 6217a38eb2..faf131cc17 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java index 585872cbb0..231fac183c 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import com.google.appengine.tools.KickStart; diff --git a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java index 2ee32afec7..1191c13242 100644 --- a/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java +++ b/demos/gae-tweetstore-spring/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/gae-tweetstore/README.txt b/demos/gae-tweetstore/README.txt index a50d18d4b0..d4e2ae8cc1 100755 --- a/demos/gae-tweetstore/README.txt +++ b/demos/gae-tweetstore/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + This sample uses the Google App Engine for Java SDK located at http://code.google.com/p/googleappengine/downloads/list diff --git a/demos/gae-tweetstore/pom.xml b/demos/gae-tweetstore/pom.xml index edea967a60..0cde8b8c4b 100644 --- a/demos/gae-tweetstore/pom.xml +++ b/demos/gae-tweetstore/pom.xml @@ -2,7 +2,7 @@ + ${appengine.applicationid} 1 diff --git a/demos/gae-tweetstore/src/main/appengine/logging.properties b/demos/gae-tweetstore/src/main/appengine/logging.properties index a86b9d708b..29fad00bb8 100644 --- a/demos/gae-tweetstore/src/main/appengine/logging.properties +++ b/demos/gae-tweetstore/src/main/appengine/logging.properties @@ -1,6 +1,6 @@ # # -# Copyright (C) 2009 Cloud Conscious, LLC. +# Copyright (C) 2010 Cloud Conscious, LLC. # # ==================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,37 +16,6 @@ # limitations under the License. # ==================================================================== # -# Copyright (C) 2009 Global Cloud Specialists, Inc. -# -# ==================================================================== -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# ==================================================================== -# -# A default java.util.logging configuration. -# (All App Engine logging is through java.util.logging by default). -# -# To use this configuration, copy it into your application's WEB-INF -# folder and add the following to your appengine-web.xml: -# -# -# -# -# # Set the default logging level for all loggers to WARNING .level = INFO diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java index d41252efce..de6913b92c 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.config; import static com.google.appengine.api.labs.taskqueue.TaskOptions.Builder.url; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java index 8b12d11b34..fe734e9fed 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/AddTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import java.io.IOException; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java index bd408987d6..414014e20a 100644 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/controller/StoreTweetsController.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java index 79159c0052..b7d183c7a2 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/domain/StoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.domain; import java.io.Serializable; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java index 4def339f4f..eac5f3be42 100644 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatus.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.jclouds.util.Utils.toStringAndClose; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java index 04695e5d14..13a3350134 100755 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatuses.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import java.util.Collections; diff --git a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java index 11fe6aae72..bae4e22fef 100644 --- a/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java +++ b/demos/gae-tweetstore/src/main/java/org/jclouds/demo/tweetstore/reference/TweetStoreConstants.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.reference; /** diff --git a/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml b/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml index 6225291c28..5ff5027098 100644 --- a/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml +++ b/demos/gae-tweetstore/src/main/webapp/WEB-INF/queue.xml @@ -2,7 +2,7 @@ + twitter diff --git a/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml b/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml index b8e8fa4667..32aa161d85 100755 --- a/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml +++ b/demos/gae-tweetstore/src/main/webapp/WEB-INF/web.xml @@ -2,7 +2,7 @@ + diff --git a/demos/gae-tweetstore/src/main/webapp/index.jsp b/demos/gae-tweetstore/src/main/webapp/index.jsp index f1a620f27b..86a3d70d07 100755 --- a/demos/gae-tweetstore/src/main/webapp/index.jsp +++ b/demos/gae-tweetstore/src/main/webapp/index.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + jclouds: anyweight cloudware for java diff --git a/demos/gae-tweetstore/src/main/webapp/tweets.jsp b/demos/gae-tweetstore/src/main/webapp/tweets.jsp index 255bab82eb..1726e552dd 100755 --- a/demos/gae-tweetstore/src/main/webapp/tweets.jsp +++ b/demos/gae-tweetstore/src/main/webapp/tweets.jsp @@ -1,7 +1,7 @@ <%-- - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,6 +18,7 @@ ==================================================================== --%> + <%@ page buffer="20kb"%> <%@ taglib uri="http://displaytag.sf.net" prefix="display"%> diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java index 893e19c8e0..019550afd8 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/AddTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java index 2b003d5884..75b665f84b 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/controller/StoreTweetsControllerTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.controller; import static org.easymock.classextension.EasyMock.createMock; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java index 6079c8a31a..843afd5fa2 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/KeyToStoredTweetStatusTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java index 6217a38eb2..faf131cc17 100644 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/functions/ServiceToStoredTweetStatusesTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.functions; import static org.testng.Assert.assertEquals; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java index 585872cbb0..231fac183c 100755 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/GoogleDevServer.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import com.google.appengine.tools.KickStart; diff --git a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java index a05ac32e9b..ba8099aa05 100755 --- a/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java +++ b/demos/gae-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/TweetStoreLiveTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.demo.tweetstore.integration; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/demos/pom.xml b/demos/pom.xml index e3e91a070b..dc078a0498 100644 --- a/demos/pom.xml +++ b/demos/pom.xml @@ -2,7 +2,7 @@ +--> + 4.0.0 org.jclouds @@ -96,21 +97,22 @@ pageTracker._trackPageview(); com.mycila.maven-license-plugin maven-license-plugin - 1.5.0 + 1.8.0 + true ${sourceEncoding} true
project/src/etc/header.txt
+ +     SEMICOLON_STYLE + - - **/src/main/java/com/amazon/** - **/S3Driver.java thirdparty/** **/src/**/resources/** **/LICENSE.txt - ${project.inceptionYear} + 2010 info@cloudconscious.com Cloud Conscious, LLC diff --git a/project/pom.xml b/project/pom.xml index 8297a4860c..550e131015 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -2,7 +2,7 @@ + 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. + ==================================================================== + +--> jclouds-project diff --git a/tools/antcontrib/pom.xml b/tools/antcontrib/pom.xml index 3b528e1820..2e8eadd64c 100644 --- a/tools/antcontrib/pom.xml +++ b/tools/antcontrib/pom.xml @@ -2,7 +2,7 @@ + diff --git a/tools/antcontrib/samples/cargooverssh/runscript.sh b/tools/antcontrib/samples/cargooverssh/runscript.sh index 8668ff9938..8dbde3ddb2 100644 --- a/tools/antcontrib/samples/cargooverssh/runscript.sh +++ b/tools/antcontrib/samples/cargooverssh/runscript.sh @@ -1,3 +1,22 @@ +# +# +# 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. +# ==================================================================== +# + echo nameserver 208.67.222.222 >> /etc/resolv.conf apt-get update -qq apt-get upgrade -y -qq diff --git a/tools/antcontrib/samples/compute/build.xml b/tools/antcontrib/samples/compute/build.xml index 2f22b9b425..aa75b99227 100644 --- a/tools/antcontrib/samples/compute/build.xml +++ b/tools/antcontrib/samples/compute/build.xml @@ -1,7 +1,7 @@ + diff --git a/tools/antcontrib/samples/javaoverssh/README.txt b/tools/antcontrib/samples/javaoverssh/README.txt index 34cf2739c9..ce3aa073a6 100755 --- a/tools/antcontrib/samples/javaoverssh/README.txt +++ b/tools/antcontrib/samples/javaoverssh/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + this is a simple ant script that executes a java command on a remote machine via ssh 1. find or download a copy of jclouds-antcontrib-1.0-SNAPSHOT-jar-with-dependencies.jar - ex. ~/.m2/repository/org/jclouds/jclouds-antcontrib/1.0-SNAPSHOT/jclouds-antcontrib-1.0-SNAPSHOT-jar-with-dependencies.jar diff --git a/tools/antcontrib/samples/javaoverssh/build.xml b/tools/antcontrib/samples/javaoverssh/build.xml index 3cb9fa25ec..34f03eb2a2 100644 --- a/tools/antcontrib/samples/javaoverssh/build.xml +++ b/tools/antcontrib/samples/javaoverssh/build.xml @@ -2,7 +2,7 @@ + simple example build file diff --git a/tools/antcontrib/samples/javaoverssh/src/TestClass.java b/tools/antcontrib/samples/javaoverssh/src/TestClass.java index 282db72c11..30289049fb 100644 --- a/tools/antcontrib/samples/javaoverssh/src/TestClass.java +++ b/tools/antcontrib/samples/javaoverssh/src/TestClass.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java index 025931be94..78eae3cdd8 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/AntLogger.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.logging; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java index f2da6902d1..d0f4bd949d 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/logging/config/AntLoggingModule.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.logging.config; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java index 0a52571a65..097a7b5848 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTask.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.compute; import static org.jclouds.compute.util.ComputeServiceUtils.isKeyAuth; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java index d064d15fda..47a33d1e55 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/ComputeTaskUtils.java @@ -1,26 +1,22 @@ /** * - * Copyright (C) 2009 Global Cloud Specialists, Inc. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at + * 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 + * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.compute; import static org.jclouds.rest.RestContextFactory.getPropertiesFromResource; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java index 63bca76a37..addddbacb5 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/compute/NodeElement.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.compute; import java.io.File; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java index e201c384c3..2a1e837e04 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJava.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.sshjava; import static com.google.common.base.Preconditions.checkNotNull; diff --git a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java index e71aa4895c..3b3d803c4f 100644 --- a/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java +++ b/tools/antcontrib/src/main/java/org/jclouds/tools/ant/util/SSHExecute.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.util; import java.io.IOException; diff --git a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java index e56a02e77d..d9931da6be 100644 --- a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java +++ b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/TestClass.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java index 66039da3ae..937eb2499d 100644 --- a/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java +++ b/tools/antcontrib/src/test/java/org/jclouds/tools/ant/taskdefs/sshjava/SSHJavaTest.java @@ -1,6 +1,6 @@ /** * - * Copyright (C) 2009 Cloud Conscious, LLC. + * Copyright (C) 2010 Cloud Conscious, LLC. * * ==================================================================== * Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ * limitations under the License. * ==================================================================== */ + package org.jclouds.tools.ant.taskdefs.sshjava; import static org.testng.Assert.assertEquals; diff --git a/tools/getpath/README.txt b/tools/getpath/README.txt index 6ddf904356..a32998a303 100755 --- a/tools/getpath/README.txt +++ b/tools/getpath/README.txt @@ -1,6 +1,6 @@ ==== - Copyright (C) 2009 Cloud Conscious, LLC. + Copyright (C) 2010 Cloud Conscious, LLC. ==================================================================== Licensed under the Apache License, Version 2.0 (the "License"); @@ -16,6 +16,7 @@ limitations under the License. ==================================================================== ==== + # # this is a simple command line client that obtains the contents of a container # 1. execute 'mvn install' to build the sample diff --git a/tools/getpath/pom.xml b/tools/getpath/pom.xml index 9a863b7241..616fea3661 100644 --- a/tools/getpath/pom.xml +++ b/tools/getpath/pom.xml @@ -2,7 +2,7 @@ + +