From portal-commits at lists.jboss.org Wed Oct 31 18:52:11 2007
Content-Type: multipart/mixed; boundary="===============3627634328276220928=="
MIME-Version: 1.0
From: portal-commits at lists.jboss.org
To: portal-commits at lists.jboss.org
Subject: [portal-commits] JBoss Portal SVN: r8808 - in
 branches/JBoss_Portal_Branch_2_6/wsrp: src/main/org/jboss/portal/test/wsrp
 and 6 other directories.
Date: Wed, 31 Oct 2007 18:52:11 -0400
Message-ID: <E1InMPz-0007ci-Ce@committer01.frg.pub.inap.atl.jboss.com>

--===============3627634328276220928==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

Author: chris.laprun(a)jboss.com
Date: 2007-10-31 18:52:11 -0400 (Wed, 31 Oct 2007)
New Revision: 8808

Modified:
   branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
   branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsr=
p/WSRPProducerBaseTest.java
   branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsr=
p/v1/producer/PortletManagementTestCase.java
   branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsr=
p/v1/producer/RegistrationTestCase.java
   branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsr=
p/v1/producer/V1ProducerBaseTest.java
   branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-prod=
ucer-markup-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-prod=
ucer-portletmanagement-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-prod=
ucer-registration-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-prod=
ucer-sar/META-INF/jboss-service.xml
   branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-prod=
