Author: chris.laprun(a)jboss.com
Date: 2007-10-01 21:33:08 -0400 (Mon, 01 Oct 2007)
New Revision: 8507
Removed:
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
Log:
- Renamed ProducerRegistrationRequirements.requiresRegistration to isRegistrationRequired
to follow Java Beans conventions.
- Renamed ProducerRegistrationRequirements.fullServiceDescriptionRequiresRegistration to
isRegistrationRequiredForFullDescription to follow Java Beans conventions.
- Removed unused classes.
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -82,8 +82,8 @@
RegistrationPropertyValidator propertyValidator =
((DefaultRegistrationPolicy)policy).getValidator();
assertNotNull(propertyValidator);
assertTrue(propertyValidator instanceof DefaultRegistrationPropertyValidator);
- assertTrue(requirements.requiresRegistration());
- assertTrue(requirements.fullServiceDescriptionRequiresRegistration());
+ assertTrue(requirements.isRegistrationRequired());
+ assertTrue(requirements.isRegistrationRequiredForFullDescription());
Map properties = requirements.getRegistrationProperties();
assertNotNull(properties);
assertEquals(2, properties.size());
@@ -97,8 +97,8 @@
ProducerConfiguration producerConfiguration =
getProducerConfiguration("minimal-registration.xml");
ProducerRegistrationRequirements requirements =
producerConfiguration.getRegistrationRequirements();
assertNotNull(requirements);
- assertTrue(requirements.requiresRegistration());
- assertTrue(!requirements.fullServiceDescriptionRequiresRegistration());
+ assertTrue(requirements.isRegistrationRequired());
+ assertTrue(!requirements.isRegistrationRequiredForFullDescription());
Map properties = requirements.getRegistrationProperties();
assertNotNull(properties);
assertTrue(properties.isEmpty());
@@ -110,8 +110,8 @@
ProducerConfiguration producerConfiguration =
getProducerConfiguration("minimal.xml");
ProducerRegistrationRequirements requirements =
producerConfiguration.getRegistrationRequirements();
assertNotNull(requirements);
- assertFalse(requirements.requiresRegistration());
- assertFalse(requirements.fullServiceDescriptionRequiresRegistration());
+ assertFalse(requirements.isRegistrationRequired());
+ assertFalse(requirements.isRegistrationRequiredForFullDescription());
assertTrue(requirements.getRegistrationProperties().isEmpty());
assertNull(requirements.getPolicy());
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -87,21 +87,21 @@
notifyCalled = false;
}
- public boolean requiresRegistration()
+ public boolean isRegistrationRequired()
{
return false;
}
- public void setRequiresRegistration(boolean requiresRegistration)
+ public void setRegistrationRequired(boolean requiresRegistration)
{
}
- public boolean fullServiceDescriptionRequiresRegistration()
+ public boolean isRegistrationRequiredForFullDescription()
{
return false;
}
- public void setFullServiceDescriptionRequiresRegistration(boolean
fullServiceDescriptionRequiresRegistration)
+ public void setRegistrationRequiredForFullDescription(boolean
fullServiceDescriptionRequiresRegistration)
{
}
@@ -171,5 +171,9 @@
{
return null;
}
+
+ public void reloadPolicyFrom(String policyClassName, String validatorClassName)
+ {
+ }
}
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ReleaseSessionTestCase.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -151,7 +151,7 @@
}
- if (producer.getProducerRegistrationRequirements().requiresRegistration())
+ if (producer.getProducerRegistrationRequirements().isRegistrationRequired())
{
message.append(" | with registration required.");
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/ServiceDescriptionTestCase.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -55,7 +55,7 @@
public void testGetServiceDescriptionNotRequiringRegistration() throws Throwable
{
- producer.getProducerRegistrationRequirements().setRequiresRegistration(false);
+ producer.getProducerRegistrationRequirements().setRegistrationRequired(false);
GetServiceDescription gs = getNoRegistrationServiceDescriptionRequest();
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/v1/producer/V1ProducerBaseTest.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -162,8 +162,8 @@
protected RegistrationPropertyDescription configureRegistrationSettings(boolean
provideUnregisteredFullDescription)
{
// define expected registration infos
- producer.getProducerRegistrationRequirements().setRequiresRegistration(true);
-
producer.getProducerRegistrationRequirements().setFullServiceDescriptionRequiresRegistration(provideUnregisteredFullDescription);
+ producer.getProducerRegistrationRequirements().setRegistrationRequired(true);
+
producer.getProducerRegistrationRequirements().setRegistrationRequiredForFullDescription(provideUnregisteredFullDescription);
// fix-me:
http://jira.jboss.com/jira/browse/JBPORTAL-821
RegistrationPropertyDescription regProp = new
RegistrationPropertyDescription("regProp",
@@ -176,7 +176,7 @@
protected void resetRegistrationInfo()
{
- producer.getProducerRegistrationRequirements().setRequiresRegistration(false);
+ producer.getProducerRegistrationRequirements().setRegistrationRequired(false);
producer.getProducerRegistrationRequirements().clearRegistrationProperties();
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2007-10-02
00:01:43 UTC (rev 8506)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/RegistrationHandler.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -227,7 +227,7 @@
{
if (reg == null)
{
- if (producer.getProducerRegistrationRequirements().requiresRegistration())
+ if (producer.getProducerRegistrationRequirements().isRegistrationRequired())
{
log.debug("Registration is required yet no RegistrationContext was
provided: registration invalid!");
return false;
@@ -257,7 +257,7 @@
*/
Registration getRegistrationFrom(RegistrationContext registrationContext)
{
- if (producer.getProducerRegistrationRequirements().requiresRegistration())
+ if (producer.getProducerRegistrationRequirements().isRegistrationRequired())
{
if (registrationContext == null)
{
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -83,11 +83,11 @@
ProducerRegistrationRequirements requirements =
producer.getProducerRegistrationRequirements();
PortletDescription[] offeredPortlets = null;
- ServiceDescription serviceDescription =
WSRPTypeFactory.createServiceDescription(requirements.requiresRegistration());
+ ServiceDescription serviceDescription =
WSRPTypeFactory.createServiceDescription(requirements.isRegistrationRequired());
serviceDescription.setRequiresInitCookie(BEA_8_CONSUMER_FIX);
serviceDescription.setLocales(producer.getSupportedLocales());
- if (!requirements.requiresRegistration())
+ if (!requirements.isRegistrationRequired())
{
offeredPortlets = getPortletDescriptions(gs.getDesiredLocales(), null);
}
@@ -97,7 +97,7 @@
{
log.debug("Unregistered consumer while registration is required. Sending
registration information.");
- if (requirements.fullServiceDescriptionRequiresRegistration())
+ if (requirements.isRegistrationRequiredForFullDescription())
{
log.debug("Sending offered portlets description despite not being
registered, per Producer configuration.");
offeredPortlets = getPortletDescriptions(gs.getDesiredLocales(), null);
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2007-10-02
00:01:43 UTC (rev 8506)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/WSRPProducerImpl.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -273,7 +273,7 @@
super.startService();
producerConfiguration = configurationService.getConfiguration();
ProducerRegistrationRequirements registrationRequirements =
getProducerRegistrationRequirements();
- if (registrationRequirements.requiresRegistration())
+ if (registrationRequirements.isRegistrationRequired())
{
registrationManager.setPolicy(registrationRequirements.getPolicy());
registrationRequirements.addRegistrationPropertyChangeListeners(registrationManager);
@@ -283,7 +283,7 @@
protected void stopService() throws Exception
{
ProducerRegistrationRequirements registrationRequirements =
getProducerRegistrationRequirements();
- if (registrationRequirements.requiresRegistration())
+ if (registrationRequirements.isRegistrationRequired())
{
registrationRequirements.removeRegistrationPropertyChangeListener(registrationManager);
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerConfigurationFactory.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -80,15 +80,15 @@
}
ProducerRegistrationRequirements registrationRequirements = new
ProducerRegistrationRequirementsImpl();
- registrationRequirements.setRequiresRegistration(true);
+ registrationRequirements.setRegistrationRequired(true);
String descRequiresRegistration =
attrs.getValue("fullServiceDescriptionRequiresRegistration");
if ("true".equals(descRequiresRegistration))
{
-
registrationRequirements.setFullServiceDescriptionRequiresRegistration(true);
+ registrationRequirements.setRegistrationRequiredForFullDescription(true);
}
else if (descRequiresRegistration == null ||
"false".equals(descRequiresRegistration))
{
-
registrationRequirements.setFullServiceDescriptionRequiresRegistration(false);
+ registrationRequirements.setRegistrationRequiredForFullDescription(false);
}
else
{
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -37,14 +37,17 @@
*/
public interface ProducerRegistrationRequirements
{
- boolean requiresRegistration();
+ String DEFAULT_POLICY_CLASS_NAME =
"org.jboss.portal.registration.policies.DefaultRegistrationPolicy";
+ String DEFAULT_VALIDATOR_CLASS_NAME =
"org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator";
- void setRequiresRegistration(boolean requiresRegistration);
+ boolean isRegistrationRequired();
- boolean fullServiceDescriptionRequiresRegistration();
+ void setRegistrationRequired(boolean requiresRegistration);
- void setFullServiceDescriptionRequiresRegistration(boolean
fullServiceDescriptionRequiresRegistration);
+ boolean isRegistrationRequiredForFullDescription();
+ void setRegistrationRequiredForFullDescription(boolean
fullServiceDescriptionRequiresRegistration);
+
Map getRegistrationProperties();
void addRegistrationProperty(RegistrationPropertyDescription propertyDescription);
@@ -74,4 +77,6 @@
void setPolicy(RegistrationPolicy policy);
RegistrationPolicy getPolicy();
+
+ void reloadPolicyFrom(String policyClassName, String validatorClassName);
}
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -59,8 +59,6 @@
/** property name (QName) -> PropertyDescription */
private Map registrationProperties;
- public final static String DEFAULT_POLICY_CLASS_NAME =
"org.jboss.portal.registration.policies.DefaultRegistrationPolicy";
- public final static String DEFAULT_VALIDATOR_CLASS_NAME =
"org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator";
public ProducerRegistrationRequirementsImpl(boolean requiresMarshalling, boolean
requiresRegistration, boolean fullServiceDescriptionRequiresRegistration)
{
@@ -74,22 +72,22 @@
registrationProperties = new HashMap(7);
}
- public boolean requiresRegistration()
+ public boolean isRegistrationRequired()
{
return requiresRegistration;
}
- public void setRequiresRegistration(boolean requiresRegistration)
+ public void setRegistrationRequired(boolean requiresRegistration)
{
this.requiresRegistration = requiresRegistration;
}
- public boolean fullServiceDescriptionRequiresRegistration()
+ public boolean isRegistrationRequiredForFullDescription()
{
return fullServiceDescriptionRequiresRegistration;
}
- public void setFullServiceDescriptionRequiresRegistration(boolean
fullServiceDescriptionRequiresRegistration)
+ public void setRegistrationRequiredForFullDescription(boolean
fullServiceDescriptionRequiresRegistration)
{
this.fullServiceDescriptionRequiresRegistration =
fullServiceDescriptionRequiresRegistration;
}
@@ -194,6 +192,10 @@
if (policy != null)
{
policyClassName = policy.getClass().getName();
+ if (DEFAULT_POLICY_CLASS_NAME.equals(policyClassName))
+ {
+ validatorClassName =
((DefaultRegistrationPolicy)policy).getValidator().getClass().getName();
+ }
}
}
@@ -202,78 +204,84 @@
{
if (policy == null && requiresRegistration)
{
- if (policyClassName != null)
+ reloadPolicyFrom(policyClassName, validatorClassName);
+ }
+
+ return policy;
+ }
+
+ public void reloadPolicyFrom(String policyClassName, String validatorClassName)
+ {
+ if (policyClassName != null)
+ {
+ log.debug("Using registration policy: " + policyClassName);
+ ClassLoader loader = Thread.currentThread().getContextClassLoader();
+ try
{
- log.debug("Using registration policy: " + policyClassName);
+ Class policyClass = loader.loadClass(policyClassName);
+ Class expectedInterface =
loader.loadClass("org.jboss.portal.registration.RegistrationPolicy");
+ if (!expectedInterface.isAssignableFrom(policyClass))
+ {
+ throw new IllegalArgumentException("Policy class does not implement
RegistrationPolicy!");
+ }
+ RegistrationPolicy policy = (RegistrationPolicy)policyClass.newInstance();
+ setPolicy(policy);
+ }
+ catch (ClassNotFoundException e)
+ {
+ IllegalArgumentException iae = new
IllegalArgumentException("Couldn't find policy class " + policyClassName +
".");
+ iae.initCause(e);
+ throw iae;
+ }
+ catch (Exception e)
+ {
+ IllegalArgumentException iae = new
IllegalArgumentException("Couldn't instantiate policy class.");
+ iae.initCause(e);
+ throw iae;
+ }
+ }
+ else
+ {
+ log.debug("Using default registration policy: " +
DEFAULT_POLICY_CLASS_NAME);
+ RegistrationPropertyValidator validator;
+ if (validatorClassName != null)
+ {
+ log.debug("Using registration property validator: " +
validatorClassName);
ClassLoader loader = Thread.currentThread().getContextClassLoader();
try
{
- Class policyClass = loader.loadClass(policyClassName);
- Class expectedInterface =
loader.loadClass("org.jboss.portal.registration.RegistrationPolicy");
- if (!expectedInterface.isAssignableFrom(policyClass))
+ Class validatorClass = loader.loadClass(validatorClassName);
+ Class expectedInterface =
loader.loadClass("org.jboss.portal.registration.policies.RegistrationPropertyValidator");
+ if (!expectedInterface.isAssignableFrom(validatorClass))
{
- throw new IllegalArgumentException("Policy class does not
implement RegistrationPolicy!");
+ throw new IllegalArgumentException("Validator class does not
implement RegistrationPropertyValidator!");
}
- RegistrationPolicy policy =
(RegistrationPolicy)policyClass.newInstance();
- setPolicy(policy);
+ validator = (RegistrationPropertyValidator)validatorClass.newInstance();
}
catch (ClassNotFoundException e)
{
- IllegalArgumentException iae = new
IllegalArgumentException("Couldn't find policy class " + policyClassName +
".");
+ IllegalArgumentException iae = new
IllegalArgumentException("Couldn't find validator class " +
validatorClassName + ".");
iae.initCause(e);
throw iae;
}
catch (Exception e)
{
- IllegalArgumentException iae = new
IllegalArgumentException("Couldn't instantiate policy class.");
+ IllegalArgumentException iae = new
IllegalArgumentException("Couldn't instantiate validator class.");
iae.initCause(e);
throw iae;
}
}
else
{
- log.debug("Using default registration policy: " +
DEFAULT_POLICY_CLASS_NAME);
- RegistrationPropertyValidator validator;
- if (validatorClassName != null)
- {
- log.debug("Using registration property validator: " +
validatorClassName);
- ClassLoader loader = Thread.currentThread().getContextClassLoader();
- try
- {
- Class validatorClass = loader.loadClass(validatorClassName);
- Class expectedInterface =
loader.loadClass("org.jboss.portal.registration.policies.RegistrationPropertyValidator");
- if (!expectedInterface.isAssignableFrom(validatorClass))
- {
- throw new IllegalArgumentException("Validator class does not
implement RegistrationPropertyValidator!");
- }
- validator =
(RegistrationPropertyValidator)validatorClass.newInstance();
- }
- catch (ClassNotFoundException e)
- {
- IllegalArgumentException iae = new
IllegalArgumentException("Couldn't find validator class " +
validatorClassName + ".");
- iae.initCause(e);
- throw iae;
- }
- catch (Exception e)
- {
- IllegalArgumentException iae = new
IllegalArgumentException("Couldn't instantiate validator class.");
- iae.initCause(e);
- throw iae;
- }
- }
- else
- {
- log.debug("Using default registration property validator: " +
DEFAULT_VALIDATOR_CLASS_NAME);
- validator = new DefaultRegistrationPropertyValidator();
- }
+ log.debug("Using default registration property validator: " +
DEFAULT_VALIDATOR_CLASS_NAME);
+ validator = new DefaultRegistrationPropertyValidator();
+ }
- policy = new DefaultRegistrationPolicy();
- ((DefaultRegistrationPolicy)policy).setValidator(validator);
- }
+ DefaultRegistrationPolicy policy = new DefaultRegistrationPolicy();
+ policy.setValidator(validator);
+ setPolicy(policy);
}
-
- return policy;
}
Deleted: trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/RMIInvokerServiceFactory.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -1,91 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-
-package org.jboss.portal.wsrp.services;
-
-import org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType;
-import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType;
-import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
-import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType;
-
-import java.util.Properties;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
- * @version $Revision$
- * @since 2.4
- */
-public class RMIInvokerServiceFactory extends AbstractJNDIServiceFactory
-{
- public RMIInvokerServiceFactory()
- {
- portJNDIMapping = new Properties();
- portJNDIMapping.put(WSRP_v1_ServiceDescription_PortType.class.getName(),
"wsrp/invoker/ServiceDescriptionService");
- portJNDIMapping.put(WSRP_v1_Markup_PortType.class.getName(),
"wsrp/invoker/MarkupService");
- portJNDIMapping.put(WSRP_v1_Registration_PortType.class.getName(),
"wsrp/invoker/RegistrationService");
- portJNDIMapping.put(WSRP_v1_PortletManagement_PortType.class.getName(),
"wsrp/invoker/PortletManagementService");
- }
-
-
- public boolean isAvailable()
- {
- return true;
- }
-
-
- public String getServiceDescriptionURL()
- {
- return null;
- }
-
- public String getMarkupURL()
- {
- return null;
- }
-
- public String getRegistrationURL()
- {
- return null;
- }
-
- public String getPortletManagementURL()
- {
- return null;
- }
-
- public void setServiceDescriptionURL(String serviceDescriptionURL)
- {
- }
-
- public void setMarkupURL(String markupURL)
- {
- }
-
- public void setRegistrationURL(String registrationURL)
- {
- }
-
- public void setPortletManagementURL(String portletManagementURL)
- {
- }
-}
Deleted:
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java
===================================================================
---
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java 2007-10-02
00:01:43 UTC (rev 8506)
+++
trunk/wsrp/src/main/org/jboss/portal/wsrp/services/SOAPInvokerServiceFactory.java 2007-10-02
01:33:08 UTC (rev 8507)
@@ -1,132 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site:
http://www.fsf.org. *
- ******************************************************************************/
-
-package org.jboss.portal.wsrp.services;
-
-import org.jboss.portal.common.util.ParameterValidation;
-import org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType;
-import org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType;
-import org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType;
-import org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType;
-
-import javax.xml.rpc.Service;
-import javax.xml.rpc.Stub;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris
Laprun</a>
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision$
- * @since 2.4
- */
-public class SOAPInvokerServiceFactory extends AbstractSOAPServiceFactory
-{
-
- /** . */
- private static final Map PORT_NAMES = new HashMap();
-
- static
- {
- PORT_NAMES.put(WSRP_v1_ServiceDescription_PortType.class,
"/ServiceDescriptionService");
- PORT_NAMES.put(WSRP_v1_Markup_PortType.class, "/MarkupService");
- PORT_NAMES.put(WSRP_v1_Registration_PortType.class,
"/RegistrationService");
- PORT_NAMES.put(WSRP_v1_PortletManagement_PortType.class,
"/PortletManagementService");
- }
-
- /** . */
- private String endpointURL;
-
- public String getEndpointURL()
- {
- return endpointURL;
- }
-
- public void setEndpointURL(String endpointURL)
- {
- ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(endpointURL,
"Mandatory endpoint URL", null);
- this.endpointURL = endpointURL;
- }
-
- /** If retrieved object is of javax.xml.rpc.Service class, we're using the WS
stack and we need to get the port. */
- protected Object getStubFromService(Class serviceClass, Service service) throws
Exception
- {
- log.debug("Unwrapping service " + service + " for class " +
serviceClass);
- Object stub = service.getPort(serviceClass);
-
- //
- if (endpointURL != null)
- {
- String portAddress = endpointURL + PORT_NAMES.get(serviceClass);
- log.debug("Setting the end point to: " + portAddress);
- ((Stub)stub)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY, portAddress);
- }
- return stub;
- }
-
-
- public boolean isAvailable()
- {
- return endpointURL != null;
- }
-
- public String getServiceDescriptionURL()
- {
- return endpointURL + PORT_NAMES.get(WSRP_v1_ServiceDescription_PortType.class);
- }
-
- public String getMarkupURL()
- {
- return endpointURL + PORT_NAMES.get(WSRP_v1_Markup_PortType.class);
- }
-
- public String getRegistrationURL()
- {
- return endpointURL + PORT_NAMES.get(WSRP_v1_Registration_PortType.class);
- }
-
- public String getPortletManagementURL()
- {
- return endpointURL + PORT_NAMES.get(WSRP_v1_PortletManagement_PortType.class);
- }
-
- public void setServiceDescriptionURL(String serviceDescriptionURL)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setMarkupURL(String markupURL)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setRegistrationURL(String registrationURL)
- {
- throw new UnsupportedOperationException();
- }
-
- public void setPortletManagementURL(String portletManagementURL)
- {
- throw new UnsupportedOperationException();
- }
-}