Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:jclouds/jclouds 

* 'master' of github.com:jclouds/jclouds:
  Also generating the XML EMMA report as required by the Jenkins EMMA plugin
  Switching to a local 1.3-SNAPSHOT version of the emma-maven-plugin to resolve https://cloudbees.zendesk.com/tickets/1198
  utils -> util in package names
This commit is contained in:
Adrian Cole 2011-07-07 17:03:46 -07:00
parent 37e6424040 94e6d5834e
commit b889188b86
7 changed files with 74 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/GuiceServletConfig.java
View File

@ -38,9 +38,9 @@ import javax.servlet.ServletContextEvent;
import org.jclouds.blobstore.BlobStoreContext;
import org.jclouds.blobstore.BlobStoreContextFactory;
import org.jclouds.demo.tweetstore.config.utils.HttpRequestTask;
import org.jclouds.demo.tweetstore.config.utils.HttpRequestTask.Factory;
import org.jclouds.demo.tweetstore.config.utils.TaskQueue;
import org.jclouds.demo.tweetstore.config.util.HttpRequestTask;
import org.jclouds.demo.tweetstore.config.util.TaskQueue;
import org.jclouds.demo.tweetstore.config.util.HttpRequestTask.Factory;
import org.jclouds.demo.tweetstore.controller.AddTweetsController;
import org.jclouds.demo.tweetstore.controller.StoreTweetsController;
import org.jclouds.http.HttpRequest;

20
demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/utils/HttpRequestTask.java → demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/util/HttpRequestTask.java
View File

@ -1,4 +1,22 @@
package org.jclouds.demo.tweetstore.config.utils;
/**
*
* Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* 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.demo.tweetstore.config.util;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.inject.name.Names.bindProperties;

20
demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/utils/ImmutableHttpCommand.java → demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/util/ImmutableHttpCommand.java
View File

@ -1,4 +1,22 @@
package org.jclouds.demo.tweetstore.config.utils;
/**
*
* Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* 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.demo.tweetstore.config.util;
import org.jclouds.http.HttpCommand;
import org.jclouds.http.HttpRequest;

20
demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/utils/TaskQueue.java → demos/tweetstore/runatcloud-tweetstore/src/main/java/org/jclouds/demo/tweetstore/config/util/TaskQueue.java
View File

@ -1,4 +1,22 @@
package org.jclouds.demo.tweetstore.config.utils;
/**
*
* Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* 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.demo.tweetstore.config.util;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

4
demos/tweetstore/runatcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/StaxSdkAppServer2.java
View File

@ -22,8 +22,8 @@ package org.jclouds.demo.tweetstore.integration;
import static com.google.common.base.Predicates.instanceOf;
import static java.util.Arrays.asList;
import static org.jclouds.demo.tweetstore.integration.utils.ObjectFields.set;
import static org.jclouds.demo.tweetstore.integration.utils.ObjectFields.valueOf;
import static org.jclouds.demo.tweetstore.integration.util.ObjectFields.set;
import static org.jclouds.demo.tweetstore.integration.util.ObjectFields.valueOf;
import java.io.File;
import java.io.IOException;

10
demos/tweetstore/runatcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/utils/ObjectFields.java → demos/tweetstore/runatcloud-tweetstore/src/test/java/org/jclouds/demo/tweetstore/integration/util/ObjectFields.java
View File

@ -1,7 +1,6 @@
/*
* @(#)ObjectFields.java 26 May 2011
/**
*
* Copyright © 2010 Andrew Phillips.
* Copyright (C) 2011 Cloud Conscious, LLC. <info@cloudconscious.com>
*
* ====================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
@ -12,13 +11,12 @@
*
* 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.
* 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.demo.tweetstore.integration.utils;
package org.jclouds.demo.tweetstore.integration.util;
import java.lang.reflect.Field;

10
project/pom.xml
View File

@ -791,7 +791,10 @@ pageTracker._trackPageview();
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>1.2</version>
<version>1.3-SNAPSHOT</version>
<configuration>
<formats>html,xml</formats>
</configuration>
</plugin>
<plugin>
<groupId>org.codehaus.mojo</groupId>
@ -872,7 +875,10 @@ pageTracker._trackPageview();
<plugin>
<groupId>org.sonatype.maven.plugin</groupId>
<artifactId>emma-maven-plugin</artifactId>
<version>1.2</version>
<version>1.3-SNAPSHOT</version>
<configuration>
<formats>html,xml</formats>
</configuration>
</plugin>
<plugin>
<artifactId>maven-jxr-plugin</artifactId>