ContainerConfigException is missing from this patch. On Wed, Jul 16, 2008 at 6:28 PM, <[EMAIL PROTECTED]> wrote:
> Author: beaton > Date: Wed Jul 16 18:28:13 2008 > New Revision: 677482 > > URL: http://svn.apache.org/viewvc?rev=677482&view=rev > Log: > Move ContainerConfig to common, see SHINDIG-455: > https://issues.apache.org/jira/browse/SHINDIG-455 > > Added: > > > incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java > - copied, changed from r677471, > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java > > > incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java > - copied, changed from r677471, > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java > Removed: > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java > Modified: > incubator/shindig/trunk/java/common/pom.xml > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java > > > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java > > Modified: incubator/shindig/trunk/java/common/pom.xml > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/pom.xml?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- incubator/shindig/trunk/java/common/pom.xml (original) > +++ incubator/shindig/trunk/java/common/pom.xml Wed Jul 16 18:28:13 2008 > @@ -73,5 +73,9 @@ > <groupId>joda-time</groupId> > <artifactId>joda-time</artifactId> > </dependency> > + <dependency> > + <groupId>org.json</groupId> > + <artifactId>json</artifactId> > + </dependency> > </dependencies> > </project> > > Copied: > incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java > (from r677471, > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java) > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java?p2=incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java&p1=incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java&r1=677471&r2=677482&rev=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/ContainerConfig.java > (original) > +++ > incubator/shindig/trunk/java/common/src/main/java/org/apache/shindig/common/ContainerConfig.java > Wed Jul 16 18:28:13 2008 > @@ -17,7 +17,7 @@ > * under the License. > */ > > -package org.apache.shindig.gadgets; > +package org.apache.shindig.common; > > import org.apache.shindig.common.util.ResourceLoader; > > @@ -146,9 +146,9 @@ > * Only files with a .js or .json extension will be loaded. > * > * @param files The files to examine. > - * @throws GadgetException > + * @throws ContainerConfigException > */ > - private void loadFiles(File[] files) throws GadgetException { > + private void loadFiles(File[] files) throws ContainerConfigException { > try { > for (File file : files) { > logger.info("Reading container config: " + file.getName()); > @@ -160,16 +160,16 @@ > } > } > } catch (IOException e) { > - throw new GadgetException(GadgetException.Code.INVALID_PATH, e); > + throw new ContainerConfigException(e); > } > } > > /** > * Loads resources recursively. > * @param files The base paths to look for container.xml > - * @throws GadgetException > + * @throws ContainerConfigException > */ > - private void loadResources(String[] files) throws GadgetException { > + private void loadResources(String[] files) throws > ContainerConfigException { > try { > for (String entry : files) { > logger.info("Reading container config: " + entry); > @@ -177,7 +177,7 @@ > loadFromString(content); > } > } catch (IOException e) { > - throw new GadgetException(GadgetException.Code.INVALID_PATH, e); > + throw new ContainerConfigException(e); > } > } > > @@ -224,11 +224,11 @@ > * > * @return The object merged with all parents. > * > - * @throws GadgetException If there is an invalid parent parameter > + * @throws ContainerConfigException If there is an invalid parent > parameter > * in the prototype chain. > */ > private JSONObject mergeParents(String container) > - throws GadgetException, JSONException { > + throws ContainerConfigException, JSONException { > JSONObject base = config.get(container); > if (DEFAULT_CONTAINER.equals(container)) { > return base; > @@ -236,7 +236,7 @@ > > String parent = base.optString(PARENT_KEY, DEFAULT_CONTAINER); > if (!config.containsKey(parent)) { > - throw new GadgetException(GadgetException.Code.INVALID_CONFIG, > + throw new ContainerConfigException( > "Unable to locate parent '" + parent + "' required by " > + base.getString(CONTAINER_KEY)); > } > @@ -247,9 +247,9 @@ > * Processes a container file. > * > * @param json > - * @throws GadgetException > + * @throws ContainerConfigException > */ > - protected void loadFromString(String json) throws GadgetException { > + protected void loadFromString(String json) throws > ContainerConfigException { > try { > JSONObject contents = new JSONObject(json); > JSONArray containers = contents.getJSONArray(CONTAINER_KEY); > @@ -260,7 +260,7 @@ > config.put(container, contents); > } > } catch (JSONException e) { > - throw new GadgetException(GadgetException.Code.INVALID_CONFIG, e); > + throw new ContainerConfigException(e); > } > } > > @@ -269,9 +269,9 @@ > * as [EMAIL PROTECTED] JsFeatureLoader.loadFeatures} for locating > resources. > * > * @param path > - * @throws GadgetException > + * @throws ContainerConfigException > */ > - private void loadContainers(String path) throws GadgetException { > + private void loadContainers(String path) throws ContainerConfigException > { > try { > for (String location : StringUtils.split(path, FILE_SEPARATOR)) { > if (location.startsWith("res://")) { > @@ -298,20 +298,20 @@ > } > config.putAll(merged); > } catch (IOException e) { > - throw new GadgetException(GadgetException.Code.INVALID_PATH, e); > + throw new ContainerConfigException(e); > } catch (JSONException e) { > - throw new GadgetException(GadgetException.Code.INVALID_CONFIG, e); > + throw new ContainerConfigException(e); > } > } > > /** > * Creates a new, empty configuration. > * @param containers > - * @throws GadgetException > + * @throws ContainerConfigException > */ > @Inject > public ContainerConfig(@Named("containers.default") String containers) > - throws GadgetException { > + throws ContainerConfigException { > config = new HashMap<String, JSONObject>(); > if (containers != null) { > loadContainers(containers); > > Copied: > incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java > (from r677471, > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java) > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java?p2=incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java&r1=677471&r2=677482&rev=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/ContainerConfigTest.java > (original) > +++ > incubator/shindig/trunk/java/common/src/test/java/org/apache/shindig/common/ContainerConfigTest.java > Wed Jul 16 18:28:13 2008 > @@ -17,11 +17,11 @@ > * under the License. > */ > > -package org.apache.shindig.gadgets; > +package org.apache.shindig.common; > > -import static org.apache.shindig.gadgets.ContainerConfig.CONTAINER_KEY; > -import static > org.apache.shindig.gadgets.ContainerConfig.DEFAULT_CONTAINER; > -import static org.apache.shindig.gadgets.ContainerConfig.PARENT_KEY; > +import static org.apache.shindig.common.ContainerConfig.CONTAINER_KEY; > +import static org.apache.shindig.common.ContainerConfig.DEFAULT_CONTAINER; > +import static org.apache.shindig.common.ContainerConfig.PARENT_KEY; > import static org.junit.Assert.assertEquals; > > import org.json.JSONArray; > @@ -147,7 +147,7 @@ > assertEquals(defaultArrayTest.toString(), defaultArray.toString()); > } > > - @Test(expected = GadgetException.class) > + @Test(expected = ContainerConfigException.class) > public void badConfigThrows() throws Exception { > JSONObject json = new JSONObject(); > json.put(CONTAINER_KEY, new String[]{CHILD_CONTAINER}); > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/Gadget.java > Wed Jul 16 18:28:13 2008 > @@ -17,6 +17,7 @@ > */ > package org.apache.shindig.gadgets; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.http.HttpResponse; > import org.apache.shindig.gadgets.spec.GadgetSpec; > import org.apache.shindig.gadgets.spec.LocaleSpec; > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetContext.java > Wed Jul 16 18:28:13 2008 > @@ -17,6 +17,7 @@ > */ > package org.apache.shindig.gadgets; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.SecurityToken; > import org.apache.shindig.gadgets.spec.GadgetSpec; > > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/GadgetFeature.java > Wed Jul 16 18:28:13 2008 > @@ -19,6 +19,8 @@ > > import com.google.common.collect.Maps; > > +import org.apache.shindig.common.ContainerConfig; > + > import java.util.Collection; > import java.util.Collections; > import java.util.LinkedList; > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/HashLockedDomainService.java > Wed Jul 16 18:28:13 2008 > @@ -17,6 +17,7 @@ > */ > package org.apache.shindig.gadgets; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.util.Base32; > import org.apache.shindig.gadgets.spec.Feature; > > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java > Wed Jul 16 18:28:13 2008 > @@ -17,6 +17,7 @@ > */ > package org.apache.shindig.gadgets; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.util.ResourceLoader; > import org.apache.shindig.common.xml.XmlException; > import org.apache.shindig.common.xml.XmlUtil; > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTask.java > Wed Jul 16 18:28:13 2008 > @@ -19,10 +19,10 @@ > > package org.apache.shindig.gadgets.servlet; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.SecurityToken; > import org.apache.shindig.common.SecurityTokenDecoder; > import org.apache.shindig.common.util.Utf8UrlCoder; > -import org.apache.shindig.gadgets.ContainerConfig; > import org.apache.shindig.gadgets.Gadget; > import org.apache.shindig.gadgets.GadgetContentFilter; > import org.apache.shindig.gadgets.GadgetContext; > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/HttpUtil.java > Wed Jul 16 18:28:13 2008 > @@ -18,7 +18,7 @@ > */ > package org.apache.shindig.gadgets.servlet; > > -import org.apache.shindig.gadgets.ContainerConfig; > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.GadgetContext; > > import org.json.JSONException; > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/JsServlet.java > Wed Jul 16 18:28:13 2008 > @@ -17,8 +17,8 @@ > */ > package org.apache.shindig.gadgets.servlet; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.servlet.InjectedServlet; > -import org.apache.shindig.gadgets.ContainerConfig; > import org.apache.shindig.gadgets.GadgetFeature; > import org.apache.shindig.gadgets.GadgetFeatureRegistry; > import org.apache.shindig.gadgets.JsLibrary; > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/UrlGenerator.java > Wed Jul 16 18:28:13 2008 > @@ -18,9 +18,9 @@ > */ > package org.apache.shindig.gadgets.servlet; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.util.HashUtil; > import org.apache.shindig.common.util.Utf8UrlCoder; > -import org.apache.shindig.gadgets.ContainerConfig; > import org.apache.shindig.gadgets.Gadget; > import org.apache.shindig.gadgets.GadgetContext; > import org.apache.shindig.gadgets.GadgetFeature; > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTest.java > Wed Jul 16 18:28:13 2008 > @@ -22,6 +22,7 @@ > import static org.easymock.classextension.EasyMock.replay; > import static org.junit.Assert.assertEquals; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.http.HttpResponse; > import org.apache.shindig.gadgets.spec.GadgetSpec; > import org.apache.shindig.gadgets.spec.LocaleSpec; > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java > Wed Jul 16 18:28:13 2008 > @@ -19,6 +19,7 @@ > > package org.apache.shindig.gadgets; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.SecurityTokenDecoder; > import org.apache.shindig.gadgets.http.ContentFetcherFactory; > import org.apache.shindig.gadgets.http.HttpFetcher; > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/HashLockedDomainServiceTest.java > Wed Jul 16 18:28:13 2008 > @@ -24,6 +24,7 @@ > import static org.easymock.EasyMock.expect; > import static org.easymock.EasyMock.isA; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.HashLockedDomainService.GadgetReader; > > import java.util.Arrays; > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java > Wed Jul 16 18:28:13 2008 > @@ -20,6 +20,7 @@ > import static org.easymock.EasyMock.eq; > import static org.easymock.EasyMock.expect; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.http.HttpRequest; > import org.apache.shindig.gadgets.http.HttpResponse; > > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java > Wed Jul 16 18:28:13 2008 > @@ -22,10 +22,10 @@ > import static org.easymock.EasyMock.expectLastCall; > import static org.easymock.EasyMock.isA; > > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.common.SecurityTokenDecoder; > import org.apache.shindig.common.testing.FakeGadgetToken; > import org.apache.shindig.common.util.Utf8UrlCoder; > -import org.apache.shindig.gadgets.ContainerConfig; > import org.apache.shindig.gadgets.Gadget; > import org.apache.shindig.gadgets.GadgetContext; > import org.apache.shindig.gadgets.http.HttpRequest; > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/HttpUtilTest.java > Wed Jul 16 18:28:13 2008 > @@ -24,7 +24,7 @@ > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.fail; > > -import org.apache.shindig.gadgets.ContainerConfig; > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.GadgetContext; > > import org.json.JSONException; > > Modified: > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java?rev=677482&r1=677481&r2=677482&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/UrlGeneratorTest.java > Wed Jul 16 18:28:13 2008 > @@ -22,7 +22,7 @@ > import static org.junit.Assert.assertEquals; > import static org.junit.Assert.assertTrue; > > -import org.apache.shindig.gadgets.ContainerConfig; > +import org.apache.shindig.common.ContainerConfig; > import org.apache.shindig.gadgets.Gadget; > import org.apache.shindig.gadgets.GadgetContext; > import org.apache.shindig.gadgets.GadgetFeature; > > >
