April 2009 - portal-commits - Jboss List Archives

JBoss Portal SVN: r13237 - in branches/JBoss_Portal_Branch_2_7_AS5: jems and 12 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-04-20 13:44:54 -0400 (Mon, 20 Apr 2009) New Revision: 13237 Added: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerDeploymentImpl.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-dependency.xml branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-dependency.xml Removed: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentMBean.java Modified: branches/JBoss_Portal_Branch_2_7_AS5/build/build-thirdparty.xml branches/JBoss_Portal_Branch_2_7_AS5/build/build.xml branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml branches/JBoss_Portal_Branch_2_7_AS5/server/src/resources/portal-server-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7_AS5/testsuite/imports/server-config.xml branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml Log: Update wsrp to use the portal deployers. Modified: branches/JBoss_Portal_Branch_2_7_AS5/build/build-thirdparty.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/build/build-thirdparty.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/build/build-thirdparty.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -112,11 +112,12 @@ <componentref name="jboss/jboss-man" version="2.0.0.Beta12"/> <componentref name="jboss/jboss-mdr" version="2.0.0.Beta15"/>  <componentref name="jboss/jboss-metadata" version="1.0.0-SNAPSHOT"/> + <componentref name="jboss/jboss-reflect" version="2.0.2.GA"/> <componentref name="jboss/jbossretro-rt" version="1.0.5.GA"/> <componentref name="jboss/jbossws" version="2.0.1.SP2"/> <componentref name="jboss/jbossxb" version="2.0.0.GA"/> <componentref name="jboss/jbosssx" version="2.0.1.GA"/>  - <componentref name="jboss/jnp-client" version="5.0.0.Beta4"/> + <componentref name="jboss/jnpserver" version="5.0.1.GA"/> <componentref name="jboss/microcontainer" version="2.0.0.Beta12"/> <componentref name="jboss/remoting" version="2.2.2.SP10-brew"/> <componentref name="jboss/serialization" version="1.0.3.GA-brew"/> Modified: branches/JBoss_Portal_Branch_2_7_AS5/build/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/build/build.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/build/build.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -303,7 +303,7 @@  <copy file="../widget/output/lib/portal-widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> <copy file="../widget/output/lib/portal-widget-netvibes.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - + <copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> </target> <target name="undeploy-all" @@ -325,7 +325,7 @@  <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-widget.war"/> <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-widget-netvibes.war"/> - + <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/> </target> <target name="exploded-deploy" Modified: branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/jems/build.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -98,10 +98,11 @@ <path refid="jboss.microcontainer.classpath"/> <path refid="jboss/common.core.classpath"/> <path refid="jboss/common.logging.spi.classpath"/> - <path refid="jboss/jnp.client.classpath"/> + <path refid="jboss.jnpserver.classpath"/> <path refid="jbossas/core.libs.classpath"/> <path refid="hibernate.hibernate.classpath"/> <path refid="apache.log4j.classpath"/> + <path refid="sun.jaxb.classpath"/> </path>  Modified: branches/JBoss_Portal_Branch_2_7_AS5/server/src/resources/portal-server-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/server/src/resources/portal-server-sar/META-INF/jboss-service.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/server/src/resources/portal-server-sar/META-INF/jboss-service.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -54,15 +54,15 @@ </mbean>  - <mbean +  - <mbean +  - <mbean + -</server> \ No newline at end of file +</server> Modified: branches/JBoss_Portal_Branch_2_7_AS5/testsuite/imports/server-config.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/testsuite/imports/server-config.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/testsuite/imports/server-config.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -94,7 +94,7 @@ <server:config javaHome="${env.JAVA_HOME}" jbossHome="${jboss.dist}" udpGroup="${udpGroup}"> <server name="default" host="${node0}"> <jvmarg value="${jpda.cmdline}"/> - <jvmarg value="-Xmx128m"/> + <jvmarg value="-Xmx256m"/> <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> </server> </server:config> Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/.classpath 2009-04-20 17:44:54 UTC (rev 13237) @@ -38,5 +38,8 @@ <classpathentry kind="lib" path="/thirdparty/jboss/common-core/lib/jboss-common-core.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/jbossws/lib/jboss-jaxrpc.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-kernel.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/deployer/lib/portal-deployer-wsrp-lib.jar" sourcepath="/module-deployer"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/metadata/lib/portal-metadata-wsrp-lib.jar"/> + <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/deployer/lib/portal-deployer-lib.jar"/> <classpathentry kind="output" path="output/classes"/> </classpath> Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/build.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -96,6 +96,8 @@ <property name="jboss.deploy.dir" value="${jboss.home}/server/${portal.deploy.dir}"/>  <property name="jboss.deploy.lib.dir" value="${jboss.deploy.dir}/../lib"/> + <property name="jboss.common.lib.dir" value="${jboss.home}/common/lib"/> + <property name="jboss.lib.dir" value="${jboss.home}/lib"/>  &libraries; &libraries-as5; @@ -106,9 +108,12 @@ <path refid="jboss.portal/modules/common.classpath"/> <path refid="jboss.portal/modules/portlet.classpath"/> <path refid="jboss.portal/modules/test.classpath"/> + <path refid="jboss.portal/modules/metadata.classpath"/> + <path refid="jboss.portal/modules/deployer.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="junit.junit.classpath"/> <path refid="sun.servlet.classpath"/> + <path refid="sun.jaxb.classpath"/> <path refid="glassfish.jaf.classpath"/> <pathelement path="${jbossas/core.libs.lib}/jboss-common-core.jar"/> <pathelement path="${jbossas/core.libs.lib}/jboss-jmx.jar"/> @@ -141,13 +146,18 @@ <path refid="jboss.portal/modules/portlet.classpath"/> <pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/> <path refid="jboss.microcontainer.classpath"/> - <pathelement path="${jboss.deploy.lib.dir}/log4j.jar"/> + <pathelement path="${jboss.common.lib.dir}/log4j.jar"/> <path refid="apache.xerces.classpath"/> - <pathelement path="${jboss.deploy.lib.dir}/jnpserver.jar"/> - <pathelement path="${jboss.deploy.lib.dir}/jmx-adaptor-plugin.jar"/> - <pathelement path="${jboss.deploy.lib.dir}/jboss.jar"/> - <pathelement path="${jboss.deploy.lib.dir}/jbosssx.jar"/> - <pathelement path="${jboss.deploy.lib.dir}/jboss-transaction.jar"/> + <pathelement path="${jboss.common.lib.dir}/jnpserver.jar"/> + <pathelement path="${jboss.common.lib.dir}/jmx-adaptor-plugin.jar"/> + <pathelement path="${jboss.common.lib.dir}/jboss.jar"/> + <pathelement path="${jboss.common.lib.dir}/jbosssx.jar"/> + <pathelement path="${jboss.lib.dir}/jboss-reflect.jar"/> + <pathelement path="${jboss.common.lib.dir}/jbossws-common.jar"/> + <pathelement path="${jboss.common.lib.dir}/jboss-integration.jar"/> + <pathelement path="${jboss.common.lib.dir}/jbossjta.jar"/> + <pathelement path="${jboss.common.lib.dir}/jbossts-common.jar"/> + <pathelement path="${jboss.common.lib.dir}/jboss-jca.jar"/> <path refid="jboss.serialization.classpath"/> <path refid="jboss.remoting.classpath"/> <path refid="jboss.portal-registration.classpath"/> @@ -544,8 +554,8 @@ <fileset dir="${jboss.portal-server.root}/lib" includes="portal-server.sar"/> </copy> - <mkdir dir="${build.resources.test}/test-wsrp-producer-sar/lib"/> - <copy todir="${build.resources.test}/test-wsrp-producer-sar/lib" overwrite="true"> +  + <copy todir="${build.resources.test}/test-wsrp-producer-sar" overwrite="true"> <fileset dir="${build.lib}" includes="portal-wsrp-lib.jar"/> <fileset dir="${build.lib.test}" includes="test-wsrp-producer-lib.jar"/> <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-portal-lib.jar"/> @@ -819,7 +829,7 @@ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8787"/>--> <sysproperty key="test.root" value="${build.lib}/tests"/> <sysproperty key="jboss.aop.path" value="${build.resources}/portal-wsrp-sar/wsrp-aop.xml"/> - <sysproperty key="jboss.aop.class.path" value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/> +  </x-sysproperty> <x-test> <test todir="${test.reports}" @@ -860,8 +870,10 @@ <path refid="asm.asm.classpath"/> <path refid="antlr.antlr.classpath"/> - <pathelement path="${jboss.deploy.lib.dir}/jboss-jca.jar"/> - <pathelement path="${jboss.deploy.lib.dir}/jboss-common-jdbc-wrapper.jar"/> + <pathelement path="${jboss.common.lib.dir}/jboss-jca.jar"/> + <pathelement path="${jboss.common.lib.dir}/jboss-common-jdbc-wrapper.jar"/> + <pathelement path="${jboss.lib.dir}/jboss-logging-log4j.jar"/> + <pathelement path="${jboss.lib.dir}/jboss-mdr.jar"/>  <pathelement path="${jbossas/core.libs.lib}/jboss-local-jdbc.jar"/> Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -22,7 +22,16 @@ ******************************************************************************/ package org.jboss.portal.test.wsrp.deployment; +import java.net.URL; +import java.util.ArrayList; +import java.util.Collection; +import java.util.List; + import junit.framework.TestCase; + +import org.jboss.portal.deployer.portal.PortalUnmarshallerFactory; +import org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData; +import org.jboss.portal.metadata.wsrp.consumer.WSRPProducerMetaData; import org.jboss.portal.test.wsrp.framework.support.MockConsumerRegistry; import org.jboss.portal.wsrp.WSRPConstants; import org.jboss.portal.wsrp.WSRPConsumer; @@ -31,16 +40,9 @@ import org.jboss.portal.wsrp.consumer.RegistrationInfo; import org.jboss.portal.wsrp.core.Property; import org.jboss.portal.wsrp.core.RegistrationData; -import org.jboss.portal.wsrp.deployment.WSRPDeployment; -import org.jboss.portal.wsrp.deployment.WSRPDeploymentFactory; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; +import org.jboss.portal.wsrp.deployment.WSRPConsumerDeploymentImpl; +import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver; -import java.net.URL; -import java.util.Collection; -import java.util.List; - /** * @author <a href="mailto:julien@jboss.org">Julien Viet</a> * @version $Revision$ @@ -52,13 +54,18 @@ { URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("test-wsrp.xml"); assertNotNull(wsrpXMLLocation); - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); MockConsumerRegistry registry = new MockConsumerRegistry(); - ObjectModelFactory factory = new WSRPDeploymentFactory(registry); - Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null); - assertNotNull(o); - assertTrue(o instanceof WSRPDeployment); + + WSRPConsumerDeploymentImpl wsrpDeploymentImpl = new WSRPConsumerDeploymentImpl(); + wsrpDeploymentImpl.setConsumerRegistry(registry); + + DefaultSchemaResolver resolver = new DefaultSchemaResolver(); + resolver.addClassBindingForLocation("deployments", ConsumerDeploymentsMetaData.class); + ConsumerDeploymentsMetaData deployments = (ConsumerDeploymentsMetaData) PortalUnmarshallerFactory.getInstance().getUnmarshaller().unmarshal( + wsrpXMLLocation.openStream(), resolver); + wsrpDeploymentImpl.deployConsumer(deployments); + Collection consumers = registry.getConfiguredConsumers(); assertNotNull(consumers); assertEquals(6, consumers.size()); @@ -69,9 +76,8 @@ assertNotNull(registry.getConsumer("inDB2")); assertNotNull(registry.getConsumer("unavailable")); - // deployment should only contains the consumers with available service factories - WSRPDeployment deployment = (WSRPDeployment)o; - List services = deployment.getConsumers(); + // deployment should only contains the consumers with available service factories + List<WSRPConsumer> services = registry.getActiveConsumers(); assertNotNull(services); assertEquals(4, services.size()); Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockConsumerRegistry.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -44,6 +44,7 @@ public class MockConsumerRegistry implements ConsumerRegistry { private Map consumers = new HashMap(3); + private List activeConsumers = new ArrayList(); public static final String MOCK_SERVICE_DESCRIPTION = "mock-service-description"; public static final String MOCK_MARKUP = "mock-markup"; public static final String CONSUMER1 = "inDB"; @@ -90,7 +91,7 @@ public void activateConsumerWith(String id) throws ConsumerException { - // do nothing + activeConsumers.add(consumers.get(id)); } public void updateProducerInfo(ProducerInfo producerInfo) @@ -124,4 +125,9 @@ info.setMarkupURL(MOCK_MARKUP); consumers.put(CONSUMER2, consumer); } + + public List getActiveConsumers() + { + return activeConsumers; + } } Added: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerDeploymentImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerDeploymentImpl.java (rev 0) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPConsumerDeploymentImpl.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -0,0 +1,246 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.deployment; + +import org.jboss.logging.Logger; +import org.jboss.portal.common.util.ParameterValidation; +import org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData; +import org.jboss.portal.metadata.wsrp.consumer.EndpointConfigMetaData; +import org.jboss.portal.metadata.wsrp.consumer.PropertyMetaData; +import org.jboss.portal.metadata.wsrp.consumer.RegistrationDataMetaData; +import org.jboss.portal.metadata.wsrp.consumer.WSRPProducerMetaData; +import org.jboss.portal.wsrp.WSRPConsumer; +import org.jboss.portal.wsrp.consumer.ConsumerRegistry; +import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo; +import org.jboss.portal.wsrp.consumer.ProducerInfo; +import org.jboss.portal.wsrp.consumer.RegistrationInfo; + + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class WSRPConsumerDeploymentImpl implements org.jboss.portal.deployer.wsrp.container.WSRPDeployment +{ + + private final Logger log = Logger.getLogger(getClass()); + + protected ConsumerRegistry consumerRegistry; + + public WSRPConsumerDeploymentImpl() + { + + } + + public ConsumerRegistry getConsumerRegistry() + { + return consumerRegistry; + } + + public void setConsumerRegistry(ConsumerRegistry consumerRegistry) + { + this.consumerRegistry = consumerRegistry; + } + + public void deployConsumer (ConsumerDeploymentsMetaData deployments) + { + for (WSRPProducerMetaData producer : deployments.getDeployments()) + { + WSRPConsumer consumer = getConsumer(producer); + if (consumer != null) + { + try + { + consumerRegistry.activateConsumerWith(consumer.getProducerId()); + } + catch (Exception e) + { + //ignore and continue + } + } + } + } + + private WSRPConsumer getConsumer(WSRPProducerMetaData producer) + { + String id = producer.getId(); + ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "producer identifier", "Configuring a producer"); + WSRPConsumer consumer = consumerRegistry.getConsumer(id); + + boolean setActivate = false; + + if (consumer != null) + { + String message = "Added consumer for producer '" + id + "' with status: "; + + // if consumer is active, add it to the list of services + if (consumer.getProducerInfo().isActive()) + { + message += "active"; + setActivate = true; + } + else + { + message += "inactive"; + } + + log.info(message + " (loaded from database)."); + + if (setActivate) + { + return consumer; + } + else + { + return null; + } + } + else if (consumer==null) + { + Integer expirationCacheSeconds = producer.getExpirationCache(); + consumer = consumerRegistry.createConsumer(id, expirationCacheSeconds); + } + + + RegistrationInfo registrationInfo = getRegistrationInfo(producer.getRegistrationData(), consumer.getProducerInfo()); + + EndpointConfigurationInfo endpointConf; + if (producer.getEndpointWSDLUrl() != null) + { + endpointConf = getEndpointConf(producer.getEndpointWSDLUrl(), consumer.getProducerInfo()); + } + else + { + endpointConf = getEndpointConf(producer.getEndpointConfig(), consumer.getProducerInfo()); + } + + ProducerInfo info = consumer.getProducerInfo(); + log.debug("adding consumer " + info.getId() + " to deployment."); + + String message; + if (consumer.getProducerInfo().getEndpointConfigurationInfo().isAvailable()) + { + message = "Added consumer for producer '" + consumer.getProducerId() + "' from xml configuration."; + setActivate = true; + } + else + { + message = "There was a problem initializing the WSRP interface for producer '" + + consumer.getProducerId() + "'. The consumer will NOT be available."; + info.setActive(false); + setActivate = false; + } + + // update the producer info once the whole information is known + try + { + consumerRegistry.updateProducerInfo(info); + } + catch (Exception e) + { + log.info("Couldn't update the ProducerInfo for Consumer '" + info.getId() + "'", e); + //return null; + } + + log.info(message); + if (setActivate) + { + return consumer; + } + else + { + return null; + } + } + + + protected EndpointConfigurationInfo getEndpointConf (EndpointConfigMetaData endpointMetaData, ProducerInfo producerInfo) + { + EndpointConfigurationInfo endpoint = producerInfo.getEndpointConfigurationInfo(); + + String markupURL = endpointMetaData.getMarkupURL(); + if (markupURL != null) + { + endpoint.setMarkupURL(markupURL); + } + + String portletManagementURL = endpointMetaData.getPortletManagementURL(); + if (portletManagementURL != null) + { + endpoint.setPortletManagementURL(portletManagementURL); + } + + String registrationURL = endpointMetaData.getRegistrationURL(); + if (registrationURL != null) + { + endpoint.setRegistrationURL(registrationURL); + } + + String serviceDescriptionURL = endpointMetaData.getServiceDescriptionURL(); + if (serviceDescriptionURL != null) + { + endpoint.setServiceDescriptionURL(serviceDescriptionURL); + } + + return endpoint; + } + + protected EndpointConfigurationInfo getEndpointConf (String wsdlURL, ProducerInfo producerInfo) + { + EndpointConfigurationInfo endpoint = producerInfo.getEndpointConfigurationInfo(); + + try + { + endpoint.setWsdlDefinitionURL(wsdlURL); + } + catch (RuntimeException e) + { + // ignore at this point if the WSDL cannot be retrieved, another attempt will be made before persisting + } + return endpoint; + } + + protected RegistrationInfo getRegistrationInfo (RegistrationDataMetaData registrationMetaData, ProducerInfo producerInfo) + { + RegistrationInfo registration = new RegistrationInfo(producerInfo); + + if (registrationMetaData != null) + { + String consumerName = registrationMetaData.getConsumerName(); + if (consumerName != null) + { + registration.setConsumerName(consumerName); + } + + for (PropertyMetaData property : registrationMetaData.getProperties()) + { + registration.setRegistrationPropertyValue(property.getName(), property.getValue()).setLang( + property.getLang()); + } + } + + return registration; + } + +} + Deleted: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -1,233 +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.deployment; - -import org.jboss.deployment.DeploymentException; -import org.jboss.deployment.DeploymentInfo; -import org.jboss.deployment.SubDeployerSupport; -import org.jboss.portal.common.xml.NullEntityResolver; -import org.jboss.portal.wsrp.WSRPConsumer; -import org.jboss.portal.wsrp.consumer.ConsumerException; -import org.jboss.portal.wsrp.consumer.ConsumerRegistry; -import org.jboss.xb.binding.ObjectModelFactory; -import org.jboss.xb.binding.Unmarshaller; -import org.jboss.xb.binding.UnmarshallerFactory; -import org.xml.sax.EntityResolver; - -import java.net.URL; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class WSRPDeployer extends SubDeployerSupport implements WSRPDeployerMBean -{ - /** . */ - private static final String[] DEFAULT_ENHANCED_SUFFIXES = new String[]{"800:-wsrp.xml"}; - - public WSRPDeployer() - { - setEnhancedSuffixes(DEFAULT_ENHANCED_SUFFIXES); - } - - private ConsumerRegistry consumerRegistry; - - /** . */ - private URL deployedDefaultWSRPURL; - - /** . */ - private String defaultWSRPLocation; - - private EntityResolver entityResolver; - - public EntityResolver getEntityResolver() - { - return entityResolver; - } - - public void setEntityResolver(EntityResolver entityResolver) - { - this.entityResolver = entityResolver; - } - - public ConsumerRegistry getConsumerRegistry() - { - return consumerRegistry; - } - - public void setConsumerRegistry(ConsumerRegistry consumerRegistry) - { - this.consumerRegistry = consumerRegistry; - } - - public String getDefaultWSRPLocation() - { - return defaultWSRPLocation; - } - - public void setDefaultWSRPLocation(String defaultWSRPLocation) - { - this.defaultWSRPLocation = defaultWSRPLocation; - } - - public void init(DeploymentInfo di) throws DeploymentException - { - super.init(di); - - try - { - Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); - ObjectModelFactory factory = new WSRPDeploymentFactory(consumerRegistry); - if (entityResolver == null) - { - log.debug("Could not obtain entity resolver for WSRPDeployer"); - entityResolver = new NullEntityResolver(); - } - unmarshaller.setEntityResolver(entityResolver); - di.metaData = unmarshaller.unmarshal(di.localUrl.openStream(), factory, null); - } - catch (Exception e) - { - throw new DeploymentException(e); - } - } - - public void start(DeploymentInfo di) throws DeploymentException - { - super.start(di); - WSRPDeployment deployment = (WSRPDeployment)di.metaData; - for (Object o : deployment.getConsumers()) - { - WSRPConsumer consumer = (WSRPConsumer)o; - try - { - consumerRegistry.activateConsumerWith(consumer.getProducerId()); - } - catch (ConsumerException e) - { - // ignore and continue - } - } - } - - public void stop(DeploymentInfo di) throws DeploymentException - { - WSRPDeployment deployment = (WSRPDeployment)di.metaData; - for (Object o : deployment.getConsumers()) - { - try - { - WSRPConsumer consumer = (WSRPConsumer)o; - consumer.stop(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - super.stop(di); - } - - protected void startService() throws Exception - { - super.startService(); - - if (defaultWSRPLocation != null) - { - URL defaultWSRPURL = Thread.currentThread().getContextClassLoader().getResource(defaultWSRPLocation); - if (defaultWSRPURL != null) - { - try - { - deployedDefaultWSRPURL = defaultWSRPURL; - - mainDeployer.deploy(defaultWSRPURL); - } - catch (DeploymentException e) - { - e.printStackTrace(); - } - } - } - } - - protected void stopService() throws Exception - { - if (deployedDefaultWSRPURL != null) - { - try - { - mainDeployer.undeploy(deployedDefaultWSRPURL); - } - catch (DeploymentException e) - { - e.printStackTrace(); - } - } - super.stopService(); - } - - /* - - - - */ - -} Deleted: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -1,46 +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.deployment; - -import org.jboss.deployment.SubDeployerExtMBean; -import org.jboss.portal.wsrp.consumer.ConsumerRegistry; -import org.xml.sax.EntityResolver; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public interface WSRPDeployerMBean extends SubDeployerExtMBean -{ - String getDefaultWSRPLocation(); - - void setDefaultWSRPLocation(String defaultWSRPLocation); - - ConsumerRegistry getConsumerRegistry(); - - void setConsumerRegistry(ConsumerRegistry consumerRegistry); - - EntityResolver getEntityResolver(); - - void setEntityResolver(EntityResolver entityResolver); -} Deleted: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployment.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -1,47 +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.deployment; - -import org.jboss.system.ServiceMBeanSupport; - -import java.util.ArrayList; -import java.util.List; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class WSRPDeployment extends ServiceMBeanSupport implements WSRPDeploymentMBean -{ - private final List services; - - public WSRPDeployment() - { - services = new ArrayList(); - } - - public List getConsumers() - { - return services; - } -} Deleted: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -1,355 +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.deployment; - -import org.jboss.logging.Logger; -import org.jboss.portal.common.util.ParameterValidation; -import org.jboss.portal.wsrp.WSRPConsumer; -import org.jboss.portal.wsrp.consumer.ConsumerRegistry; -import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo; -import org.jboss.portal.wsrp.consumer.ProducerInfo; -import org.jboss.portal.wsrp.consumer.RegistrationInfo; -import org.jboss.util.StringPropertyReplacer; -import org.jboss.xb.binding.GenericObjectModelFactory; -import org.jboss.xb.binding.UnmarshallingContext; -import org.xml.sax.Attributes; - -/** - * Wire the mbeans to install - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public class WSRPDeploymentFactory implements GenericObjectModelFactory -{ - private final Logger log = Logger.getLogger(getClass()); - - private ConsumerRegistry consumerRegistry; - - private static final boolean DEBUG = false; - - /** . */ - private static final String WSRP_PRODUCER = "wsrp-producer"; - - public static class Property - { - String name; - String value; - String lang; - } - - public WSRPDeploymentFactory(ConsumerRegistry consumerRegistry) - { - this.consumerRegistry = consumerRegistry; - } - - public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs) - { - return new WSRPDeployment(); - } - - public Object completeRoot(Object root, UnmarshallingContext nav, String nsURI, String localName) - { - return root; - } - - public Object newChild(Object parent, UnmarshallingContext unmarshallingContext, String nsURI, String localName, Attributes attributes) - { - if (parent instanceof WSRPDeployment) - { - return newChild((WSRPDeployment)parent, unmarshallingContext, nsURI, localName, attributes); - } - if (parent instanceof RegistrationInfo) - { - return newChild((RegistrationInfo)parent, unmarshallingContext, nsURI, localName, attributes); - } - if (parent instanceof WSRPConsumer) - { - return newChild((WSRPConsumer)parent, unmarshallingContext, nsURI, localName, attributes); - } - return null; - } - - public void addChild(Object parent, Object child, UnmarshallingContext unmarshallingContext, String nsURI, String localName) - { - if (parent instanceof RegistrationInfo && child instanceof Property) - { - addChild((RegistrationInfo)parent, (Property)child, unmarshallingContext, nsURI, localName); - } - else if (parent instanceof WSRPDeployment && child instanceof WSRPConsumer) - { - addChild((WSRPDeployment)parent, (WSRPConsumer)child, unmarshallingContext, nsURI, localName); - } - } - - public void setValue(Object parent, UnmarshallingContext unmarshallingContext, String nsURI, String localName, String value) - { - if (parent instanceof EndpointConfigurationInfo) - { - setValue((EndpointConfigurationInfo)parent, unmarshallingContext, nsURI, localName, value); - } - else if (parent instanceof Property) - { - setValue((Property)parent, unmarshallingContext, nsURI, localName, value); - } - else if (parent instanceof RegistrationInfo) - { - setValue((RegistrationInfo)parent, unmarshallingContext, nsURI, localName, value); - } - } - - public Object newChild(WSRPDeployment deployment, UnmarshallingContext nav, String nsURI, String localName, - Attributes attrs) - { - if (DEBUG) - { - System.out.println("newchild deployment " + localName); - } - - if (WSRP_PRODUCER.equals(localName)) - { - String id = attrs.getValue("id"); - ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "producer identifier", "Configuring a producer"); - - // check that the consumer doesn't exist in the database first - WSRPConsumer consumer = consumerRegistry.getConsumer(id); - if (consumer != null) - { - String message = "Added consumer for producer '" + id + "' with status: "; - - // if consumer is active, add it to the list of services - if (consumer.getProducerInfo().isActive()) - { - deployment.getConsumers().add(consumer); - message += "active"; - } - else - { - message += "inactive"; - } - - log.info(message + " (loaded from database)."); - - // consumer already exists, do not further process this producer and use the DB configuration instead - return null; - } - - String expirationCache = attrs.getValue("expiration-cache"); - Integer expirationCacheSeconds = null; - if (expirationCache != null) - { - try - { - expirationCacheSeconds = new Integer(expirationCache); - } - catch (NumberFormatException e) - { - log.info("Ignoring bad expiration cache value " + expirationCache + " for producer '" + id + "'"); - } - } - - // consumer didn't exist in the database, so create one and configure it - consumer = consumerRegistry.createConsumer(id, expirationCacheSeconds); - - return consumer; - } - else - { - return null; - } - } - - public Object newChild(WSRPConsumer consumer, UnmarshallingContext nav, String nsURI, String localName, - Attributes attrs) - { - if (DEBUG) - { - System.out.println("newchild service " + localName); - } - - ProducerInfo prodInfo = consumer.getProducerInfo(); - - if ("endpoint-config".equals(localName) || "endpoint-wsdl-url".equals(localName)) - { - return prodInfo.getEndpointConfigurationInfo(); - } - else if ("registration-data".equals(localName)) - { - return new RegistrationInfo(prodInfo); - } - else - { - return null; - } - } - - public Object newChild(RegistrationInfo registrationInfo, UnmarshallingContext nav, String nsURI, String localName, - Attributes attrs) - { - if (DEBUG) - { - System.out.println("newChild registrationInfo " + localName); - } - - if ("property".equals(localName)) - { - return new Property(); - } - return null; - } - - public void setValue(EndpointConfigurationInfo endpointInfo, UnmarshallingContext nav, String nsURI, - String localName, String value) - { - if (DEBUG) - { - System.out.println("setvalue endpointInfo " + localName); - } - - if ("service-description-url".equals(localName)) - { - // Resolve value that may contain properties for that one - value = StringPropertyReplacer.replaceProperties(value); - endpointInfo.setServiceDescriptionURL(value); - } - else if ("markup-url".equals(localName)) - { - // Resolve value that may contain properties for that one - value = StringPropertyReplacer.replaceProperties(value); - endpointInfo.setMarkupURL(value); - } - else if ("registration-url".equals(localName)) - { - // Resolve value that may contain properties for that one - value = StringPropertyReplacer.replaceProperties(value); - endpointInfo.setRegistrationURL(value); - } - else if ("portlet-management-url".equals(localName)) - { - // Resolve value that may contain properties for that one - value = StringPropertyReplacer.replaceProperties(value); - endpointInfo.setPortletManagementURL(value); - } - else if ("endpoint-wsdl-url".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - try - { - endpointInfo.setWsdlDefinitionURL(value); - } - catch (RuntimeException e) - { - // ignore at this point if the WSDL cannot be retrieved, another attempt will be made before persisting - } - } - } - - public void setValue(RegistrationInfo registrationInfo, UnmarshallingContext nav, String nsURI, String localName, - String value) - { - if (DEBUG) - { - System.out.println("setvalue registrationinfo " + localName); - } - - if ("consumer-name".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - registrationInfo.setConsumerName(value); - } - } - - public void setValue(Property property, UnmarshallingContext nav, String nsURI, String localName, String value) - { - if (DEBUG) - { - System.out.println("setvalue property " + localName); - } - - if ("name".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - property.name = value; - } - else if ("lang".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - property.lang = value; - } - else if ("value".equals(localName)) - { - value = StringPropertyReplacer.replaceProperties(value); - property.value = value; - } - } - - public void addChild(RegistrationInfo registrationInfo, Property property, - UnmarshallingContext nav, String nsURI, String localName) - { - if (DEBUG) - { - System.out.println("addchild registrationinfo property " + localName); - } - - registrationInfo.setRegistrationPropertyValue(property.name, property.value).setLang(property.lang); - } - - public void addChild(WSRPDeployment deployment, WSRPConsumer consumer, UnmarshallingContext nav, String nsURI, - String localName) - { - ProducerInfo info = consumer.getProducerInfo(); - - if (DEBUG) - { - System.out.println("adding consumer " + info.getId() + " to deployment - localName: " + localName); - } - - String message; - if (consumer.getProducerInfo().getEndpointConfigurationInfo().isAvailable()) - { - message = "Added consumer for producer '" + consumer.getProducerId() + "' from xml configuration."; - deployment.getConsumers().add(consumer); - } - else - { - message = "There was a problem initializing the WSRP interface for producer '" - + consumer.getProducerId() + "'. The consumer will NOT be available."; - info.setActive(false); - } - - // update the producer info once the whole information is known - try - { - consumerRegistry.updateProducerInfo(info); - } - catch (Exception e) - { - // if we couldn't update the info, remove it from the list of service to be activated - deployment.getConsumers().remove(consumer); - log.info("Couldn't update the ProducerInfo for Consumer '" + info.getId() + "'", e); - return; - } - - log.info(message); - } -} Deleted: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentMBean.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentMBean.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentMBean.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -1,33 +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.deployment; - -import org.jboss.system.ServiceMBean; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision$ - */ -public interface WSRPDeploymentMBean extends ServiceMBean -{ -} Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/main/org/jboss/portal/wsrp/services/AbstractJNDIServiceFactory.java 2009-04-20 17:44:54 UTC (rev 13237) @@ -66,16 +66,16 @@ DEFAULT_FACTORY_MAPPING = new Properties(); DEFAULT_FACTORY_MAPPING.setProperty( "org.jboss.portal.wsrp.core.WSRP_v1_ServiceDescription_PortType", - "wsrp-client/service/ServiceDescriptionService"); + "wsrp-client/env/service/ServiceDescriptionService"); DEFAULT_FACTORY_MAPPING.setProperty( "org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType", - "wsrp-client/service/MarkupService"); + "wsrp-client/env/service/MarkupService"); DEFAULT_FACTORY_MAPPING.setProperty( "org.jboss.portal.wsrp.core.WSRP_v1_Registration_PortType", - "wsrp-client/service/RegistrationService"); + "wsrp-client/env/service/RegistrationService"); DEFAULT_FACTORY_MAPPING.setProperty( "org.jboss.portal.wsrp.core.WSRP_v1_PortletManagement_PortType", - "wsrp-client/service/PortletManagementService"); + "wsrp-client/env/service/PortletManagementService"); } /** A Map recording the mapping between WSRP port type class name and JDNI name of the implementing service. */ Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -67,39 +67,14 @@ </mbean> <mbean - code="org.jboss.portal.server.impl.xml.EntityResolverService" - name="portal.wsrp:service=EntityResolver" + code="org.jboss.portal.wsrp.deployment.WSRPConsumerDeploymentImpl" + name="portal.wsrp:service=WSRPDeploymentImpl" xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> <xmbean/> - <attribute name="DTDMapping"> - <properties> - <entry - key="-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN"> - dtd/jboss-wsrp-consumer_2_6.dtd - </entry> - <entry - key="-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"> - dtd/jboss-wsrp-producer_2_6.dtd - </entry> - <entry key="urn:jboss:portal:wsrp:consumer:v2_6">/xsd/jboss-wsrp-consumer_2_6.xsd</entry> - <entry key="urn:jboss:portal:wsrp:producer:v2_6">/xsd/jboss-wsrp-consumer_2_6.xsd</entry> - </properties> - </attribute> + <depends optional-attribute-name="ConsumerRegistry" proxy-type="attribute">portal.wsrp:service=ConsumerRegistry</depends> </mbean> -  - <mbean code="org.jboss.portal.wsrp.deployment.WSRPDeployer" name="portal.wsrp:service=WSRPDeployer"> - <attribute name="DefaultWSRPLocation">default-wsrp.xml</attribute> - <depends>jboss.system:service=MainDeployer</depends> - <depends optional-attribute-name="ConsumerRegistry" - proxy-type="attribute">portal.wsrp:service=ConsumerRegistry - </depends> - <depends optional-attribute-name="EntityResolver" - proxy-type="attribute">portal.wsrp:service=EntityResolver - </depends> - </mbean> - <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder" name="portal:service=Hibernate,type=WSRPConsumer" Added: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-web.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -0,0 +1,3 @@ +<jboss-web> + <context-root>/portal-wsrp</context-root> +</jboss-web> Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-consumer-jar/org/jboss/portal/test/wsrp/consumer/persistent-jboss-beans.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -24,8 +24,8 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~--> <deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_1_0.xsd" - xmlns="urn:jboss:bean-deployer"> + xsi:schemaLocation="urn:jboss:bean-deployer bean-deployer_2_0.xsd" + xmlns="urn:jboss:bean-deployer:2.0"> <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config"> <constructor factoryMethod="getBean"> @@ -43,7 +43,9 @@ <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport"/> - <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport"/> + <bean name="TransactionManagerSupport" class="org.jboss.portal.test.framework.embedded.TransactionManagerSupport"> + + </bean> <bean name="ConnectionManagerSupport" class="org.jboss.portal.test.framework.embedded.ConnectionManagerSupport"> <property name="transactionManager"><inject bean="TransactionManagerSupport" property="transactionManager"/></property> @@ -57,13 +59,14 @@ </bean> <bean name="HibernateSupport" class="org.jboss.portal.test.framework.embedded.HibernateSupport"> + <demand>TransactionManager</demand> <property name="config"><inject bean="HibernateConfig"/></property> <property name="mappings"> <list elementClass="java.lang.String"> <value>conf/hibernate/consumer/domain.hbm.xml</value> </list> </property> - <property name="jNDIName">java:/SessionFactory</property> + <property name="JNDIName">java:/SessionFactory</property> </bean> <bean name="FederatingPortletInvoker" @@ -71,12 +74,14 @@ <bean name="PortalEventListenerRegistry" class="org.jboss.portal.core.event.PortalEventListenerRegistryImpl"/> <bean name="ConsumerRegistry" class="org.jboss.portal.wsrp.consumer.ConsumerRegistryService"> + <demand>HibernateSupport</demand> <property name="sessionFactoryJNDIName">java:/SessionFactory</property> <property name="federatingPortletInvoker"><inject bean="FederatingPortletInvoker"/></property> <property name="portalEventListenerRegistry"><inject bean="PortalEventListenerRegistry"/></property> </bean> <bean name="TestBean" class="org.jboss.portal.test.wsrp.consumer.ConsumerRegistryTestCase"> + <depends>TransactionManager</depends> <constructor factoryMethod="getBean"> <factory bean="BeanFactory"/> <parameter>TestBean</parameter> @@ -84,4 +89,9 @@ <property name="hibernate"><inject bean="HibernateSupport"/></property> <property name="registry"><inject bean="ConsumerRegistry"/></property> </bean> + + <bean name="TransactionManager" class="javax.transaction.TransactionManager"> + <constructor factoryClass="com.arjuna.ats.jta.TransactionManager" factoryMethod="transactionManager"/> + </bean> + </deployment> Added: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-dependency.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-dependency.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-consumer-sar/META-INF/jboss-dependency.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -0,0 +1,3 @@ +<dependency xmlns="urn:jboss:dependency:1.0"> + <item whenRequired="Real" dependentState="Create">TransactionManager</item> +</dependency> Added: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-dependency.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-dependency.xml (rev 0) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-dependency.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -0,0 +1,3 @@ +<dependency xmlns="urn:jboss:dependency:1.0"> + <item whenRequired="Real" dependentState="Create">TransactionManager</item> +</dependency> \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml =================================================================== --- branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2009-04-20 17:43:21 UTC (rev 13236) +++ branches/JBoss_Portal_Branch_2_7_AS5/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2009-04-20 17:44:54 UTC (rev 13237) @@ -37,22 +37,6 @@ <xmbean/> </mbean> -  - <mbean code="org.jboss.portal.portlet.deployment.jboss.PortletAppDeploymentFactory" - name="portal:deploymentFactory=PortletApp" xmbean-dd="" - xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean"> - <xmbean/> - <depends optional-attribute-name="Deployer" proxy-type="attribute">portal:deployer=PortalWebApp</depends> - <depends optional-attribute-name="CoreInfoBuilderFactory" proxy-type="attribute"> - portal:service=InfoBuilderFactory,type=Core - </depends> - <depends optional-attribute-name="PortletContainerInvoker" proxy-type="attribute"> - portal:service=PortletInvoker,type=Container - </depends> -  - <depends optional-attribute-name="Config" proxy-type="attribute">portal:service=ServerConfig</depends> - </mbean> -  <mbean code="org.jboss.portal.portlet.aspects.portlet.ContextDispatcherInterceptor" name="portal:service=Interceptor,type=Portlet,name=ContextDispatcher" xmbean-dd=""

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13236 - in modules/deployer/trunk: build and 18 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-04-20 13:43:21 -0400 (Mon, 20 Apr 2009) New Revision: 13236 Added: modules/deployer/trunk/deployer/src/main/deployer/dtd/jboss-wsrp-consumer_2_6.dtd modules/deployer/trunk/deployer/src/main/deployer/dtd/jboss-wsrp-producer_2_6.dtd modules/deployer/trunk/deployer/src/main/deployer/xsd/ modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-consumer_2_6.xsd modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_6.xsd modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_7.xsd modules/deployer/trunk/wsrp/ modules/deployer/trunk/wsrp/pom.xml modules/deployer/trunk/wsrp/src/ modules/deployer/trunk/wsrp/src/main/ modules/deployer/trunk/wsrp/src/main/java/ modules/deployer/trunk/wsrp/src/main/java/org/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDependencyDeployer.java modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDeployer.java modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/container/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/container/WSRPDeployment.java modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPConsumerParser.java modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPProducerParser.java modules/deployer/trunk/wsrp/src/test/ modules/deployer/trunk/wsrp/src/test/java/ Modified: modules/deployer/trunk/.classpath modules/deployer/trunk/build/pom.xml modules/deployer/trunk/deployer/pom.xml modules/deployer/trunk/deployer/src/assemble/jboss-portal-deployer.xml modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml modules/deployer/trunk/pom.xml Log: Add wsrp deployers. Modified: modules/deployer/trunk/.classpath =================================================================== --- modules/deployer/trunk/.classpath 2009-04-20 17:40:51 UTC (rev 13235) +++ modules/deployer/trunk/.classpath 2009-04-20 17:43:21 UTC (rev 13236) @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="theme/src/main/java"/> + <classpathentry kind="src" path="wsrp/src/main/java"/> + <classpathentry kind="src" path="wsrp/src/test/java"/> <classpathentry kind="src" path="theme/src/test/java"/> <classpathentry kind="src" path="portal/src/main/java"/> <classpathentry kind="src" path="portlet/src/main/java"/> Modified: modules/deployer/trunk/build/pom.xml =================================================================== --- modules/deployer/trunk/build/pom.xml 2009-04-20 17:40:51 UTC (rev 13235) +++ modules/deployer/trunk/build/pom.xml 2009-04-20 17:43:21 UTC (rev 13236) @@ -17,7 +17,7 @@ <version.assembly>2.2-beta-2</version.assembly> <version.jboss.aop>1.0.0.GA</version.jboss.aop> <version.jboss.aspects>1.0.0.GA</version.jboss.aspects> - <version.jboss-deployers>2.2.0-SNAPSHOT</version.jboss-deployers> + <version.jboss-deployers>2.0.5.GA</version.jboss-deployers> <version.jboss-metadata>1.0.0.CR1</version.jboss-metadata> <version.jboss.portal>2.8-SNAPSHOT</version.jboss.portal> <version.jboss.portal.metadata>trunk-SNAPSHOT</version.jboss.portal.metadata> @@ -98,6 +98,11 @@ <artifactId>metadata-theme</artifactId> <version>${version.jboss.portal.metadata}</version> </dependency> + <dependency> + <groupId>org.jboss.portal.metadata</groupId> + <artifactId>metadata-wsrp</artifactId> + <version>${version.jboss.portal.metadata}</version> + </dependency> <dependency> <groupId>org.jboss.maven.plugins</groupId> Modified: modules/deployer/trunk/deployer/pom.xml =================================================================== --- modules/deployer/trunk/deployer/pom.xml 2009-04-20 17:40:51 UTC (rev 13235) +++ modules/deployer/trunk/deployer/pom.xml 2009-04-20 17:43:21 UTC (rev 13236) @@ -28,6 +28,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>org.jboss.portal.deployer</groupId> + <artifactId>deployer-wsrp</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.jboss.portal.metadata</groupId> <artifactId>metadata-metadata</artifactId> </dependency> @@ -35,6 +40,10 @@ <groupId>org.jboss.portal.metadata</groupId> <artifactId>metadata-theme</artifactId> </dependency> + <dependency> + <groupId>org.jboss.portal.metadata</groupId> + <artifactId>metadata-wsrp</artifactId> + </dependency> </dependencies> <build> Modified: modules/deployer/trunk/deployer/src/assemble/jboss-portal-deployer.xml =================================================================== --- modules/deployer/trunk/deployer/src/assemble/jboss-portal-deployer.xml 2009-04-20 17:40:51 UTC (rev 13235) +++ modules/deployer/trunk/deployer/src/assemble/jboss-portal-deployer.xml 2009-04-20 17:43:21 UTC (rev 13236) @@ -17,8 +17,10 @@ <include>org.jboss.portal.deployer:deployer-portal</include> <include>org.jboss.portal.deployer:deployer-portlet</include> <include>org.jboss.portal.deployer:deployer-theme</include> + <include>org.jboss.portal.deployer:deployer-wsrp</include> <include>org.jboss.portal.metadata:metadata-metadata</include> <include>org.jboss.portal.metadata:metadata-theme</include> + <include>org.jboss.portal.metadata:metadata-wsrp</include> </includes> </dependencySet> <dependencySet> Modified: modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml 2009-04-20 17:40:51 UTC (rev 13235) +++ modules/deployer/trunk/deployer/src/main/deployer/META-INF/deployer-jboss-beans.xml 2009-04-20 17:43:21 UTC (rev 13236) @@ -46,6 +46,14 @@ <key>-//JBoss Portal//DTD JBoss Portal RenderSet 2.8//EN</key> <value>dtd/portal-rendersets_2_7.dtd</value> </entry> + <entry> + <key>-//JBoss Portal//DTD JBoss Portal WSRP Consumer 2.6//EN</key> + <value>dtd/jboss-wsrp-consumer_2_6.dtd</value> + </entry> + <entry> + <key>-//JBoss Portal//DTD JBoss Portal WSRP Producer 2.6//EN</key> + <value>dtd/jboss-wsrp-producer_2_6.dtd</value> + </entry> </map> </property> </bean> @@ -94,6 +102,18 @@ <key>portal-renderset_2_7.dtd</key> <value>org.jboss.portal.metadata.renderset.PortalRenderSetsMetaData</value> </entry> + <entry> + <key>jboss-wsrp-producer_2_6.dtd</key> + <value>org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData</value> + </entry> + <entry> + <key>jboss-wsrp-consumer_2_6.dtd</key> + <value>org.jboss.portal.metadata.wsrp.producer.ProducerConfiguration26MetaData</value> + </entry> + <entry> + <key>producer-configuration</key> + <value>org.jboss.portal.metadata.wsrp.producer.ProducerConfiguration26MetaData</value> + </entry> </map> </property> <property name="XSDMapping"> @@ -106,6 +126,18 @@ <key>http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd</key> <value>org.jboss.portal.metadata.portlet.mc.AnnotationPortletApplication20MetaData</value> </entry> + <entry> + <key>urn:jboss:portal:wsrp:consumer:v2_6</key> + <value>org.jboss.portal.metadata.wsrp.consumer.AnnotatedConsumerDeploymentsMetaData</value> + </entry> + <entry> + <key>urn:jboss:portal:wsrp:producer:v2_6</key> + <value>org.jboss.portal.metadata.wsrp.producer.AnnotatedProducerConfiguration26MetaData</value> + </entry> + <entry> + <key>urn:jboss:portal:wsrp:producer:v2_7</key> + <value>org.jboss.portal.metadata.wsrp.producer.AnnotatedProducerConfiguration27MetaData</value> + </entry> </map> </property> </bean> @@ -149,10 +181,16 @@  <bean name="PortalRenderSetParsingDeployer" class="org.jboss.portal.deployer.theme.parsing.PortalRenderSetParsingDeployer"/> +  + <bean name="WSRPConsumerParsingDeployer" class="org.jboss.portal.deployer.wsrp.parsing.WSRPConsumerParser"/> + + <bean name="WSRPProducerParsingDeployer" class="org.jboss.portal.deployer.wsrp.parsing.WSRPProducerParser"/> + <bean name="MergedPortletParsingDeployer" class="org.jboss.portal.deployer.parsing.MergedPortletParsingDeployer"> <property name="standardPortletFileLocation">conf/standardjboss-portlet.xml</property> </bean> +   + + + + +<!ELEMENT deployments ( deployment* )> + + +<!ELEMENT deployment ( wsrp-producer )> + + +<!ELEMENT wsrp-producer ( ( endpoint-config | endpoint-wsdl-url ), registration-data? )> + + +<!ATTLIST wsrp-producer id CDATA #REQUIRED> + + +<!ATTLIST wsrp-producer expiration-cache CDATA #IMPLIED> + + +<!ELEMENT endpoint-config ( service-description-url, markup-url, registration-url?, portlet-management-url? )> + + +<!ELEMENT service-description-url ( #PCDATA )> + + +<!ELEMENT markup-url ( #PCDATA )> + + +<!ELEMENT portlet-management-url ( #PCDATA )> + + +<!ELEMENT registration-url ( #PCDATA )> + + +<!ELEMENT endpoint-wsdl-url ( #PCDATA )> + + +<!ELEMENT registration-data ( consumer-name?, property* )> + + +<!ELEMENT consumer-name ( #PCDATA )> + + +<!ELEMENT property ( name, lang, value )> + + +<!ELEMENT name ( #PCDATA )> + + +<!ELEMENT lang ( #PCDATA )> + + +<!ELEMENT value ( #PCDATA )> \ No newline at end of file Added: modules/deployer/trunk/deployer/src/main/deployer/dtd/jboss-wsrp-producer_2_6.dtd =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/dtd/jboss-wsrp-producer_2_6.dtd (rev 0) +++ modules/deployer/trunk/deployer/src/main/deployer/dtd/jboss-wsrp-producer_2_6.dtd 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,87 @@ + + + + + +<!ELEMENT producer-configuration ( registration-configuration? )> + + + +<!ELEMENT registration-configuration ( (registration-property-validator | registration-policy)?, registration-property-description* )> + + +<!ATTLIST registration-configuration fullServiceDescriptionRequiresRegistration (true | false) "false"> + + +<!ELEMENT registration-property-validator ( #PCDATA )> + + +<!ELEMENT registration-policy ( #PCDATA )> + + +<!ELEMENT registration-property-description ( name, type, label, hint? )> + + +<!ELEMENT name ( #PCDATA )> + + +<!ELEMENT type ( #PCDATA )> + + +<!ELEMENT hint ( #PCDATA )> + +<!ATTLIST hint xml:lang CDATA #REQUIRED> + +<!ATTLIST hint resourceName CDATA #IMPLIED> + + +<!ELEMENT label ( #PCDATA )> + +<!ATTLIST label xml:lang CDATA #REQUIRED> + +<!ATTLIST label resourceName CDATA #IMPLIED> Added: modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-consumer_2_6.xsd =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-consumer_2_6.xsd (rev 0) +++ modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-consumer_2_6.xsd 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,194 @@ +<?xml version="1.0"?> + + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:jboss:portal:wsrp:consumer:v2_6" + xmlns="urn:jboss:portal:wsrp:consumer:v2_6" + xmlns:xml="http://www.w3.org/XML/1998/namespace" + xmlns:wcc="urn:jboss:portal:wsrp:consumer:v2_6" + elementFormDefault="qualified"> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace"/> + + <xs:element name="deployments"> + <xs:annotation> + <xs:documentation>Root element. Contains deployment elements.</xs:documentation> + </xs:annotation> + <xs:complexType> + <xs:sequence> + <xs:element name="deployment" type="wcc:Deployment" minOccurs="0" maxOccurs="unbounded"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:complexType name="Deployment"> + <xs:annotation> + <xs:documentation>Deployment related information. As of Portal 2.6, the only deployment information relates to + WSRP remote producers.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="wsrp-producer" type="wcc:WSRPProducer" maxOccurs="1" minOccurs="1"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="WSRPProducer"> + <xs:annotation> + <xs:documentation>Information on a remote WSRP producer identified by the mandatory id attribute.</xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:choice> + <xs:element name="endpoint-config" type="wcc:EndpointConfig"> + <xs:annotation> + <xs:documentation> + WSRP endpoints configuration information by interface URL. Mutually exclusive with endpoint-wsdl-url. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="endpoint-wsdl-url" type="xs:anyURI"> + <xs:annotation> + <xs:documentation> + The URL of the WSDL description of the producer's WSRP services. Mutally exclusive with endpoint-config. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:choice> + <xs:element name="registration-data" type="wcc:RegistrationData" minOccurs="0"> + <xs:annotation> + <xs:documentation> + Container for registration information. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + <xs:attribute name="id" type="xs:string" use="required"> + <xs:annotation> + <xs:documentation> + The producer identifier. This should be unique for a given Portal deployment. The identifier is used to + identify the portlet provider in the management interface. + </xs:documentation> + </xs:annotation> + </xs:attribute> + <xs:attribute name="expiration-cache" type="wcc:cacheValue" use="required"> + <xs:annotation> + <xs:documentation>The period of producer information (such as list of offered portlets) cache refreshing in seconds.</xs:documentation> + </xs:annotation> + </xs:attribute> + </xs:complexType> + + <xs:simpleType name="cacheValue" id="cacheValue"> + <xs:annotation> + <xs:documentation> + Type for cache information. Positive or null integer, allowing -1 as a value to indicate that cache should not + be used. + </xs:documentation> + </xs:annotation> + <xs:restriction base="xs:integer"> + <xs:minInclusive value="-1"/> + </xs:restriction> + </xs:simpleType> + + <xs:complexType name="EndpointConfig"> + <xs:sequence> + <xs:element name="service-description-url" type="xs:anyURI"> + <xs:annotation> + <xs:documentation> + The mandatory URL for the service description interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="markup-url" type="xs:anyURI"> + <xs:annotation> + <xs:documentation> + The madatory URL for the markup interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="registration-url" type="xs:anyURI" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:documentation> + The optional URL for the registration interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="portlet-management-url" type="xs:anyURI" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:documentation> + The optional URL for the portlet management interface endpoint on the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="RegistrationData"> + <xs:sequence> + <xs:element name="consumer-name" type="xs:string" minOccurs="0" maxOccurs="1"> + <xs:annotation> + <xs:documentation> + An optional name (preferably unique) that identifies the Consumer. An example of such a name would be + the Consumer's URL. If no consumer-name is provided, one will be automatically generated by JBoss Portal. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="property" type="wcc:Property" minOccurs="0" maxOccurs="unbounded"> + <xs:annotation> + <xs:documentation> + Optional registration properties required by the remote producer. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="Property"> + <xs:annotation> + <xs:documentation> + Registration property. + </xs:documentation> + </xs:annotation> + <xs:sequence> + <xs:element name="name" type="xs:string"> + <xs:annotation> + <xs:documentation> + Name of the property. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="lang" type="xs:language"> + <xs:annotation> + <xs:documentation> + Language the property is in. + </xs:documentation> + </xs:annotation> + </xs:element> + <xs:element name="value" type="xs:string"> + <xs:annotation> + <xs:documentation> + Value of the property. + </xs:documentation> + </xs:annotation> + </xs:element> + </xs:sequence> + </xs:complexType> +</xs:schema> Added: modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_6.xsd =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_6.xsd (rev 0) +++ modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_6.xsd 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,68 @@ +<?xml version="1.0"?> + + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:jboss:portal:wsrp:producer:v2_6" + xmlns="urn:jboss:portal:wsrp:producer:v2_6" + xmlns:xml="http://www.w3.org/XML/1998/namespace" + xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_6" elementFormDefault="qualified"> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace"/> + + <xs:element name="producer-configuration"> + <xs:complexType> + <xs:sequence> + <xs:element name="registration-configuration" type="wpc:RegistrationConfiguration"/> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:complexType name="RegistrationConfiguration"> + <xs:sequence> + <xs:element name="registration-policy" type="xs:string" minOccurs="0"/> + <xs:element name="registration-property-validator" type="xs:string" minOccurs="0"/> + <xs:element name="registration-property-description" type="wpc:RegistrationPropertyDescription" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="fullServiceDescriptionRequiresRegistration" type="xs:boolean" use="optional"/> + </xs:complexType> + + <xs:complexType name="RegistrationPropertyDescription"> + <xs:sequence> + <xs:element name="name" type="xs:QName"/> + <xs:element name="type" type="xs:QName"/> + <xs:element name="label" type="wpc:LocalizedString" minOccurs="0"/> + <xs:element name="hint" type="wpc:LocalizedString" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="LocalizedString"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" use="required"/> + <xs:attribute name="resourceName" type="xs:string" use="optional"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> +</xs:schema> Added: modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_7.xsd =================================================================== --- modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_7.xsd (rev 0) +++ modules/deployer/trunk/deployer/src/main/deployer/xsd/jboss-wsrp-producer_2_7.xsd 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,70 @@ +<?xml version="1.0"?> + + +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="urn:jboss:portal:wsrp:producer:v2_7" + xmlns="urn:jboss:portal:wsrp:producer:v2_7" + xmlns:xml="http://www.w3.org/XML/1998/namespace" + xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_7" elementFormDefault="qualified"> + + <xs:import namespace="http://www.w3.org/XML/1998/namespace"/> + + <xs:element name="producer-configuration"> + <xs:complexType> + <xs:sequence> + <xs:element name="registration-configuration" type="wpc:RegistrationConfiguration"/> + </xs:sequence> + <xs:attribute name="useStrictMode" type="xs:boolean" use="optional"/> + </xs:complexType> + </xs:element> + + <xs:complexType name="RegistrationConfiguration"> + <xs:sequence> + <xs:element name="registration-policy" type="xs:string" minOccurs="0"/> + <xs:element name="registration-property-validator" type="xs:string" minOccurs="0"/> + <xs:element name="registration-property-description" type="wpc:RegistrationPropertyDescription" minOccurs="0" + maxOccurs="unbounded"/> + </xs:sequence> + <xs:attribute name="fullServiceDescriptionRequiresRegistration" type="xs:boolean" use="optional"/> + </xs:complexType> + + <xs:complexType name="RegistrationPropertyDescription"> + <xs:sequence> + <xs:element name="name" type="xs:QName"/> + <xs:element name="type" type="xs:QName"/> + <xs:element name="label" type="wpc:LocalizedString" minOccurs="0"/> + <xs:element name="hint" type="wpc:LocalizedString" minOccurs="0"/> + <xs:element name="description" type="wpc:LocalizedString" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + + <xs:complexType name="LocalizedString"> + <xs:simpleContent> + <xs:extension base="xs:string"> + <xs:attribute ref="xml:lang" use="required"/> + <xs:attribute name="resourceName" type="xs:string" use="optional"/> + </xs:extension> + </xs:simpleContent> + </xs:complexType> +</xs:schema> Modified: modules/deployer/trunk/pom.xml =================================================================== --- modules/deployer/trunk/pom.xml 2009-04-20 17:40:51 UTC (rev 13235) +++ modules/deployer/trunk/pom.xml 2009-04-20 17:43:21 UTC (rev 13236) @@ -27,6 +27,7 @@ <module>portal</module> <module>portlet</module> <module>theme</module> + <module>wsrp</module> <module>deployer</module> </modules> Added: modules/deployer/trunk/wsrp/pom.xml =================================================================== --- modules/deployer/trunk/wsrp/pom.xml (rev 0) +++ modules/deployer/trunk/wsrp/pom.xml 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,98 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.deployer</groupId> + <artifactId>module-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>deployer-wsrp</artifactId> + <packaging>jar</packaging> + <name>JBoss Portal Modules WSRP Deployer</name> + + <dependencies> + + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-spi</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.deployers</groupId> + <artifactId>jboss-deployers-vfs</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.metadata</groupId> + <artifactId>jboss-metadata</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.jbossas</groupId> + <artifactId>jboss-as-server</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>saxon</groupId> + <artifactId>saxon</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.portal.deployer</groupId> + <artifactId>deployer-portal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.deployer</groupId> + <artifactId>deployer-portlet</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.jboss.portal.metadata</groupId> + <artifactId>metadata-metadata</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.portal.metadata</groupId> + <artifactId>metadata-wsrp</artifactId> + </dependency> + + <dependency> + <groupId>org.jboss.aspects</groupId> + <artifactId>jboss-security-aspects</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.aspects</groupId> + <artifactId>jboss-transaction-aspects</artifactId> + <scope>provided</scope> + </dependency> + + </dependencies> + + <build> + +<pluginManagement> +<plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <version>2.2</version> +</plugin> +</plugins> +</pluginManagement> + + <plugins> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>iso-8859-1</encoding> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + </plugins> + </build> +</project> Added: modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDependencyDeployer.java =================================================================== --- modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDependencyDeployer.java (rev 0) +++ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDependencyDeployer.java 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,86 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.deployer.wsrp; + +import java.util.ArrayList; + +import org.jboss.dependency.plugins.AbstractDependencyItem; +import org.jboss.dependency.spi.ControllerContext; +import org.jboss.dependency.spi.ControllerState; +import org.jboss.dependency.spi.DependencyItem; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentStages; +import org.jboss.deployers.spi.deployer.helpers.AbstractDeployer; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class WSRPConsumerDependencyDeployer extends AbstractDeployer +{ + + protected ArrayList<String> dependencies; + + public static final String WSRP_DEPENDENCIES_ADDED = "wsrp.dependencies.added"; + + public WSRPConsumerDependencyDeployer() + { + this.setAllInputs(false); + this.setInput(ConsumerDeploymentsMetaData.class); + this.addOutput(WSRP_DEPENDENCIES_ADDED); + this.setStage(DeploymentStages.POST_PARSE); + } + + public void setDependencies(ArrayList<String> dependencies) + { + this.dependencies = dependencies; + } + + public void deploy(DeploymentUnit unit) throws DeploymentException + { + ControllerContext context = unit.getAttachment(ControllerContext.class); + + if (context != null) + { + + if (dependencies != null) + { + for (int i = 0; i < dependencies.size(); i++) + { + String dependency = dependencies.get(i); + + // the controller state must be set to Real to make sure that the deployable is not initalized before the dependencies. + // TODO: use ControllerState.REAL if it gets added as an option to the ControllerState class. + DependencyItem dependItem = new AbstractDependencyItem(context.getName(), dependency, + new ControllerState("Real"), ControllerState.CREATE); + + unit.addIDependOn(dependItem); + } + } + } + } + +} + Added: modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDeployer.java =================================================================== --- modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDeployer.java (rev 0) +++ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/WSRPConsumerDeployer.java 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,67 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.deployer.wsrp; + +import org.jboss.beans.metadata.api.annotations.Install; +import org.jboss.deployers.spi.DeploymentException; +import org.jboss.deployers.spi.deployer.DeploymentStages; +import org.jboss.deployers.spi.deployer.helpers.AbstractComponentDeployer; +import org.jboss.deployers.structure.spi.DeploymentUnit; +import org.jboss.portal.deployer.portlet.PortletDeployer; +import org.jboss.portal.deployer.wsrp.container.WSRPDeployment; +import org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class WSRPConsumerDeployer extends AbstractComponentDeployer +{ + + WSRPDeployment deployment; + + public WSRPConsumerDeployer() + { + this.setAllInputs(false); + this.setInput(ConsumerDeploymentsMetaData.class); + this.addInput(PortletDeployer.PORLET_DEPLOYED); + this.addInput(WSRPConsumerDependencyDeployer.WSRP_DEPENDENCIES_ADDED); + this.setStage(DeploymentStages.INSTALLED); + } + + @Install + public void addDeployment(WSRPDeployment deployment) + { + this.deployment = deployment; + } + + @Override + public void internalDeploy(DeploymentUnit unit) throws DeploymentException + { + ConsumerDeploymentsMetaData deployments = unit.getAttachment(ConsumerDeploymentsMetaData.class); + + deployment.deployConsumer(deployments); + } + +} + Added: modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/container/WSRPDeployment.java =================================================================== --- modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/container/WSRPDeployment.java (rev 0) +++ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/container/WSRPDeployment.java 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,36 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.deployer.wsrp.container; + +import org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public interface WSRPDeployment +{ + public void deployConsumer (ConsumerDeploymentsMetaData deployments); + +} + Added: modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPConsumerParser.java =================================================================== --- modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPConsumerParser.java (rev 0) +++ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPConsumerParser.java 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,64 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.deployer.wsrp.parsing; + +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.portal.deployer.parsing.PortalResolverDeployer; +import org.jboss.portal.metadata.wsrp.consumer.ConsumerDeploymentsMetaData; +import org.jboss.virtual.VirtualFile; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class WSRPConsumerParser extends PortalResolverDeployer<ConsumerDeploymentsMetaData> +{ + + public WSRPConsumerParser() + { + super(ConsumerDeploymentsMetaData.class); + this.setSuffix("-wsrp.xml"); + // relative order obtained from the old WSRPDeployer class + // TODO: figure out if this is actually needed. + this.setRelativeOrder(800); + } + + public void setXmlPath(String xmlPath) + { + this.setName(xmlPath); + } + + public String getXmlPath() + { + return getName(); + } + + protected ConsumerDeploymentsMetaData parse(VFSDeploymentUnit unit, VirtualFile file, ConsumerDeploymentsMetaData root) + throws Exception + { + ConsumerDeploymentsMetaData consumerDeployments = (ConsumerDeploymentsMetaData) super.parse(unit, file, root); + return consumerDeployments; + } + +} + Added: modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPProducerParser.java =================================================================== --- modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPProducerParser.java (rev 0) +++ modules/deployer/trunk/wsrp/src/main/java/org/jboss/portal/deployer/wsrp/parsing/WSRPProducerParser.java 2009-04-20 17:43:21 UTC (rev 13236) @@ -0,0 +1,61 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.deployer.wsrp.parsing; + +import org.jboss.deployers.vfs.spi.structure.VFSDeploymentUnit; +import org.jboss.portal.deployer.parsing.PortalResolverDeployer; +import org.jboss.portal.metadata.wsrp.producer.ProducerConfiguration26MetaData; +import org.jboss.virtual.VirtualFile; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class WSRPProducerParser extends PortalResolverDeployer<ProducerConfiguration26MetaData> +{ + + public WSRPProducerParser() + { + super(ProducerConfiguration26MetaData.class); + this.setName("conf/producer/config.xml"); + } + + public void setXmlPath(String xmlPath) + { + this.setName(xmlPath); + } + + public String getXmlPath() + { + return getName(); + } + + protected ProducerConfiguration26MetaData parse(VFSDeploymentUnit unit, VirtualFile file, ProducerConfiguration26MetaData root) + throws Exception + { + ProducerConfiguration26MetaData producerConfiguration = (ProducerConfiguration26MetaData) super.parse(unit, file, root); + return producerConfiguration; + } + +} +

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13235 - in modules/metadata/trunk: wsrp and 20 other directories.

by portal-commits＠lists.jboss.org

Author: mwringe Date: 2009-04-20 13:40:51 -0400 (Mon, 20 Apr 2009) New Revision: 13235 Added: modules/metadata/trunk/wsrp/ modules/metadata/trunk/wsrp/pom.xml modules/metadata/trunk/wsrp/src/ modules/metadata/trunk/wsrp/src/main/ modules/metadata/trunk/wsrp/src/main/java/ modules/metadata/trunk/wsrp/src/main/java/org/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.java modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.java modules/metadata/trunk/wsrp/src/test/ modules/metadata/trunk/wsrp/src/test/java/ modules/metadata/trunk/wsrp/target/ modules/metadata/trunk/wsrp/target/classes/ modules/metadata/trunk/wsrp/target/classes/org/ modules/metadata/trunk/wsrp/target/classes/org/jboss/ modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/ modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/ modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/ modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/ modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.class modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.class modules/metadata/trunk/wsrp/target/metadata-wsrp-trunk-SNAPSHOT-sources.jar modules/metadata/trunk/wsrp/target/metadata-wsrp-trunk-SNAPSHOT.jar Modified: modules/metadata/trunk/.classpath modules/metadata/trunk/pom.xml Log: Add wsrp metadata classes. Modified: modules/metadata/trunk/.classpath =================================================================== --- modules/metadata/trunk/.classpath 2009-04-20 17:23:04 UTC (rev 13234) +++ modules/metadata/trunk/.classpath 2009-04-20 17:40:51 UTC (rev 13235) @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" output="target-eclipse/classes" path="metadata/src/main/java"/> + <classpathentry kind="src" path="wsrp/src/main/java"/> <classpathentry kind="src" path="theme/src/main/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> Modified: modules/metadata/trunk/pom.xml =================================================================== --- modules/metadata/trunk/pom.xml 2009-04-20 17:23:04 UTC (rev 13234) +++ modules/metadata/trunk/pom.xml 2009-04-20 17:40:51 UTC (rev 13235) @@ -26,6 +26,7 @@ <module>build</module> <module>metadata</module> <module>theme</module> + <module>wsrp</module> </modules> <reporting> Added: modules/metadata/trunk/wsrp/pom.xml =================================================================== --- modules/metadata/trunk/wsrp/pom.xml (rev 0) +++ modules/metadata/trunk/wsrp/pom.xml 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,52 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.metadata</groupId> + <artifactId>module-parent</artifactId> + <version>trunk-SNAPSHOT</version> + <relativePath>../build/pom.xml</relativePath> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>metadata-wsrp</artifactId> + <packaging>jar</packaging> + <name>JBoss Portal WSRP Metadata</name> + + <dependencies> + + <dependency> + <groupId>org.jboss.metadata</groupId> + <artifactId>jboss-metadata</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jbossxb</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <encoding>iso-8859-1</encoding> + </configuration> + </plugin> + </plugins> + </build> + + <properties/> +</project> Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,44 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.consumer; + +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlRootElement; + +import org.jboss.xb.annotations.JBossXmlSchema; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +@XmlRootElement(name = "deployments") +@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = "urn:jboss:portal:wsrp:consumer:v2_6", prefix = "wcc")}, + ignoreUnresolvedFieldOrClass = false, + namespace = "urn:jboss:portal:wsrp:consumer:v2_6", + elementFormDefault = XmlNsForm.QUALIFIED) +public class AnnotatedConsumerDeploymentsMetaData extends ConsumerDeploymentsMetaData +{ + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,49 @@ +///****************************************************************************** +// * JBoss, a division of Red Hat * +// * Copyright 2009, 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.metadata.wsrp.consumer; +// +//import javax.xml.bind.annotation.XmlElement; +// +///** +// * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> +// * @version $Revision$ +// */ +//public class ConsumerDeploymentMetaData +//{ +// +// protected WSRPProducerMetaData producer; +// +// @XmlElement (name = "wsrp-producer") +// public WSRPProducerMetaData getProducer() +// { +// return producer; +// } +// +// public void setProducer(WSRPProducerMetaData producer) +// { +// this.producer = producer; +// } +// +// +//} +// Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,60 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2008, 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.metadata.wsrp.consumer; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlElementWrapper; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +@XmlRootElement(name = "deployments", namespace = "") +public class ConsumerDeploymentsMetaData +{ + + protected List<WSRPProducerMetaData> deployments; + + + public ConsumerDeploymentsMetaData() + { + this.deployments = new ArrayList<WSRPProducerMetaData>(); + } + + public List<WSRPProducerMetaData> getDeployments() + { + return deployments; + } + + @XmlElementWrapper(name = "deployment") + @XmlElement (name = "wsrp-producer") + public void setDeployments(List<WSRPProducerMetaData> deployments) + { + this.deployments = deployments; + } + +} Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,87 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.consumer; + +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class EndpointConfigMetaData +{ + + protected String serviceDescriptionURL; + + protected String markupURL; + + protected String registrationURL; + + protected String portletManagementURL; + + @XmlElement (name = "service-description-url") + public String getServiceDescriptionURL() + { + return serviceDescriptionURL; + } + + public void setServiceDescriptionURL(String serviceDescriptionURL) + { + this.serviceDescriptionURL = serviceDescriptionURL; + } + + @XmlElement (name = "markup-url") + public String getMarkupURL() + { + return markupURL; + } + + public void setMarkupURL(String markupURL) + { + this.markupURL = markupURL; + } + + @XmlElement (name = "registration-url") + public String getRegistrationURL() + { + return registrationURL; + } + + public void setRegistrationURL(String registrationURL) + { + this.registrationURL = registrationURL; + } + + @XmlElement (name = "portlet-management-url") + public String getPortletManagementURL() + { + return portletManagementURL; + } + + public void setPortletManagementURL(String portletManagementURL) + { + this.portletManagementURL = portletManagementURL; + } + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,70 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.consumer; + +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class PropertyMetaData +{ + protected String name; + protected String lang; + protected String value; + + @XmlElement (name = "name") + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @XmlElement (name = "lang") + public String getLang() + { + return lang; + } + + public void setLang(String lang) + { + this.lang = lang; + } + + @XmlElement (name = "value") + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,68 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.consumer; + +import java.util.ArrayList; +import java.util.List; + +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class RegistrationDataMetaData +{ + + protected String consumerName; + protected List<PropertyMetaData> properties; + + public RegistrationDataMetaData() + { + this.properties = new ArrayList<PropertyMetaData>(); + } + + @XmlElement (name = "consumer-name") + public String getConsumerName() + { + return consumerName; + } + + public void setConsumerName(String consumerName) + { + this.consumerName = consumerName; + } + + @XmlElement (name = "property") + public List<PropertyMetaData> getProperties() + { + return properties; + } + + public void setProperties(List<PropertyMetaData> properties) + { + this.properties = properties; + } + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,102 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.consumer; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; + + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class WSRPProducerMetaData +{ + + protected EndpointConfigMetaData endpointConfig; + + protected String endpointWSDLUrl; + + protected RegistrationDataMetaData registrationData; + + protected String id; + + protected Integer expirationCache; + + @XmlElement (name = "endpoint-config") + public EndpointConfigMetaData getEndpointConfig() + { + return endpointConfig; + } + + public String getEndpointWSDLUrl() + { + return endpointWSDLUrl; + } + + @XmlElement (name = "endpoint-wsdl-url") + public void setEndpointWSDLUrl(String endpointWSDLUrl) + { + this.endpointWSDLUrl = endpointWSDLUrl; + } + + public void setEndpointConfig(EndpointConfigMetaData endpointConfig) + { + this.endpointConfig = endpointConfig; + } + + @XmlElement (name = "registration-data") + public RegistrationDataMetaData getRegistrationData() + { + return registrationData; + } + + public void setRegistrationData(RegistrationDataMetaData registrationData) + { + this.registrationData = registrationData; + } + + @XmlAttribute (name="id") + public String getId() + { + return id; + } + + public void setId(String id) + { + this.id = id; + } + + @XmlAttribute (name = "expiration-cache") + public Integer getExpirationCache() + { + return expirationCache; + } + + public void setExpirationCache(Integer expirationCache) + { + this.expirationCache = expirationCache; + } + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,45 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlRootElement; + +import org.jboss.xb.annotations.JBossXmlSchema; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ + +@XmlRootElement(name="producer-configuration") +@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = "urn:jboss:portal:wsrp:producer:v2_6", prefix = "wpc")}, + ignoreUnresolvedFieldOrClass = false, + namespace = "urn:jboss:portal:wsrp:producer:v2_6", + elementFormDefault = XmlNsForm.QUALIFIED) +public class AnnotatedProducerConfiguration26MetaData extends ProducerConfiguration26MetaData +{ + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,44 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import javax.xml.bind.annotation.XmlNs; +import javax.xml.bind.annotation.XmlNsForm; +import javax.xml.bind.annotation.XmlRootElement; + +import org.jboss.xb.annotations.JBossXmlSchema; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +@XmlRootElement(name="producer-configuration") +@JBossXmlSchema(xmlns = {@XmlNs(namespaceURI = "urn:jboss:portal:wsrp:producer:v2_7", prefix = "wpc")}, + ignoreUnresolvedFieldOrClass = false, + namespace = "urn:jboss:portal:wsrp:producer:v2_7", + elementFormDefault = XmlNsForm.QUALIFIED) +public class AnnotatedProducerConfiguration27MetaData +{ + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,73 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlValue; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class LocalizedStringMetaData +{ + + protected String value; + protected String lang; + protected String resourceName; + + @XmlValue + public String getValue() + { + return value; + } + + public void setValue(String value) + { + this.value = value; + } + + @XmlAttribute (name = "lang", namespace = javax.xml.XMLConstants.XML_NS_URI) + public String getLang() + { + return lang; + } + + public void setLang(String lang) + { + this.lang = lang; + } + + @XmlAttribute (name = "resourceName") + public String getResourceName() + { + return resourceName; + } + + public void setResourceName(String resourceName) + { + this.resourceName = resourceName; + } + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,51 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlRootElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +@XmlRootElement(name="producer-configuration", namespace="") +public class ProducerConfiguration26MetaData +{ + + protected RegistrationConfigurationMetaData registrationConfiguration; + + @XmlElement (name = "registration-configuration") + public RegistrationConfigurationMetaData getRegistrationConfiguration() + { + return registrationConfiguration; + } + + public void setRegistrationConfiguration(RegistrationConfigurationMetaData registrationConfiguration) + { + this.registrationConfiguration = registrationConfiguration; + } + + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,62 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class ProducerConfiguration27MetaData extends ProducerConfiguration26MetaData +{ + + protected boolean strictMode; + protected LocalizedStringMetaData description; + + + public boolean isStrictMode() + { + return strictMode; + } + + @XmlAttribute (name = "useStrictMode") + public void setStrictMode(boolean strictMode) + { + this.strictMode = strictMode; + } + + @XmlElement (name = "description") + public LocalizedStringMetaData getDescription() + { + return description; + } + + public void setDescription(LocalizedStringMetaData description) + { + this.description = description; + } + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,92 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import java.util.List; + +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class RegistrationConfigurationMetaData +{ + + protected Boolean fullServiceDescriptionRequiresRegistration; + protected String registrationPropertyValidator; + protected String RegistrationPolicy; + protected List<RegistrationPropertyDescriptorMetaData> registrationPropertyDescriptors; + + public RegistrationConfigurationMetaData() + { + this.fullServiceDescriptionRequiresRegistration = false; + } + + @XmlAttribute (name = "fullServiceDescriptionRequiresRegistration") + public Boolean getFullServiceDescriptionRequiresRegistration() + { + return fullServiceDescriptionRequiresRegistration; + } + + public void setFullServiceDescriptionRequiresRegistration(Boolean fullServiceDescriptionRequiresRegistration) + { + this.fullServiceDescriptionRequiresRegistration = fullServiceDescriptionRequiresRegistration; + } + + @XmlElement (name = "registration-property-validator") + public String getRegistrationPropertyValidator() + { + return registrationPropertyValidator; + } + + public void setRegistrationPropertyValidator(String registrationPropertyValidator) + { + this.registrationPropertyValidator = registrationPropertyValidator; + } + + @XmlElement (name = "registration-policy") + public String getRegistrationPolicy() + { + return RegistrationPolicy; + } + + public void setRegistrationPolicy(String registrationPolicy) + { + RegistrationPolicy = registrationPolicy; + } + + @XmlElement (name = "registration-property-description") + public List<RegistrationPropertyDescriptorMetaData> getRegistrationPropertyDescriptors() + { + return registrationPropertyDescriptors; + } + + public void setRegistrationPropertyDescriptors(List<RegistrationPropertyDescriptorMetaData> registrationPropertyDescriptors) + { + this.registrationPropertyDescriptors = registrationPropertyDescriptors; + } + +} + Added: modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.java =================================================================== --- modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.java (rev 0) +++ modules/metadata/trunk/wsrp/src/main/java/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.java 2009-04-20 17:40:51 UTC (rev 13235) @@ -0,0 +1,84 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2009, 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.metadata.wsrp.producer; + +import javax.xml.bind.annotation.XmlElement; + +/** + * @author <a href="mailto:mwringe@redhat.com">Matt Wringe</a> + * @version $Revision$ + */ +public class RegistrationPropertyDescriptorMetaData +{ + + protected String name; + protected String type; + protected LocalizedStringMetaData hint; + protected LocalizedStringMetaData label; + + @XmlElement (name = "name") + public String getName() + { + return name; + } + + public void setName(String name) + { + this.name = name; + } + + @XmlElement (name = "type") + public String getType() + { + return type; + } + + public void setType(String type) + { + this.type = type; + } + + @XmlElement (name = "hint") + public LocalizedStringMetaData getHint() + { + return hint; + } + + public void setHint(LocalizedStringMetaData hint) + { + this.hint = hint; + } + + @XmlElement (name = "label") + public LocalizedStringMetaData getLabel() + { + return label; + } + + public void setLabel(LocalizedStringMetaData label) + { + this.label = label; + } + +} + Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/AnnotatedConsumerDeploymentsMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/ConsumerDeploymentsMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/EndpointConfigMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/PropertyMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/RegistrationDataMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/consumer/WSRPProducerMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration26MetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/AnnotatedProducerConfiguration27MetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/LocalizedStringMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration26MetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/ProducerConfiguration27MetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/RegistrationConfigurationMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.class =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/classes/org/jboss/portal/metadata/wsrp/producer/RegistrationPropertyDescriptorMetaData.class ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/metadata-wsrp-trunk-SNAPSHOT-sources.jar =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/metadata-wsrp-trunk-SNAPSHOT-sources.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: modules/metadata/trunk/wsrp/target/metadata-wsrp-trunk-SNAPSHOT.jar =================================================================== (Binary files differ) Property changes on: modules/metadata/trunk/wsrp/target/metadata-wsrp-trunk-SNAPSHOT.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13234 - in branches/JBoss_Portal_Branch_2_7: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-04-20 13:23:04 -0400 (Mon, 20 Apr 2009) New Revision: 13234 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml Log: - JBEPP-65: Use onclick instead of onchange as IE does not register an 'OnChange' event until the mouse is clicked somewhere else on the page after having changed your radio/checkbox selection. This resulted in incorrect behavior for some immediate elements of forms. Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-20 17:19:11 UTC (rev 13233) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-20 17:23:04 UTC (rev 13234) @@ -1,3 +1,26 @@ + + <ui:composition template="objectTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -8,53 +31,56 @@ xmlns:c="http://java.sun.com/jstl/core"> <ui:param name="portalObjectScreen" value="#{bundle.COORDINATION_COORDINATION}"/> <ui:define name="content"> - <script type="text/javascript"> +<script type="text/javascript">  - </script> +</script> - <br/> +<br/> -  - <div class="tenpx-top"> - <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"> - <img id="aliasBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> - <a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS} - </h2> + +<div class="tenpx-top"> + <h2 class="portlet-area-header" onclick="toggle_visibility('aliasBindings');" style="cursor: pointer"> + <img id="aliasBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_ALIAS_BINDINGS}"/>#{bundle.COORDINATION_ALIAS_BINDINGS} + </h2> -  - <div id="aliasBindings" class="coordination-section"> - <h3 class="sectionTitle tenpx-bottom" style="margin-top: 3px;">#{bundle.COORDINATION_ALIAS_CREATE}</h3> - <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" rendered="#{empty aliasManager.availableRenderParameters}"/> - <h:form rendered="#{!empty aliasManager.availableRenderParameters}" id="create-alias-form"> - <div class="float-left tenpx-right"> - <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4> - <h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}" - immediate="true" onchange="this.form.submit()"> - <f:selectItems value="#{aliasManager.availableRenderParameters}"/> - </h:selectManyListbox> - </div> - <div class="float-left aliasBinding-step2"> - <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> - <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4> - <div class="full-width"> +  + <div id="aliasBindings" class="coordination-section"> + <h3 class="sectionTitle tenpx-bottom" style="margin-top: 3px;">#{bundle.COORDINATION_ALIAS_CREATE}</h3> + <h:outputText value="#{bundle.COORDINATION_ALIAS_CREATE_NO_PARAMS}" + rendered="#{empty aliasManager.availableRenderParameters}"/> + <h:form rendered="#{!empty aliasManager.availableRenderParameters}" id="create-alias-form"> + <div class="float-left tenpx-right"> + <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP1}</h4> + <h:selectManyListbox id="alias" size="5" value="#{aliasManager.originalQNames}" + immediate="true" onchange="this.form.submit()"> + <f:selectItems value="#{aliasManager.availableRenderParameters}"/> + </h:selectManyListbox> + </div> + <div class="float-left aliasBinding-step2"> + <h:panelGroup rendered="#{!empty aliasManager.originalQNames}"> + <h4>#{bundle.COORDINATION_ALIAS_CREATE_STEP2}</h4> + + <div class="full-width"> <span> <h:inputText id="aliasName" value="#{aliasManager.aliasName}"/> <h:message for="aliasName" errorClass="portlet-msg-error"/> @@ -65,146 +91,155 @@ <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{aliasManager.cancel}" styleClass="portlet-form-button"/> </span> - </div> - <div> + </div> + <div> + <ul class="bindingList"> + <ui:repeat var="selectedQNames" value="#{aliasManager.originalQNames}"> + <li>#{selectedQNames}</li> + </ui:repeat> + </ul> + </div> + </h:panelGroup> + </div> + <br class="clear"/> + </h:form> + +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_MANAGE_EXISTING}</h3> + <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" + rendered="#{empty aliasManager.displayAliasBindings}"/> + <h:form rendered="#{!empty aliasManager.displayAliasBindings}"> + <div class="float-left full-width"> + <h:dataTable var="binding" value="#{aliasManager.displayAliasBindings}" + rendered="true" styleClass="objectList datatable full-width" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="half-width" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet> + + <div class="bindingListContainer"> + <div class="bindingList-header">#{binding.name}</div> <ul class="bindingList"> - <ui:repeat var="selectedQNames" value="#{aliasManager.originalQNames}"> - <li>#{selectedQNames}</li> + <ui:repeat var="qname" value="#{binding.names}"> + <li>#{qname}</li> </ui:repeat> </ul> </div> - </h:panelGroup> - </div> - <br class="clear"/> - </h:form> - -  - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_ALIAS_MANAGE_EXISTING}</h3> - <h:outputText value="#{bundle.COORDINATION_ALIAS_EXISTING_NONE}" rendered="#{empty aliasManager.displayAliasBindings}"/> - <h:form rendered="#{!empty aliasManager.displayAliasBindings}"> - <div class="float-left full-width"> - <h:dataTable var="binding" value="#{aliasManager.displayAliasBindings}" - rendered="true" styleClass="objectList datatable full-width" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="half-width" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_NAME}</f:facet> - <div class="bindingListContainer"> - <div class="bindingList-header">#{binding.name}</div> - <ul class="bindingList"> - <ui:repeat var="qname" value="#{binding.names}"> - <li>#{qname}</li> - </ui:repeat> - </ul> - </div> - </h:column> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> - <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> - <f:param name="name" value="#{binding.name}"/> - <f:param name="type" value="alias"/> - </h:commandLink> - <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> - <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> - <f:param name="name" value="#{binding.name}"/> - <f:param name="type" value="alias"/> - </h:commandLink> - </h:panelGrid> - </h:column> - </h:dataTable> - </div> - <br class="clear"/> - </h:form> - </div> + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_ALIAS_EXISTING_ACTIONS}</f:facet> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="alias"/> + </h:commandLink> + <h:commandLink action="confirmCoordinationDeletion" actionListener="#{coordinationManager.select}"> + <h:outputText styleClass="actionDelete" value="#{bundle.COMMON_DELETE}"/> + <f:param name="name" value="#{binding.name}"/> + <f:param name="type" value="alias"/> + </h:commandLink> + </h:panelGrid> + </h:column> + </h:dataTable> + </div> + <br class="clear"/> + </h:form> </div> +</div> - <br/> - -  - <div class="tenpx-top-bottom"> - <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"> - <img id="parameterBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> - <a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS} - </h2> - <div id="parameterBindings" class="coordination-section"> - <h:form> - <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}" - onchange="this.form.submit()" immediate="true"/> - #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} - </h:form> +<br/> - <hr/> + +<div class="tenpx-top-bottom"> + <h2 class="portlet-area-header" onclick="toggle_visibility('parameterBindings');" style="cursor: pointer"> + <img id="parameterBindingsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_PARAMETER_BINDINGS}"/>#{bundle.COORDINATION_PARAMETER_BINDINGS} + </h2> -  - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> - <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" rendered="#{empty parameterManager.availableParameterWindowPairs}"/> - <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}" id="create-binding-form"> - <div class="float-left tenpx-right"> - <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> - <h:selectManyListbox id="parameterWindowPair" size="5" value="#{parameterManager.selectedParameterWindowPairs}" - immediate="true" onchange="this.form.submit()"> - <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/> - </h:selectManyListbox> - </div> + <div id="parameterBindings" class="coordination-section"> + <h:form> + <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}" + onclick="this.form.submit()" immediate="true"/> + #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} + </h:form> - <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}"> - <div class="float-left paramBinding-step2"> - <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> - <div class="full-width"> + <hr/> + +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_CREATE}</h3> + <h:outputText value="#{bundle.COORDINATION_PARAMETER_CREATE_NO_PAIRS}" + rendered="#{empty parameterManager.availableParameterWindowPairs}"/> + <h:form rendered="#{!empty parameterManager.availableParameterWindowPairs}" id="create-binding-form"> + <div class="float-left tenpx-right"> + <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP1}</h4> + <h:selectManyListbox id="parameterWindowPair" size="5" + value="#{parameterManager.selectedParameterWindowPairs}" + immediate="true" onchange="this.form.submit()"> + <f:selectItems value="#{parameterManager.availableParameterWindowPairs}"/> + </h:selectManyListbox> + </div> + + <h:panelGroup rendered="#{!empty parameterManager.selectedParameterWindowPairs}"> + <div class="float-left paramBinding-step2"> + <h4>#{bundle.COORDINATION_PARAMETER_CREATE_STEP2}</h4> + + <div class="full-width"> <span> <h:inputText id="bindingName" value="#{parameterManager.windowBindingName}"/> <h:message for="bindingName" errorClass="portlet-msg-error"/> </span> <span> <h:commandButton value="#{bundle.COORDINATION_PARAMETER_CREATE_CREATE}" - action="#{parameterManager.create}" styleClass="portlet-form-button"/> + action="#{parameterManager.create}" styleClass="portlet-form-button"/> <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{parameterManager.cancel}" styleClass="portlet-form-button"/> </span> - </div> </div> - </h:panelGroup> + </div> + </h:panelGroup> - <br class="clear"/> - </h:form> + <br class="clear"/> + </h:form> -  - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3> - <div class="float-left full-width"> - <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" rendered="#{empty parameterManager.displayParameterBindings}"/> - <h:form rendered="#{!empty parameterManager.displayParameterBindings}"> - <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}" - rendered="true" styleClass="objectList datatable full-width" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="ten-percent-width,half-width,quarter-width" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet> - <h4>#{binding.name}</h4> - </h:column> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet> - <div class="full-width"> - <ui:repeat var="pair" value="#{binding.parameterWindowPairs}"> - <div class="float-left pad5"> - <div class="paramList-header">#{pair.window.name}</div> - <ul class="paramList"> - <c:set var="pairname" value="#{fn:split(pair.name, ';')}" /> - <ui:repeat var="name" value="#{pairname}"> - <li>#{name}</li> - </ui:repeat> - </ul> - </div> - </ui:repeat> - </div> +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_PARAMETER_MANAGE_EXISTING}</h3> - </h:column> - <h:column> - <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + <div class="float-left full-width"> + <h:outputText value="#{bundle.COORDINATION_PARAMETER_EXISTING_NONE}" + rendered="#{empty parameterManager.displayParameterBindings}"/> + <h:form rendered="#{!empty parameterManager.displayParameterBindings}"> + <h:dataTable var="binding" value="#{parameterManager.displayParameterBindings}" + rendered="true" styleClass="objectList datatable full-width" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="ten-percent-width,half-width,quarter-width" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_NAME}</f:facet> + <h4>#{binding.name}</h4> + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_PAIRS}</f:facet> + + <div class="full-width"> + <ui:repeat var="pair" value="#{binding.parameterWindowPairs}"> + <div class="float-left pad5"> + <div class="paramList-header">#{pair.window.name}</div> + <ul class="paramList"> + <c:set var="pairname" value="#{fn:split(pair.name, ';')}"/> + <ui:repeat var="name" value="#{pairname}"> + <li>#{name}</li> + </ui:repeat> + </ul> + </div> + </ui:repeat> + </div> + + </h:column> + <h:column> + <f:facet name="header">#{bundle.COORDINATION_PARAMETER_EXISTING_ACTIONS}</f:facet> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="name" value="#{binding.name}"/> @@ -215,197 +250,207 @@ <f:param name="name" value="#{binding.name}"/> <f:param name="type" value="parameter"/> </h:commandLink> - </h:panelGrid> - </h:column> - </h:dataTable> - </h:form> - </div> - <br class="clear"/> + </h:panelGrid> + </h:column> + </h:dataTable> + </h:form> </div> + <br class="clear"/> </div> +</div> - <br/> +<br/> -  - <h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"> - <img id="eventWiringsDisc" src="/portal-admin/img/minus.gif" alt="-"/> - <a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS} - </h2> - <div id="eventWirings" class="coordination-section"> - <h:form> - <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" - onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} - </h:form> + +<h2 class="portlet-area-header" onclick="toggle_visibility('eventWirings');" style="cursor: pointer"> + <img id="eventWiringsDisc" src="/portal-admin/img/minus.gif" alt="-"/> + <a name="#{bundle.COORDINATION_EVENT_WIRINGS}"/>#{bundle.COORDINATION_EVENT_WIRINGS} +</h2> - <hr/> +<div id="eventWirings" class="coordination-section"> + <h:form> + <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" + onclick="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} + </h:form> -  - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> - <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> - <h:form rendered="#{!empty eventManager.sourceEvents}" id="create-wiring-form"> - <div class="half-width float-left"> + <hr/> + +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_CREATE}</h3> + <h:outputText value="#{bundle.COORDINATION_EVENT_CREATE_NO_EVENTS}" rendered="#{empty eventManager.sourceEvents}"/> + <h:form rendered="#{!empty eventManager.sourceEvents}" id="create-wiring-form"> + <div class="half-width float-left"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> + <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.sourceEvents}"/> + </h:selectOneListbox> + </div> + + <f:subview id="COORDINATION_EVENT_CREATE_STEP2" rendered="#{!empty eventManager.selectedSourceEvent}"> <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP1}</h4> - <h:selectOneListbox id="sourceEvent" size="5" value="#{eventManager.selectedSourceEvent}" immediate="true" + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP2}</h4> + + <div class="pad5"><h:graphicImage + url="/img/jbp-icon-set/event_source.gif"/> #{eventManager.selectedSourceEvent}</div> + <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" + immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.sourceWindows}"/> + </h:selectManyListbox> + </div> + </f:subview> + + <f:subview id="COORDINATION_EVENT_CREATE_STEP3" rendered="#{!empty eventManager.selectedSourceWindows}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4> + <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" + immediate="true" onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.sourceEvents}"/> + <f:selectItems value="#{eventManager.destinationEvents}"/> </h:selectOneListbox> </div> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP2" rendered="#{!empty eventManager.selectedSourceEvent}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP2}</h4> - <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_source.gif"/> #{eventManager.selectedSourceEvent}</div> - <h:selectManyListbox id="sourceWindows" size="5" value="#{eventManager.selectedSourceWindows}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.sourceWindows}"/> - </h:selectManyListbox> - </div> - </f:subview> + <f:subview id="COORDINATION_EVENT_CREATE_STEP4" rendered="#{!empty eventManager.selectedDestinationEvent}"> + <div class="full-width pad5"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP4}</h4> - <f:subview id="COORDINATION_EVENT_CREATE_STEP3" rendered="#{!empty eventManager.selectedSourceWindows}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP3}</h4> - <h:selectOneListbox id="destEvent" size="5" value="#{eventManager.selectedDestinationEvent}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.destinationEvents}"/> - </h:selectOneListbox> - </div> - </f:subview> + <div class="pad5"><h:graphicImage + url="/img/jbp-icon-set/event_dest.gif"/>#{eventManager.selectedDestinationEvent}</div> + <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" + immediate="true" + onchange="this.form.submit()"> + <f:selectItems value="#{eventManager.destinationWindows}"/> + </h:selectManyListbox> + </div> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP4" rendered="#{!empty eventManager.selectedDestinationEvent}"> - <div class="full-width pad5"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP4}</h4> - <div class="pad5"><h:graphicImage url="/img/jbp-icon-set/event_dest.gif"/>#{eventManager.selectedDestinationEvent}</div> - <h:selectManyListbox id="destWindows" size="5" value="#{eventManager.selectedDestinationWindows}" immediate="true" - onchange="this.form.submit()"> - <f:selectItems value="#{eventManager.destinationWindows}"/> - </h:selectManyListbox> - </div> - </f:subview> + <br class="clear"/> + </div> - <br class="clear"/> - </div> + <div class="half-width float-left event-wiring-preview"> + <f:subview id="sourceEventUI" rendered="#{!empty eventManager.selectedSourceEvent}"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW}</h4> - <div class="half-width float-left event-wiring-preview"> - <f:subview id="sourceEventUI" rendered="#{!empty eventManager.selectedSourceEvent}"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW}</h4> - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP1}</p> - <ul class="sourceEventList"> - <li>#{eventManager.selectedSourceEvent}</li> - </ul> - </f:subview> - <f:subview id="sourceWindowUI" rendered="#{!empty eventManager.selectedSourceWindows}" > - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP2}</p> - <ul class="sourceWindowList"> - <ui:repeat var="window" value="#{eventManager.selectedSourceWindows}"> - <li>#{window}</li> - </ui:repeat> - </ul> - </f:subview> - <f:subview id="destEventUI" rendered="#{!empty eventManager.selectedDestinationEvent}"> - <hr/> - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP3}</p> - <ul class="destEventList"> - <li>#{eventManager.selectedDestinationEvent}</li> - </ul> - </f:subview> - <f:subview id="destWindowUI" rendered="#{!empty eventManager.selectedDestinationWindows}"> - <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP4}</p> - <ul class="destWindowList"> - <ui:repeat var="window" value="#{eventManager.selectedDestinationWindows}"> - <li>#{window}</li> - </ui:repeat> - </ul> - </f:subview> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP1}</p> + <ul class="sourceEventList"> + <li>#{eventManager.selectedSourceEvent}</li> + </ul> + </f:subview> + <f:subview id="sourceWindowUI" rendered="#{!empty eventManager.selectedSourceWindows}"> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP2}</p> + <ul class="sourceWindowList"> + <ui:repeat var="window" value="#{eventManager.selectedSourceWindows}"> + <li>#{window}</li> + </ui:repeat> + </ul> + </f:subview> + <f:subview id="destEventUI" rendered="#{!empty eventManager.selectedDestinationEvent}"> + <hr/> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP3}</p> + <ul class="destEventList"> + <li>#{eventManager.selectedDestinationEvent}</li> + </ul> + </f:subview> + <f:subview id="destWindowUI" rendered="#{!empty eventManager.selectedDestinationWindows}"> + <p>#{bundle.COORDINATION_EVENT_CREATE_PREVIEW_STEP4}</p> + <ul class="destWindowList"> + <ui:repeat var="window" value="#{eventManager.selectedDestinationWindows}"> + <li>#{window}</li> + </ui:repeat> + </ul> + </f:subview> - <f:subview id="COORDINATION_EVENT_CREATE_STEP5" rendered="#{!empty eventManager.selectedDestinationWindows}"> - <div class="full-width createwiring-box"> - <div class="margin10"> - <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> - <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> - <h:message for="wiringName" errorClass="portlet-msg-error"/> - <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" - styleClass="portlet-form-button"/> - <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" - styleClass="portlet-form-button"/> - </div> + <f:subview id="COORDINATION_EVENT_CREATE_STEP5" rendered="#{!empty eventManager.selectedDestinationWindows}"> + <div class="full-width createwiring-box"> + <div class="margin10"> + <h4>#{bundle.COORDINATION_EVENT_CREATE_STEP5}</h4> + <h:inputText id="wiringName" value="#{eventManager.wiringName}"/> + <h:message for="wiringName" errorClass="portlet-msg-error"/> + <h:commandButton value="#{bundle.COORDINATION_EVENT_CREATE_CREATE}" action="#{eventManager.create}" + styleClass="portlet-form-button"/> + <h:commandButton value="#{bundle.COMMON_CANCEL}" action="#{eventManager.cancel}" + styleClass="portlet-form-button"/> </div> - </f:subview> + </div> + </f:subview> - <br class="clear"/> - </div> + <br class="clear"/> + </div> - </h:form> + </h:form> - <br class="clear"/> + <br class="clear"/> -  - <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> - <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" rendered="#{empty eventManager.displayEventWirings}"/> - <h:form rendered="#{!empty eventManager.displayEventWirings}"> - <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" - styleClass="objectList datatable" - rowClasses="portlet-section-body,portlet-section-alternate-blue" - columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" - headerClass="portlet-section-header"> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_NAME} - </f:facet> - #{wiring.name} - </h:column> +  + <h3 class="sectionTitle tenpx-top-bottom">#{bundle.COORDINATION_EVENT_MANAGE_EXISTING}</h3> + <h:outputText value="#{bundle.COORDINATION_EVENT_EXISTING_NONE}" + rendered="#{empty eventManager.displayEventWirings}"/> + <h:form rendered="#{!empty eventManager.displayEventWirings}"> + <h:dataTable var="wiring" value="#{eventManager.displayEventWirings}" + styleClass="objectList datatable" + rowClasses="portlet-section-body,portlet-section-alternate-blue" + columnClasses="ten-percent-width,quarter-width,quarter-width,ten-percent-width" + headerClass="portlet-section-header"> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_NAME} + </f:facet> + #{wiring.name} + </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} ⇒ #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} - </f:facet> - <ul class="sourceWindowList"> - <ui:repeat var="window" value="#{wiring.sourceWindows}"> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{window.id}"/> - #{window.name} - </h:commandLink> - </li> - </ui:repeat> - </ul> - <span style="display: block; text-align:center;">⇓</span> - <ul class="sourceEventList"> - <ui:repeat var="event" value="#{wiring.sourceEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> - </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} ⇐ #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} - </f:facet> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_WINDOWS} ⇒ #{bundle.COORDINATION_EVENT_EXISTING_SOURCE_EVENTS} + </f:facet> + <ul class="sourceWindowList"> + <ui:repeat var="window" value="#{wiring.sourceWindows}"> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> + <f:param name="id" value="#{window.id}"/> + #{window.name} + </h:commandLink> + </li> + </ui:repeat> + </ul> + <span style="display: block; text-align:center;">⇓</span> + <ul class="sourceEventList"> + <ui:repeat var="event" value="#{wiring.sourceEvents}"> + <li>#{event}</li> + </ui:repeat> + </ul> + </h:column> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_WINDOWS} ⇐ #{bundle.COORDINATION_EVENT_EXISTING_DESTINATION_EVENTS} + </f:facet> - <ul class="destWindowList"> - <ui:repeat var="window" value="#{wiring.destinationWindows}"> - <li> - <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> - <f:param name="id" value="#{window.id}"/> - #{window.name} - </h:commandLink> - </li> - </ui:repeat> - </ul> - <span style="display: block; text-align:center;">⇑</span> - <ul class="destEventList"> - <ui:repeat var="event" value="#{wiring.destinationEvents}"> - <li>#{event}</li> - </ui:repeat> - </ul> + <ul class="destWindowList"> + <ui:repeat var="window" value="#{wiring.destinationWindows}"> + <li> + <h:commandLink action="#{portalobjectmgr.selectObject}" styleClass="objectName"> + <f:param name="id" value="#{window.id}"/> + #{window.name} + </h:commandLink> + </li> + </ui:repeat> + </ul> + <span style="display: block; text-align:center;">⇑</span> + <ul class="destEventList"> + <ui:repeat var="event" value="#{wiring.destinationEvents}"> + <li>#{event}</li> + </ui:repeat> + </ul> - </h:column> - <h:column> - <f:facet name="header"> - #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} - </f:facet> - <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> + </h:column> + <h:column> + <f:facet name="header"> + #{bundle.COORDINATION_EVENT_EXISTING_ACTIONS} + </f:facet> + <h:panelGrid columns="2" cellpadding="0" cellspacing="0" border="0"> <h:commandLink action="renameCoordination" actionListener="#{coordinationManager.select}"> <h:outputText styleClass="actionRename" value="#{bundle.RENAME}"/> <f:param name="name" value="#{wiring.name}"/> @@ -416,11 +461,11 @@ <f:param name="name" value="#{wiring.name}"/> <f:param name="type" value="wiring"/> </h:commandLink> - </h:panelGrid> - </h:column> - </h:dataTable> - </h:form> - </div> + </h:panelGrid> + </h:column> + </h:dataTable> + </h:form> +</div> </ui:define> </ui:composition> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-04-20 17:19:11 UTC (rev 13233) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-04-20 17:23:04 UTC (rev 13234) @@ -1,3 +1,26 @@ + + <ui:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -7,197 +30,200 @@ <ui:define name="content"> -<hr/> + <hr/> -<h:form id="edit-cons-form"> -<table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}"> -<tr> - <th>#{i18n.edit_consumer_producer}</th> - <td> - <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/> - </td> -</tr> -<tr> - <th>#{i18n.edit_consumer_cache}</th> - <td> - <h:inputText id="cache" value="#{consumer.cache}"/> #{i18n.edit_consumer_cache_seconds} - <h:message styleClass="portlet-msg-error" for="cache"/> - </td> -</tr> -<tr> - <th>#{i18n.edit_consumer_endpoint}</th> - <td> - <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()" - valueChangeListener="#{consumer.useWSDLListener}" - immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} - <h:message styleClass="portlet-msg-error" for="useWSDL"/> - - <h:panelGroup rendered="#{consumer.useWSDL}"> - <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="portlet-msg-error" - for="wsdl"/> - </h:panelGroup> + <h:form id="edit-cons-form"> + <table width="100%" class="portlet-table-body #{consumer.active ? 'active' : 'inactive'}"> + <tr> + <th>#{i18n.edit_consumer_producer}</th> + <td> + <h:inputText id="id" value="#{consumer.id}"/> <h:message styleClass="portlet-msg-error" for="id"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_cache}</th> + <td> + <h:inputText id="cache" value="#{consumer.cache}"/> #{i18n.edit_consumer_cache_seconds} + <h:message styleClass="portlet-msg-error" for="cache"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_endpoint}</th> + <td> + <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onclick="this.form.submit()" + valueChangeListener="#{consumer.useWSDLListener}" + immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} + <h:message styleClass="portlet-msg-error" for="useWSDL"/> - <h:panelGroup rendered="#{!consumer.useWSDL}"> - <table border="0" class='portlet-table-body'> - <tr> - <th>#{i18n.edit_consumer_endpoint_sd}</th> - <td> - <h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message - styleClass="portlet-msg-error" for="sd"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint_m}</th> - <td> - <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message - styleClass="portlet-msg-error" for="m"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint_r}</th> - <td> - <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message - styleClass="portlet-msg-error" - for="r"/> - </td> - </tr> - <tr> - <th>#{i18n.edit_consumer_endpoint_pm}</th> - <td> - <h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message - styleClass="portlet-msg-error" for="pm"/> - </td> - </tr> - </table> - </h:panelGroup> - </td> -</tr> -<c:if test="#{consumer.localInfoPresent}"> -<tr> - <th>#{i18n.edit_consumer_registration}</th> - <td> - <c:choose> - <c:when test="#{consumer.localInfoPresent}"> - <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3> - <h:panelGroup styleClass="portlet-area-body"> - <c:choose> - <c:when test="#{consumer.registrationPropertiesEmpty}"> - <h:dataTable id="existingProps" - value="#{consumer.registrationProperties}" var="prop" - rowClasses="portlet-section-body,portlet-section-alternate" - columnClasses="nameColumn,descColumn," - headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" - styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}" - width="100%"> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet> - #{prop.name} - </h:column> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet> - #{prop.description.label.value} - </h:column> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> -  - <h:inputText id="prop-value-input" value="#{prop.value}" size="50" - valueChangeListener="#{consumer.regPropListener}" - disabled="#{consumer.registrationModified}"/> - <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" - rendered="#{prop.determinedInvalid}" - converter="faces.convert.RegistrationProperty.Status"/> - </h:column> - </h:dataTable> - <h:commandLink id="cons-update-link" action="#{consumer.update}" - value="#{i18n.edit_consumer_registration_update_props}" - rendered="#{consumer.registered}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - </c:when> - <c:otherwise> - #{i18n.edit_consumer_registration_no_props} - </c:otherwise> - </c:choose> - <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - rendered="#{consumer.registrationLocallyModified}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - <br style="clear:both;"/> - </h:panelGroup> + <h:panelGroup rendered="#{consumer.useWSDL}"> + <h:inputText id="wsdl" size="70" value="#{consumer.wsdl}"/> <h:message styleClass="portlet-msg-error" + for="wsdl"/> + </h:panelGroup> - <br/> + <h:panelGroup rendered="#{!consumer.useWSDL}"> + <table border="0" class='portlet-table-body'> + <tr> + <th>#{i18n.edit_consumer_endpoint_sd}</th> + <td> + <h:inputText id="sd" size="70" value="#{consumer.serviceDescription}"/> <h:message + styleClass="portlet-msg-error" for="sd"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_endpoint_m}</th> + <td> + <h:inputText id="m" size="70" value="#{consumer.markup}"/> <h:message + styleClass="portlet-msg-error" for="m"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_endpoint_r}</th> + <td> + <h:inputText id="r" size="70" value="#{consumer.registration}"/> <h:message + styleClass="portlet-msg-error" + for="r"/> + </td> + </tr> + <tr> + <th>#{i18n.edit_consumer_endpoint_pm}</th> + <td> + <h:inputText id="pm" size="70" value="#{consumer.portletManagement}"/> <h:message + styleClass="portlet-msg-error" for="pm"/> + </td> + </tr> + </table> + </h:panelGroup> + </td> + </tr> + <c:if test="#{consumer.localInfoPresent}"> + <tr> + <th>#{i18n.edit_consumer_registration}</th> + <td> + <c:choose> + <c:when test="#{consumer.localInfoPresent}"> + <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_current}</h3> + <h:panelGroup styleClass="portlet-area-body"> + <c:choose> + <c:when test="#{consumer.registrationPropertiesEmpty}"> + <h:dataTable id="existingProps" + value="#{consumer.registrationProperties}" var="prop" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="nameColumn,descColumn," + headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" + styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}" + width="100%"> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet> + #{prop.name} + </h:column> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet> + #{prop.description.label.value} + </h:column> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> +  + <h:inputText id="prop-value-input" value="#{prop.value}" size="50" + valueChangeListener="#{consumer.regPropListener}" + disabled="#{consumer.registrationModified}"/> + <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" + rendered="#{prop.determinedInvalid}" + converter="faces.convert.RegistrationProperty.Status"/> + </h:column> + </h:dataTable> + <h:commandLink id="cons-update-link" action="#{consumer.update}" + value="#{i18n.edit_consumer_registration_update_props}" + rendered="#{consumer.registered}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + </c:when> + <c:otherwise> + #{i18n.edit_consumer_registration_no_props} + </c:otherwise> + </c:choose> + <h:commandLink id="modify-reg-link" action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + rendered="#{consumer.registrationLocallyModified}" + title="#{i18n.edit_consumer_registration_modify_title}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + <br style="clear:both;"/> + </h:panelGroup> - <c:if test="#{consumer.registrationModified}"> - <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3> - <h:panelGroup styleClass="portlet-area-body"> - <c:choose> - <c:when test="#{consumer.expectedRegistrationPropertiesEmpty}"> - <h:dataTable id="expectedProps" - value="#{consumer.expectedRegistrationProperties}" var="prop" - rowClasses="portlet-section-body,portlet-section-alternate" - columnClasses="nameColumn,descColumn," - headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" - styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}" - width="100%"> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet> - #{prop.name} - </h:column> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet> - #{prop.description.label.value} - </h:column> - <h:column> - <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> - <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/> - <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" - rendered="#{prop.determinedInvalid}" - converter="faces.convert.RegistrationProperty.Status"/> - </h:column> - </h:dataTable> + <br/> + + <c:if test="#{consumer.registrationModified}"> + <h3 class="portlet-area-header">#{i18n.edit_consumer_registration_expected}</h3> + <h:panelGroup styleClass="portlet-area-body"> + <c:choose> + <c:when test="#{consumer.expectedRegistrationPropertiesEmpty}"> + <h:dataTable id="expectedProps" + value="#{consumer.expectedRegistrationProperties}" var="prop" + rowClasses="portlet-section-body,portlet-section-alternate" + columnClasses="nameColumn,descColumn," + headerClass="portlet-section-header #{consumer.active ? 'active' : 'inactive'}" + styleClass="registration-prop-table #{consumer.active ? 'active' : 'inactive'}" + width="100%"> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_name}</f:facet> + #{prop.name} + </h:column> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_desc}</f:facet> + #{prop.description.label.value} + </h:column> + <h:column> + <f:facet name="header">#{i18n.edit_consumer_prop_value}</f:facet> + <h:inputText id="prop-value-input" value="#{prop.value}" size="50"/> + <h:outputText styleClass="portlet-msg-error" value="#{prop.status}" + rendered="#{prop.determinedInvalid}" + converter="faces.convert.RegistrationProperty.Status"/> + </h:column> + </h:dataTable> + </c:when> + <c:otherwise> + #{i18n.edit_consumer_registration_no_props} + </c:otherwise> + </c:choose> + <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" + value="#{i18n.edit_consumer_registration_modify}" + title="#{i18n.edit_consumer_registration_modify_title}" + styleClass="portlet-form-button portlet-section-buttonrow"/> + <br style="clear:both;"/> + </h:panelGroup> + </c:if> </c:when> - <c:otherwise> - #{i18n.edit_consumer_registration_no_props} - </c:otherwise> + <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}"> + #{i18n.edit_consumer_no_registration} + </c:when> </c:choose> - <h:commandLink id="edit-reg-link" action="#{consumer.modifyRegistration}" - value="#{i18n.edit_consumer_registration_modify}" - title="#{i18n.edit_consumer_registration_modify_title}" - styleClass="portlet-form-button portlet-section-buttonrow"/> - <br style="clear:both;"/> - </h:panelGroup> + </td> + </tr> + <c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}"> + <tr> + <th>#{i18n.edit_consumer_registration_context}</th> + <td id="handle"> + #{i18n.edit_consumer_registration_context_handle} <h:outputText + value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> + <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" + value="#{i18n.edit_consumer_registration_context_erase}" + title="#{i18n.edit_consumer_registration_context_erase_title}" + styleClass="portlet-form-button"/> + </td> + </tr> </c:if> - </c:when> - <c:when test="#{consumer.registrationChecked and !consumer.registrationRequired}"> - #{i18n.edit_consumer_no_registration} - </c:when> - </c:choose> - </td> -</tr> -<c:if test="#{!empty consumer.producerInfo.registrationInfo.registrationHandle}"> - <tr> - <th>#{i18n.edit_consumer_registration_context}</th> - <td id="handle"> - #{i18n.edit_consumer_registration_context_handle} <h:outputText - value="#{consumer.producerInfo.registrationInfo.registrationHandle}"/> - <h:commandLink id="erase-cons-link" action="confirmEraseRegistration" value="#{i18n.edit_consumer_registration_context_erase}" - title="#{i18n.edit_consumer_registration_context_erase_title}" - styleClass="portlet-form-button"/> - </td> - </tr> -</c:if> -</c:if> -<tr> - <th/> - <td class="portlet-section-buttonrow"> - <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" value="#{i18n.edit_consumer_refresh}" - title="#{i18n.edit_consumer_refresh_title}" - styleClass="portlet-form-button"/> - <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" value="#{i18n.edit_consumer_cancel}" immediate="true" - styleClass="portlet-form-button"/> - </td> -</tr> -</table> -</h:form> + </c:if> + <tr> + <th/> + <td class="portlet-section-buttonrow"> + <h:commandButton id="refresh-cons-link" action="#{consumer.refreshConsumer}" + value="#{i18n.edit_consumer_refresh}" + title="#{i18n.edit_consumer_refresh_title}" + styleClass="portlet-form-button"/> + <h:commandLink id="list-cons-link" action="#{consumersMgr.listConsumers}" + value="#{i18n.edit_consumer_cancel}" immediate="true" + styleClass="portlet-form-button"/> + </td> + </tr> + </table> + </h:form> </ui:define> </ui:decorate> Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2009-04-20 17:19:11 UTC (rev 13233) +++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2009-04-20 17:23:04 UTC (rev 13234) @@ -1,3 +1,26 @@ + + <ui:decorate template="producerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" @@ -9,13 +32,14 @@ <ui:define name="content"> <h:form id="producer-form"> <h:panelGrid columns="2" width="100%"> - <h:selectBooleanCheckbox id="cons-reg-req-check" value="#{producer.registrationRequiredForFullDescription}"/> + <h:selectBooleanCheckbox id="cons-reg-req-check" + value="#{producer.registrationRequiredForFullDescription}"/> <h:outputText value="#{i18n.producer_config_sd_requires_reg}"/> <h:selectBooleanCheckbox value="#{producer.strictMode}"/> <h:outputText value="#{i18n.producer_config_strict}"/> - - <h:selectBooleanCheckbox id="req-reg-check" value="#{producer.registrationRequired}" immediate="true" - onchange="this.form.submit()" + + <h:selectBooleanCheckbox id="req-reg-check" value="#{producer.registrationRequired}" immediate="true" + onclick="this.form.submit()" valueChangeListener="#{producer.requireRegistrationListener}"/> <h:outputText value="#{i18n.producer_config_requires_reg}"/> @@ -87,7 +111,8 @@ <h:panelGroup styleClass="portlet-section-buttonrow"> <h:commandButton id="save-producer" action="#{producer.save}" value="#{i18n.producer_config_save}" styleClass="portlet-form-button"/> - <h:commandButton id="reload-producer" action="#{producer.reloadConfiguration}" value="#{i18n.producer_config_cancel}" + <h:commandButton id="reload-producer" action="#{producer.reloadConfiguration}" + value="#{i18n.producer_config_cancel}" styleClass="portlet-form-button"/> </h:panelGroup> </h:panelGrid>

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13233 - in tags/Enterprise_Portal_Platform_4_3_GA_CP01: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-04-20 13:19:11 -0400 (Mon, 20 Apr 2009) New Revision: 13233 Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml Log: - JBEPP-65: Use onclick instead of onchange as IE does not register an 'OnChange' event until the mouse is clicked somewhere else on the page after having changed your radio/checkbox selection. This resulted in incorrect behavior for some immediate elements of forms. Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-20 17:03:03 UTC (rev 13232) +++ tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-20 17:19:11 UTC (rev 13233) @@ -1,3 +1,25 @@ + <ui:composition template="objectTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -129,7 +151,7 @@ <div id="parameterBindings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}" - onchange="this.form.submit()" immediate="true"/> + onclick="this.form.submit()" immediate="true"/> #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} </h:form> @@ -228,7 +250,7 @@ <div id="eventWirings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" - onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} + onclick="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} </h:form> <hr/> Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-04-20 17:03:03 UTC (rev 13232) +++ tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-04-20 17:19:11 UTC (rev 13233) @@ -1,3 +1,25 @@ + <ui:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -27,7 +49,7 @@ <tr> <th>#{i18n.edit_consumer_endpoint}</th> <td> - <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()" + <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onclick="this.form.submit()" valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} <h:message styleClass="portlet-msg-error" for="useWSDL"/> Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2009-04-20 17:03:03 UTC (rev 13232) +++ tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2009-04-20 17:19:11 UTC (rev 13233) @@ -1,3 +1,25 @@ + <ui:decorate template="producerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" @@ -15,7 +37,7 @@ <h:outputText value="#{i18n.producer_config_strict}"/> <h:selectBooleanCheckbox id="req-reg-check" value="#{producer.registrationRequired}" immediate="true" - onchange="this.form.submit()" + onclick="this.form.submit()" valueChangeListener="#{producer.requireRegistrationListener}"/> <h:outputText value="#{i18n.producer_config_requires_reg}"/>

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13232 - in branches/Enterprise_Portal_Platform_4_3: core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers and 1 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2009-04-20 13:03:03 -0400 (Mon, 20 Apr 2009) New Revision: 13232 Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml Log: - JBEPP-65: Use onclick instead of onchange as IE does not register an 'OnChange' event until the mouse is clicked somewhere else on the page after having changed your radio/checkbox selection. This resulted in incorrect behavior for some immediate elements of forms. Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-20 14:01:17 UTC (rev 13231) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/jsf/editCoordination.xhtml 2009-04-20 17:03:03 UTC (rev 13232) @@ -1,3 +1,25 @@ + <ui:composition template="objectTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -129,7 +151,7 @@ <div id="parameterBindings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitBinding" value="#{coordinationManager.explicitParametersUsed}" - onchange="this.form.submit()" immediate="true"/> + onclick="this.form.submit()" immediate="true"/> #{bundle.COORDINATION_PARAMETER_EXPLICIT_MODE} </h:form> @@ -228,7 +250,7 @@ <div id="eventWirings" class="coordination-section"> <h:form> <h:selectBooleanCheckbox id="useExplicitEvents" value="#{coordinationManager.explicitEventsUsed}" - onchange="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} + onclick="this.form.submit()" immediate="true"/>#{bundle.COORDINATION_EVENT_EXPLICIT_MODE} </h:form> <hr/> Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-04-20 14:01:17 UTC (rev 13231) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/consumers/editConsumer.xhtml 2009-04-20 17:03:03 UTC (rev 13232) @@ -1,3 +1,25 @@ + <ui:decorate template="consumerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:f="http://java.sun.com/jsf/core" xmlns:ui="http://java.sun.com/jsf/facelets" @@ -27,7 +49,7 @@ <tr> <th>#{i18n.edit_consumer_endpoint}</th> <td> - <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onchange="this.form.submit()" + <h:selectBooleanCheckbox id="useWSDL" value="#{consumer.useWSDL}" onclick="this.form.submit()" valueChangeListener="#{consumer.useWSDLListener}" immediate="true"/>#{i18n.edit_consumer_endpoint_wsdl} <h:message styleClass="portlet-msg-error" for="useWSDL"/> Modified: branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2009-04-20 14:01:17 UTC (rev 13231) +++ branches/Enterprise_Portal_Platform_4_3/core-wsrp/src/resources/portal-wsrp-admin-war/jsf/producer/producer.xhtml 2009-04-20 17:03:03 UTC (rev 13232) @@ -1,3 +1,25 @@ + <ui:decorate template="producerTemplate.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:h="http://java.sun.com/jsf/html" @@ -15,7 +37,7 @@ <h:outputText value="#{i18n.producer_config_strict}"/> <h:selectBooleanCheckbox id="req-reg-check" value="#{producer.registrationRequired}" immediate="true" - onchange="this.form.submit()" + onclick="this.form.submit()" valueChangeListener="#{producer.requireRegistrationListener}"/> <h:outputText value="#{i18n.producer_config_requires_reg}"/>

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13231 - in branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium: cms and 1 other directories.