ucer-servicedescription-sar/META-INF/jboss-service.xml
Log:
- Fixed tests to use non-unmarshalled versions of exceptions (this addresse=
s JBPORTAL-1712).
- Removed need to set ServiceFactory for the tests.
- Make tests use WSDL, this could be used to check our expectations against=
 other producers.

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml	2007-10-31 12:29:22 UTC=
 (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml	2007-10-31 22:52:11 UTC=
 (rev 8808)
@@ -382,8 +382,8 @@
    </target>
 =

    <target name=3D"deploy" description=3D"Deploy WSRP" depends=3D"output">
-       <require file=3D"${jboss.deploy.dir}"/>
-      <copy file=3D"./output/lib/portal-wsrp.sar" todir=3D"${jboss.home}/s=
erver/${portal.deploy.dir}" overwrite=3D"true"/>      =

+      <require file=3D"${jboss.deploy.dir}"/>
+      <copy file=3D"./output/lib/portal-wsrp.sar" todir=3D"${jboss.home}/s=
erver/${portal.deploy.dir}" overwrite=3D"true"/>
    </target>
 =

    <target name=3D"undeploy" description=3D"Undeploy WSRP" depends=3D"init=
">

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/t=
est/wsrp/WSRPProducerBaseTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/WSRPProducerBaseTest.java	2007-10-31 12:29:22 UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/WSRPProducerBaseTest.java	2007-10-31 22:52:11 UTC (rev 8808)
@@ -25,6 +25,7 @@
 =

 import org.jboss.portal.wsrp.WSRPProducer;
 import org.jboss.portal.wsrp.services.ServiceFactory;
+import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
 =

 /**
  * @author <a href=3D"mailto:boleslaw.dawidowicz(a)jboss.org">Boleslaw Daw=
idowicz</a>
@@ -36,8 +37,8 @@
    /** . */
    protected WSRPProducer producer;
 =

-   /** . */
-   protected ServiceFactory serviceFactory;
+   private ServiceFactory serviceFactory;
+   private String wsdlURL;
 =

    protected WSRPProducerBaseTest(String name) throws Exception
    {
@@ -56,11 +57,29 @@
 =

    public ServiceFactory getServiceFactory()
    {
+      if (serviceFactory =3D=3D null)
+      {
+         serviceFactory =3D new RemoteSOAPInvokerServiceFactory();
+         try
+         {
+            ((RemoteSOAPInvokerServiceFactory)serviceFactory).setWsdlDefin=
itionURL(wsdlURL);
+         }
+         catch (Exception e)
+         {
+            throw new RuntimeException("Couldn't retrieve WSDL definition!=
", e);
+         }
+      }
+
       return serviceFactory;
    }
 =

-   public void setServiceFactory(ServiceFactory serviceFactory)
+   public String getWsdlURL()
    {
-      this.serviceFactory =3D serviceFactory;
+      return wsdlURL;
    }
+
+   public void setWsdlURL(String wsdlURL)
+   {
+      this.wsdlURL =3D wsdlURL;
+   }
 }

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/t=
est/wsrp/v1/producer/PortletManagementTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/v1/producer/PortletManagementTestCase.java	2007-10-31 12:29:22 UTC (rev =
8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/v1/producer/PortletManagementTestCase.java	2007-10-31 22:52:11 UTC (rev =
8808)
@@ -26,6 +26,7 @@
 import org.jboss.portal.common.junit.ExtendedAssert;
 import org.jboss.portal.wsrp.WSRPConstants;
 import org.jboss.portal.wsrp.WSRPTypeFactory;
+import org.jboss.portal.wsrp.WSRPExceptionFactory;
 import org.jboss.portal.wsrp.core.ClonePortlet;
 import org.jboss.portal.wsrp.core.DestroyFailed;
 import org.jboss.portal.wsrp.core.DestroyPortlets;
@@ -46,6 +47,7 @@
 =

 import javax.xml.soap.SOAPElement;
 import java.util.Arrays;
+import java.rmi.RemoteException;
 =

 /**
  * @author <a href=3D"mailto:chris.laprun(a)jboss.com">Chris Laprun</a>
@@ -197,9 +199,15 @@
          response =3D portletManagementService.setPortletProperties(setPor=
tletProperties);
          ExtendedAssert.fail("Setting properties on Producer-Offered Portl=
et should fail...");
       }
-      catch (InconsistentParametersFault expected)
+      catch (RemoteException e)
       {
+         //expected
+         checkException(e, WSRPExceptionFactory.INCONSISTENT_PARAMETERS);
       }
+      // reactivate check for exception once tests go through WS stack see=
: JBPORTAL-1712
+      // catch (InconsistentParametersFault expected)
+      {
+      }
    }
 =

    private Property[] checkGetPropertiesResponse(PropertyList response, Pr=
operty[] expected)

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/t=
est/wsrp/v1/producer/RegistrationTestCase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/v1/producer/RegistrationTestCase.java	2007-10-31 12:29:22 UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/v1/producer/RegistrationTestCase.java	2007-10-31 22:52:11 UTC (rev 8808)
@@ -84,11 +84,18 @@
          registrationService.register(regData);
          ExtendedAssert.fail("Trying to register with an invalid consumer =
agent String should fail.");
       }
-      catch (OperationFailedFault operationFailedFault)
+      catch (RemoteException e)
       {
          // expected
+         checkException(e, WSRPExceptionFactory.OPERATION_FAILED);
       }
+      // reactivate check for exception once tests go through WS stack see=
: JBPORTAL-1712
+      // catch (OperationFailedFault operationFailedFault)
+      {
+         // expected
+      }
 =

+
       regData.setConsumerAgent(WSRPConstants.CONSUMER_AGENT);
       registrationService.register(regData);
    }

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/t=
est/wsrp/v1/producer/V1ProducerBaseTest.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/v1/producer/V1ProducerBaseTest.java	2007-10-31 12:29:22 UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/ws=
rp/v1/producer/V1ProducerBaseTest.java	2007-10-31 22:52:11 UTC (rev 8808)
@@ -79,15 +79,19 @@
    {
       super.setUp();
 =

-      //
-      serviceDescriptionService =3D (WSRP_v1_ServiceDescription_PortType)s=
erviceFactory.getService(WSRP_v1_ServiceDescription_PortType.class);
-      markupService =3D (WSRP_v1_Markup_PortType)serviceFactory.getService=
(WSRP_v1_Markup_PortType.class);
-      registrationService =3D (WSRP_v1_Registration_PortType)serviceFactor=
y.getService(WSRP_v1_Registration_PortType.class);
-      portletManagementService =3D (WSRP_v1_PortletManagement_PortType)ser=
viceFactory.getService(WSRP_v1_PortletManagement_PortType.class);
+      serviceDescriptionService =3D getService(WSRP_v1_ServiceDescription_=
PortType.class);
+      markupService =3D getService(WSRP_v1_Markup_PortType.class);
+      registrationService =3D getService(WSRP_v1_Registration_PortType.cla=
ss);
+      portletManagementService =3D getService(WSRP_v1_PortletManagement_Po=
rtType.class);
 =

       resetRegistrationInfo();
    }
 =

+   private <T> T getService(Class<T> serviceClass) throws Exception
+   {
+      return (T)getServiceFactory().getService(serviceClass);
+   }
+
    public void tearDown() throws Exception
    {
       resetRegistrationInfo();

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-ws=
rp-producer-markup-sar/META-INF/jboss-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-markup-sar/META-INF/jboss-service.xml	2007-10-31 12:29:22 UTC (rev 88=
07)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-markup-sar/META-INF/jboss-service.xml	2007-10-31 22:52:11 UTC (rev 88=
08)
@@ -29,10 +29,9 @@
       xmbean-dd=3D""
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
+      <attribute name=3D"WsdlURL">http://localhost:8080/test-wsrp-producer=
/MarkupService?wsdl</attribute>
       <depends optional-attribute-name=3D"TestDriverRegistry"
                proxy-type=3D"attribute">portal.test:service=3DTestDriverSe=
rver</depends>
-      <depends optional-attribute-name=3D"ServiceFactory"
-               proxy-type=3D"attribute">portal.wsrp:service=3DCachingServi=
ceFactory</depends>
       <depends optional-attribute-name=3D"Producer" proxy-type=3D"attribut=
e">portal.wsrp:service=3DWSRPProducer</depends>
    </mbean>
    <mbean
@@ -41,10 +40,9 @@
       xmbean-dd=3D""
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
+      <attribute name=3D"WsdlURL">http://localhost:8080/test-wsrp-producer=
/MarkupService?wsdl</attribute>
       <depends optional-attribute-name=3D"TestDriverRegistry"
                proxy-type=3D"attribute">portal.test:service=3DTestDriverSe=
rver</depends>
-      <depends optional-attribute-name=3D"ServiceFactory"
-               proxy-type=3D"attribute">portal.wsrp:service=3DCachingServi=
ceFactory</depends>
       <depends optional-attribute-name=3D"Producer" proxy-type=3D"attribut=
e">portal.wsrp:service=3DWSRPProducer</depends>
    </mbean>
 </server>

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-ws=
rp-producer-portletmanagement-sar/META-INF/jboss-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-portletmanagement-sar/META-INF/jboss-service.xml	2007-10-31 12:29:22 =
UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-portletmanagement-sar/META-INF/jboss-service.xml	2007-10-31 22:52:11 =
UTC (rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=3D""
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
+      <attribute name=3D"WsdlURL">http://localhost:8080/test-wsrp-producer=
/MarkupService?wsdl</attribute>
       <depends optional-attribute-name=3D"TestDriverRegistry"
                proxy-type=3D"attribute">portal.test:service=3DTestDriverSe=
rver</depends>
-      <depends optional-attribute-name=3D"ServiceFactory"
-               proxy-type=3D"attribute">portal.wsrp:service=3DCachingServi=
ceFactory</depends>
       <depends optional-attribute-name=3D"Producer" proxy-type=3D"attribut=
e">portal.wsrp:service=3DWSRPProducer</depends>
    </mbean>
 </server>

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-ws=
rp-producer-registration-sar/META-INF/jboss-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-registration-sar/META-INF/jboss-service.xml	2007-10-31 12:29:22 UTC (=
rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-registration-sar/META-INF/jboss-service.xml	2007-10-31 22:52:11 UTC (=
rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=3D""
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
+      <attribute name=3D"WsdlURL">http://localhost:8080/test-wsrp-producer=
/MarkupService?wsdl</attribute>
       <depends optional-attribute-name=3D"TestDriverRegistry"
                proxy-type=3D"attribute">portal.test:service=3DTestDriverSe=
rver</depends>
-      <depends optional-attribute-name=3D"ServiceFactory"
-               proxy-type=3D"attribute">portal.wsrp:service=3DCachingServi=
ceFactory</depends>
       <depends optional-attribute-name=3D"Producer" proxy-type=3D"attribut=
e">portal.wsrp:service=3DWSRPProducer</depends>
    </mbean>
 </server>

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-ws=
rp-producer-sar/META-INF/jboss-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-sar/META-INF/jboss-service.xml	2007-10-31 12:29:22 UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-sar/META-INF/jboss-service.xml	2007-10-31 22:52:11 UTC (rev 8808)
@@ -31,9 +31,7 @@
       xmbean-dd=3D""
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
-      <depends
-         optional-attribute-name=3D"Agent"
-         proxy-type=3D"attribute">portal.test:service=3DAgent</depends>
+      <depends optional-attribute-name=3D"Agent" proxy-type=3D"attribute">=
portal.test:service=3DAgent</depends>
    </mbean>
 =

    <!-- Webapp registry -->
@@ -53,14 +51,11 @@
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
       <depends
-         optional-attribute-name=3D"Deployer"
-         proxy-type=3D"attribute">portal:deployer=3DPortalWebApp</depends>
+         optional-attribute-name=3D"Deployer" proxy-type=3D"attribute">por=
tal:deployer=3DPortalWebApp</depends>
       <depends
-         optional-attribute-name=3D"WebAppRegistry"
-         proxy-type=3D"attribute">portal:service=3DWebAppRegistry</depends>
+         optional-attribute-name=3D"WebAppRegistry" proxy-type=3D"attribut=
e">portal:service=3DWebAppRegistry</depends>
       <depends
-         optional-attribute-name=3D"Config"
-         proxy-type=3D"attribute">portal:service=3DServerConfig</depends>
+         optional-attribute-name=3D"Config" proxy-type=3D"attribute">porta=
l:service=3DServerConfig</depends>
    </mbean>
 =

    <!-- Portlet container stack -->
@@ -142,11 +137,9 @@
          optional-attribute-name=3D"PortletInvoker"
          proxy-type=3D"attribute">portal:service=3DPortletInvoker,type=3DC=
ontainer</depends>
       <depends
-         optional-attribute-name=3D"PersistenceManager"
-         proxy-type=3D"attribute">portal:service=3DPersistenceManager,type=
=3DProducer</depends>
+         optional-attribute-name=3D"PersistenceManager" proxy-type=3D"attr=
ibute">portal:service=3DPersistenceManager,type=3DProducer</depends>
       <depends
-         optional-attribute-name=3D"StateManagementPolicy"
-         proxy-type=3D"attribute">portal:service=3DStateManagementPolicy,t=
ype=3DProducer</depends>
+         optional-attribute-name=3D"StateManagementPolicy" proxy-type=3D"a=
ttribute">portal:service=3DStateManagementPolicy,type=3DProducer</depends>
       <depends
          optional-attribute-name=3D"StateConverter"
          proxy-type=3D"attribute">portal:service=3DStateConverter,type=3DP=
roducer</depends>
@@ -215,40 +208,4 @@
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
    </mbean>
-
-   <!--  -->
-   <mbean
-      code=3D"org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerService=
Factory"
-      name=3D"portal.wsrp:service=3DServiceFactory"
-      xmbean-dd=3D""
-      xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
-      <xmbean/>
-      <attribute
-         name=3D"ServiceDescriptionURL">http://localhost:8080/test-wsrp-pr=
oducer/ServiceDescriptionService</attribute>
-      <attribute name=3D"MarkupURL">http://localhost:8080/test-wsrp-produc=
er/MarkupService</attribute>
-      <attribute name=3D"RegistrationURL">http://localhost:8080/test-wsrp-=
producer/RegistrationService</attribute>
-      <attribute
-         name=3D"PortletManagementURL">http://localhost:8080/test-wsrp-pro=
ducer/PortletManagementService</attribute>
-      <attribute name=3D"Env">
-         java.naming.factory.initial=3Dorg.jnp.interfaces.NamingContextFac=
tory
-         java.naming.provider.url=3Djnp://localhost:1099
-         java.naming.factory.url.pkgs=3Dorg.jboss.naming.client
-         j2ee.clientName=3Dwsrp-client
-      </attribute>
-      <attribute name=3D"PortJNDIMapping">
-         org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType=3D=
java:comp/env/service/ServiceDescriptionService
-         org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType=3Djava:comp/en=
v/service/MarkupService
-         org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType=3Djava:c=
omp/env/service/RegistrationService
-         org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType=3Dj=
ava:comp/env/service/PortletManagementService
-      </attribute>
-   </mbean>
-   <mbean
-      code=3D"org.jboss.portal.wsrp.services.CachingServiceFactory"
-      name=3D"portal.wsrp:service=3DCachingServiceFactory"
-      xmbean-dd=3D""
-      xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
-      <xmbean/>
-      <depends optional-attribute-name=3D"Delegate" proxy-type=3D"attribut=
e">portal.wsrp:service=3DServiceFactory</depends>
-   </mbean>
-
 </server>

Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-ws=
rp-producer-servicedescription-sar/META-INF/jboss-service.xml
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-servicedescription-sar/META-INF/jboss-service.xml	2007-10-31 12:29:22=
 UTC (rev 8807)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/tests/test-wsrp-pro=
ducer-servicedescription-sar/META-INF/jboss-service.xml	2007-10-31 22:52:11=
 UTC (rev 8808)
@@ -29,10 +29,9 @@
       xmbean-dd=3D""
       xmbean-code=3D"org.jboss.portal.jems.as.system.JBossServiceModelMBea=
n">
       <xmbean/>
+      <attribute name=3D"WsdlURL">http://localhost:8080/test-wsrp-producer=
/MarkupService?wsdl</attribute>
       <depends optional-attribute-name=3D"TestDriverRegistry"
                proxy-type=3D"attribute">portal.test:service=3DTestDriverSe=
rver</depends>
-      <depends optional-attribute-name=3D"ServiceFactory"
-               proxy-type=3D"attribute">portal.wsrp:service=3DCachingServi=
ceFactory</depends>
       <depends optional-attribute-name=3D"Producer" proxy-type=3D"attribut=
e">portal.wsrp:service=3DWSRPProducer</depends>
    </mbean>
 </server>


--===============3627634328276220928==--