[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/deployment ...

[Chris L. <chr...@jb...>]

  User: claprun 
  Date: 06/05/29 12:34:46

  Modified:    portlet/src/main/org/jboss/portal/test/portlet/deployment 
                        UnmarshallerTestCase.java
  Log:
  Extracted URL methods from Tools and WSRPPortletURL to common.util.URLTools (was URL).
  
  Revision  Changes    Path
  1.8       +198 -199  jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UnmarshallerTestCase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/deployment/UnmarshallerTestCase.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- UnmarshallerTestCase.java	4 May 2006 15:30:53 -0000	1.7
  +++ UnmarshallerTestCase.java	29 May 2006 16:34:46 -0000	1.8
  @@ -22,30 +22,29 @@
   package org.jboss.portal.test.portlet.deployment;
   
   import junit.framework.TestCase;
  -
  -import java.net.URL;
  -import java.util.Locale;
  -
  -import org.jboss.portal.common.util.Tools;
  -import org.jboss.portal.common.util.CollectionBuilder;
   import org.jboss.portal.common.transaction.Transactions;
  -import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory;
  +import org.jboss.portal.common.util.CollectionBuilder;
  +import org.jboss.portal.common.util.URLTools;
   import org.jboss.portal.portlet.deployment.JBossApplicationMetaDataFactory;
  +import org.jboss.portal.portlet.deployment.PortletApplicationMetaDataFactory;
  +import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData;
  +import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
   import org.jboss.portal.portlet.impl.jsr168.metadata.PortletApplicationMetaData;
   import org.jboss.portal.portlet.impl.jsr168.metadata.PortletMetaData;
  -import org.jboss.portal.portlet.impl.jsr168.metadata.ParameterMetaData;
   import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityRoleRefMetaData;
   import org.jboss.portal.portlet.impl.jsr168.metadata.UserAttributeMetaData;
  -import org.jboss.portal.portlet.impl.jsr168.metadata.LocalizedValueMetaData;
  +import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
   import org.jboss.portal.portlet.metadata.JBossPortletMetaData;
   import org.jboss.portal.portlet.metadata.PolicyPermissionMetaData;
  -import org.jboss.portal.portlet.metadata.JBossApplicationMetaData;
   import org.jboss.xb.binding.Unmarshaller;
   import org.jboss.xb.binding.UnmarshallerFactory;
   
  +import java.net.URL;
  +import java.util.Locale;
  +
   /**
    * @author <a href="mailto:ju...@jb...">Julien Viet</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class UnmarshallerTestCase extends TestCase
   {
  @@ -53,7 +52,7 @@
      public void testJBossPortletXML() throws Exception
      {
         URL jbossPortletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/jboss-portlet.xml");
  -      assertTrue(Tools.exists(jbossPortletXML));
  +      assertTrue(URLTools.exists(jbossPortletXML));
   
         //
         JBossApplicationMetaDataFactory factory = new JBossApplicationMetaDataFactory();
  @@ -90,7 +89,7 @@
      public void testPortletXML() throws Exception
      {
         URL portletXML = Thread.currentThread().getContextClassLoader().getResource("test/deployment/portlet.xml");
  -      assertTrue(Tools.exists(portletXML));
  +      assertTrue(URLTools.exists(portletXML));
   
         //
   //      URL portletXSD = Thread.currentThread().getContextClassLoader().getResource("portlet-app_1_0.xsd");