by portal-commits＠lists.jboss.org

Author: vrockai Date: 2009-04-20 10:01:17 -0400 (Mon, 20 Apr 2009) New Revision: 13231 Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java Log: [selenium] - fixing failing tests Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-04-20 07:05:37 UTC (rev 13230) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-04-20 14:01:17 UTC (rev 13231) @@ -14,7 +14,7 @@ @Test(groups = { "cms_dashboard" }, enabled = true, description = "Dashboard issues test case.") public class DashboardTestCase extends JBossPortalSeleniumTestCase { - private static final String MSG_POWER = "Powered by JBoss Enterprise Portal Platform"; + private static final String MSG_POWER = "Powered by JBoss"; /** prefix for locator properties = dash. */ public String casePfx = "dash."; @@ -74,7 +74,7 @@ selenium.click(LNK_DASHBOARD); selenium.setSpeed("5000"); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); @@ -105,7 +105,7 @@ // firstly create page selenium.click(LNK_DASHBOARD); - wait(5000); + waitFor(AJAX_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); selenium.waitForPageToLoad(PAGE_LOAD); @@ -149,7 +149,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selectIfNotSelected(SEL_PAGE, "DashTestPage"); @@ -183,7 +183,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selenium.windowMaximize(); selectIfNotSelected(SEL_PAGE, "DashTestPage"); @@ -217,7 +217,7 @@ selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selectIfNotSelected(SEL_PAGE, "DashTestPage"); selenium.click(LINK_PORTL2); selenium.waitForPageToLoad(PAGE_LOAD); @@ -255,7 +255,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selenium.type(INP_PAGENAME, pageName); selenium.click(SUB_CREATEPAGE); @@ -302,7 +302,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selectIfNotSelected(SEL_PAGE, pageName); selenium.addSelection(SEL_CENTER_REGION, OPT_PORTL1); @@ -331,7 +331,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selectIfNotSelected(SEL_PAGE, "DashTestPage"); @@ -361,7 +361,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selectIfNotSelected(SEL_PAGE, "DashTestPage"); selenium.select(SEL_CONTENT_TYPE, "label=widget/google"); selenium.waitForPageToLoad(PAGE_LOAD); @@ -406,7 +406,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selenium.type(INP_PAGENAME, pageName); selenium.click(SUB_CREATEPAGE); selenium.waitForPageToLoad(PAGE_LOAD); @@ -455,7 +455,7 @@ selenium.waitForPageToLoad(PAGE_LOAD); selenium.click(LNK_CONFIGURE_DASHBOARD); // selenium.waitForPageToLoad(PAGE_LOAD); - wait(5000); + waitFor(AJAX_LOAD); selectIfNotSelected(SEL_PAGE, pageName); Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-04-20 07:05:37 UTC (rev 13230) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-04-20 14:01:17 UTC (rev 13231) @@ -18,6 +18,11 @@ //TODO tests testing write and manage security are missing @Test(groups = { "cms_secure" }, enabled = true, description = "Setting permissions on the default portlet.") public class CMSSecureTestCase extends JBossPortalSeleniumTestCase { + /** + * + */ + private static final String MSG_ACCESS_DENIED = "You are not allowed to access the resource"; + private final String casePfx = "cms.sec."; private final String LNK_EXPLORE = getProp(casePfx + "lnk.explore", "//area[@href='/portal/content/default/epp.html']"); @@ -129,7 +134,7 @@ public void testSetAdminReadPer() { login("admin", "admin"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied"), "Non secured resource is not visible.#1"); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED), "Non secured resource is not visible.#1"); Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"), "Non secured resource is not visible.#2"); @@ -153,14 +158,14 @@ logout(); - Assert.assertTrue(selenium.isTextPresent("Access to this resource is denied"), "Secured resource is visible.#1"); + Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED), "Secured resource is visible.#1"); login("user", "user"); - Assert.assertTrue(selenium.isTextPresent("Access to this resource is denied"), "Secured resource is visible.#2"); + Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED), "Secured resource is visible.#2"); logout(); login("admin", "admin"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied"), "Secured resource is visible.#2"); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED), "Secured resource is visible.#2"); } /** @@ -178,7 +183,7 @@ login("admin", "admin"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied"), "Non secured resource is not visible.#1"); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED), "Non secured resource is not visible.#1"); Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"), "Non secured resource is not visible.#2"); @@ -222,10 +227,10 @@ logout(); - Assert.assertTrue(selenium.isTextPresent("Access to this resource is denied "), "Secured resource is visible.#1"); + Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED), "Secured resource is visible.#1"); login("user", "user"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied "), "Secured resource is visible.#2"); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED), "Secured resource is visible.#2"); logout(); } @@ -243,7 +248,7 @@ assignRole("user", "user(a)portal.com", "secRole", "secRoleDisp"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied"), "Non secured resource is not visible.#1"); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED), "Non secured resource is not visible.#1"); Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html"), "Non secured resource is not visible.#2"); @@ -264,10 +269,10 @@ logout(); - Assert.assertTrue(selenium.isTextPresent("Access to this resource is denied"), "Secured resource is visible after logout."); + Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED), "Secured resource is visible after logout."); login("user", "user"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied"), "Non secured resource is not visible for the \"user\"."); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED), "Non secured resource is not visible for the \"user\"."); logout(); } @@ -284,7 +289,7 @@ deassignRole("user", "user(a)portal.com", "secRole", "secRoleDisp"); - Assert.assertFalse(selenium.isTextPresent("Access to this resource is denied")); + Assert.assertFalse(selenium.isTextPresent(MSG_ACCESS_DENIED)); Assert.assertFalse(selenium.isTextPresent("You are not allowed to access the following resource - /default/index.html")); selenium.click(LNK_ADMIN); @@ -304,11 +309,11 @@ logout(); - Assert.assertTrue(selenium.isTextPresent("Access to this resource is denied")); + Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED)); login("user", "user"); - Assert.assertTrue(selenium.isTextPresent("Access to this resource is denied")); + Assert.assertTrue(selenium.isTextPresent(MSG_ACCESS_DENIED)); logout(); } Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-04-20 07:05:37 UTC (rev 13230) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/locator.properties 2009-04-20 14:01:17 UTC (rev 13231) @@ -433,6 +433,11 @@ portal.e2e.pag.tl.coord=//a[contains(@id,''pages-datatable:{0}:edit-coord'')] portal.e2e.div.por.cont=content-container +portal.e2e.inp.goo.search=query-input +portal.e2e.sub.goo.search=submit-button +portal.e2e.inp.net.search=//div[@id='bilto']/div/div[3]/form/input[1] +portal.e2e.sub.net.search=//div[@id='bilto']/div/div[3]/form/input[2] + # PortalSamplesTestCase samples.ses.lnk.invalidate=link=invalidate Modified: branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-20 07:05:37 UTC (rev 13230) +++ branches/JBoss_Portal_Branch_2_7/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/EndtoEndPortalAdminTestCase.java 2009-04-20 14:01:17 UTC (rev 13231) @@ -57,8 +57,8 @@ private final String DIV_PORT_CONTENT = getProp(casePfx + "div.por.cont", "conrrerertent-container"); private final String INP_GOO_SEARCH = getProp(casePfx + "inp.goo.search", "//div[contains(@id,'directory_search_div')]/form/input[@name='query']"); private final String SUB_GOO_SEARCH = getProp(casePfx + "sup.goo.search", "//div[contains(@id,'directory_search_div')]/form/input[@type='submit']"); - private final String INP_NET_SEARCH = getProp(casePfx + "inp.goo.search", "//div[contains(@id,'directory_search_div')]/form/input[@name='query']"); - private final String SUB_NET_SEARCH = getProp(casePfx + "sub.goo.search", "//div[contains(@id,'directory_search_div')]/form/input[@type='submit']"); + private final String INP_NET_SEARCH = getProp(casePfx + "inp.net.search", "//div[contains(@id,'directory_search_div')]/form/input[@name='query']"); + private final String SUB_NET_SEARCH = getProp(casePfx + "sub.net.search", "//div[contains(@id,'directory_search_div')]/form/input[@type='submit']"); @BeforeMethod(groups = { "log" }) protected void loginBeforeTest() {

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13230 - in tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src: resources/portal-admin-war/WEB-INF/tags and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2009-04-20 03:05:37 -0400 (Mon, 20 Apr 2009) New Revision: 13230 Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml Log: [theute@localhost core-admin]$ svn merge -r 13227:13228 https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7 Skipped missing target: 'core-admin/src/bin/portal-admin-war/css/boxes.css' Skipped missing target: 'core-admin/src/bin/portal-admin-war/css' Skipped missing target: 'core-admin/src/bin/portal-admin-war' Skipped missing target: 'core-admin/src/bin' Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml' Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF/tags' Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF' Skipped missing target: 'core-admin/src/resources/portal-admin-war' Skipped missing target: 'core-admin/src/resources' Skipped missing target: 'core-admin/src' Skipped missing target: 'core-admin' [theute@localhost core-admin]$ svn merge -r 13227:13228 https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-... --- Merging r13228 into '.': U src/bin/portal-admin-war/css/boxes.css U src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml [theute@localhost core-admin]$ svn commit Sending core-admin/src/bin/portal-admin-war/css/boxes.css Sending core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml cd Transmitting file data ..../.. Committed revision 13229. s[theute@localhost core-admin]$ cd ../.. [theute@localhost tmp]$ cd Enterprise_Portal_Platform_4_3_GA_CP01/ [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn update U core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectTestCase.java Updated to revision 13229. [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn merge -r 13227:13228 https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-... ^Csvn: OPTIONS of 'https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-...': SSL negotiation failed: SSL error: Function was interrupted. (https://svn.jboss.org) [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ cd core-admin [theute@localhost core-admin]$ svn merge -r 13227:13228 https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7 Skipped missing target: 'core-admin/src/bin/portal-admin-war/css/boxes.css' Skipped missing target: 'core-admin/src/bin/portal-admin-war/css' Skipped missing target: 'core-admin/src/bin/portal-admin-war' Skipped missing target: 'core-admin/src/bin' Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml' Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF/tags' Skipped missing target: 'core-admin/src/resources/portal-admin-war/WEB-INF' Skipped missing target: 'core-admin/src/resources/portal-admin-war' Skipped missing target: 'core-admin/src/resources' Skipped missing target: 'core-admin/src' Skipped missing target: 'core-admin' [theute@localhost core-admin]$ svn merge -r 13227:13228 https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-... --- Merging r13228 into '.': U src/bin/portal-admin-war/css/boxes.css U src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml [theute@localhost core-admin]$ svn commit Sending core-admin/src/bin/portal-admin-war/css/boxes.css Sending core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml cd Transmitting file data ..../.. Committed revision 13229. s[theute@localhost core-admin]$ cd ../.. [theute@localhost tmp]$ cd Enterprise_Portal_Platform_4_3_GA_CP01/ [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn update U core/src/main/org/jboss/portal/test/core/model/portal/PortalObjectTestCase.java Updated to revision 13229. [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ svn merge -r 13227:13228 https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-... ^Csvn: OPTIONS of 'https://svn.jboss.org/repos/portal/branches/JBoss_Portal_Branch_2_7/core-...': SSL negotiation failed: SSL error: Function was interrupted. (https://svn.jboss.org) [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ [theute@localhost Enterprise_Portal_Platform_4_3_GA_CP01]$ cd core-admin JBQA-2181: Portlet Definition page looks bad in IE6 Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-20 06:52:54 UTC (rev 13229) +++ tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-20 07:05:37 UTC (rev 13230) @@ -19,8 +19,7 @@ .whiteWithLtGreyHeader .box-header, .whiteWithLtGreyHeader .box-footer{ - padding: 0 7px 0 7px; - position: relative; + /*padding: 0 7px 0 7px;*/ } .whiteWithLtGreyHeader .img-top-left{ @@ -51,7 +50,6 @@ border-top:1px solid #a5a5a5; background-color:#ececec; width: 100%; - height:6px; } .whiteWithLtGreyHeader .box-content{ @@ -62,7 +60,7 @@ .whiteWithLtGreyHeader .box-footer-content{ border-bottom:1px solid #a5a5a5; width: 100%; - height:6px; + /*height:6px;*/ } Modified: tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml =================================================================== --- tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-20 06:52:54 UTC (rev 13229) +++ tags/Enterprise_Portal_Platform_4_3_GA_CP01/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-20 07:05:37 UTC (rev 13230) @@ -5,19 +5,19 @@ <div class="#{class == null ? 'greyRounded' : class}"> <div class="box-header"> - <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/> +  <div class="box-header-content"> </div> - <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/> +  </div> <div class="box-content"> <ui:insert/> </div> <div class="box-footer"> - <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/> +  <div class="box-footer-content"> </div> - <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/> +  </div> </div>

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13229 - in branches/Enterprise_Portal_Platform_4_3/core-admin/src: resources/portal-admin-war/WEB-INF/tags and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2009-04-20 02:52:54 -0400 (Mon, 20 Apr 2009) New Revision: 13229 Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/css/boxes.css branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml Log: JBQA-2181: Portlet Definition page looks bad in IE6 Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/css/boxes.css =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-18 20:08:39 UTC (rev 13228) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-20 06:52:54 UTC (rev 13229) @@ -19,8 +19,7 @@ .whiteWithLtGreyHeader .box-header, .whiteWithLtGreyHeader .box-footer{ - padding: 0 7px 0 7px; - position: relative; + /*padding: 0 7px 0 7px;*/ } .whiteWithLtGreyHeader .img-top-left{ @@ -51,7 +50,6 @@ border-top:1px solid #a5a5a5; background-color:#ececec; width: 100%; - height:6px; } .whiteWithLtGreyHeader .box-content{ @@ -62,7 +60,7 @@ .whiteWithLtGreyHeader .box-footer-content{ border-bottom:1px solid #a5a5a5; width: 100%; - height:6px; + /*height:6px;*/ } Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml =================================================================== --- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-18 20:08:39 UTC (rev 13228) +++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-20 06:52:54 UTC (rev 13229) @@ -5,19 +5,19 @@ <div class="#{class == null ? 'greyRounded' : class}"> <div class="box-header"> - <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/> +  <div class="box-header-content"> </div> - <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/> +  </div> <div class="box-content"> <ui:insert/> </div> <div class="box-footer"> - <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/> +  <div class="box-footer-content"> </div> - <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/> +  </div> </div>

15 years, 2 months

1
0
0 / 0

JBoss Portal SVN: r13228 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF/tags and 1 other directory.

by portal-commits＠lists.jboss.org

Author: wesleyhales Date: 2009-04-18 16:08:39 -0400 (Sat, 18 Apr 2009) New Revision: 13228 Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml Log: make portlet instance meta-info corners square until ie6 bug is solved Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-17 21:46:06 UTC (rev 13227) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/css/boxes.css 2009-04-18 20:08:39 UTC (rev 13228) @@ -19,8 +19,7 @@ .whiteWithLtGreyHeader .box-header, .whiteWithLtGreyHeader .box-footer{ - padding: 0 7px 0 7px; - position: relative; + /*padding: 0 7px 0 7px;*/ } .whiteWithLtGreyHeader .img-top-left{ @@ -51,7 +50,6 @@ border-top:1px solid #a5a5a5; background-color:#ececec; width: 100%; - height:6px; } .whiteWithLtGreyHeader .box-content{ @@ -62,7 +60,7 @@ .whiteWithLtGreyHeader .box-footer-content{ border-bottom:1px solid #a5a5a5; width: 100%; - height:6px; + /*height:6px;*/ } Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-17 21:46:06 UTC (rev 13227) +++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2009-04-18 20:08:39 UTC (rev 13228) @@ -5,19 +5,19 @@ <div class="#{class == null ? 'greyRounded' : class}"> <div class="box-header"> - <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/> +  <div class="box-header-content"> </div> - <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/> +  </div> <div class="box-content"> <ui:insert/> </div> <div class="box-footer"> - <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/> +  <div class="box-footer-content"> </div> - <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/> +  </div> </div>

15 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits April 2009