Author: chris.laprun(a)jboss.com Date: 2010-01-06 18:36:01 -0500 (Wed, 06 Jan 2010) New Revision: 1188 Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java portal/trunk/pom.xml portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java Log: - Upgraded to WSRP 1.0.0-Beta04. - Do not persist Consumer's status as it is now computed from its registrations. - Added implementation of internalSaveChanges so that changes to Consumers can be persisted properly. - Added ability to set timeout duration on WS operations for consumers. - Started fixing UIWsrpProducerOverview. Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-01-06 21:58:38 UTC (rev 1187) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-01-06 23:36:01 UTC (rev 1188) @@ -31,6 +31,7 @@ import org.gatein.portal.wsrp.state.producer.registrations.mapping.ConsumersAndGroupsMapping; import org.gatein.portal.wsrp.state.producer.registrations.mapping.RegistrationMapping; import org.gatein.portal.wsrp.state.producer.registrations.mapping.RegistrationPropertiesMapping; +import org.gatein.registration.Consumer; import org.gatein.registration.ConsumerGroup; import org.gatein.registration.Registration; import org.gatein.registration.RegistrationException; @@ -162,7 +163,7 @@ return consumer; } - /*@Override + @Override protected ConsumerSPI internalSaveChangesTo(Consumer consumer) { ConsumerSPI consumerSPI = super.internalSaveChangesTo(consumer); @@ -181,7 +182,7 @@ } return consumerSPI; - }*/ + } @Override protected ConsumerGroupSPI internalRemoveConsumerGroup(String name) Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java =================================================================== --- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 21:58:38 UTC (rev 1187) +++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 23:36:01 UTC (rev 1188) @@ -28,9 +28,9 @@ import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.ManyToOne; import org.chromattic.api.annotations.MappedBy; -import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; +import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.chromattic.api.annotations.RelatedMappedBy; import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager; @@ -38,7 +38,6 @@ import org.gatein.registration.ConsumerGroup; import org.gatein.registration.Registration; import org.gatein.registration.RegistrationException; -import org.gatein.registration.RegistrationStatus; import org.gatein.registration.spi.ConsumerSPI; import java.util.List; @@ -70,11 +69,6 @@ public abstract void setConsumerAgent(String consumerAgent); - @Property(name = "status") - public abstract RegistrationStatus getStatus(); - - public abstract void setStatus(RegistrationStatus status); - @OneToMany @RelatedMappedBy("consumer") public abstract List<RegistrationMapping> getRegistrations(); @@ -134,7 +128,6 @@ setName(consumer.getName()); setId(consumer.getId()); setConsumerAgent(consumer.getConsumerAgent()); - setStatus(consumer.getStatus()); ConsumerGroup group = consumer.getGroup(); if (group != null) @@ -163,7 +156,6 @@ { ConsumerSPI consumer = persistenceManager.newConsumerSPI(getId(), getName()); consumer.setConsumerAgent(getConsumerAgent()); - consumer.setStatus(getStatus()); consumer.setPersistentKey(getPersistentKey()); consumer.setCapabilities(getCapabilities().toConsumerCapabilities()); Modified: portal/trunk/pom.xml =================================================================== --- portal/trunk/pom.xml 2010-01-06 21:58:38 UTC (rev 1187) +++ portal/trunk/pom.xml 2010-01-06 23:36:01 UTC (rev 1188) @@ -19,7 +19,8 @@ --> -<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"> +<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"> <modelVersion>4.0.0</modelVersion> @@ -47,7 +48,7 @@ <org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version> <org.gatein.pc.version>2.1.0-CR01</org.gatein.pc.version> <org.picketlink.idm>1.1.0.Beta1</org.picketlink.idm> - <org.gatein.wsrp.version>1.0.0-Beta03</org.gatein.wsrp.version> + <org.gatein.wsrp.version>1.0.0-Beta04</org.gatein.wsrp.version> <org.gatein.mop.version>1.0.0-Beta13</org.gatein.mop.version> <org.slf4j.version>1.5.6</org.slf4j.version> <rhino.version>1.6R5</rhino.version> @@ -86,406 +87,406 @@ <module>packaging</module> </modules> - <dependencyManagement> - <dependencies> + <dependencyManagement> + <dependencies> - <!-- eXo JCR stack --> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - <exclusions> - <exclusion> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - </exclusion> - <exclusion> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.commons</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.cache</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.command</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.component.common</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.kernel</groupId> - <artifactId>exo.kernel.container</artifactId> - <version>${org.exoplatform.kernel.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.database</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.api</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.organization.jdbc</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.security.core</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.core</groupId> - <artifactId>exo.core.component.document</artifactId> - <version>${org.exoplatform.core.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.core</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.jcr</groupId> - <artifactId>exo.jcr.component.ext</artifactId> - <version>${org.exoplatform.jcr.version}</version> - </dependency> - <dependency> - <groupId>org.exoplatform.ws</groupId> - <artifactId>exo.ws.frameworks.servlet</artifactId> - <version>${org.exoplatform.ws.version}</version> - </dependency> + <!-- eXo JCR stack --> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + <exclusions> + <exclusion> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + </exclusion> + <exclusion> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.commons</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.cache</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.command</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.component.common</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.kernel</groupId> + <artifactId>exo.kernel.container</artifactId> + <version>${org.exoplatform.kernel.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.database</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.api</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.organization.jdbc</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.security.core</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.core</groupId> + <artifactId>exo.core.component.document</artifactId> + <version>${org.exoplatform.core.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.core</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.jcr</groupId> + <artifactId>exo.jcr.component.ext</artifactId> + <version>${org.exoplatform.jcr.version}</version> + </dependency> + <dependency> + <groupId>org.exoplatform.ws</groupId> + <artifactId>exo.ws.frameworks.servlet</artifactId> + <version>${org.exoplatform.ws.version}</version> + </dependency> - <!-- GateIn components --> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-logging</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.common</groupId> - <artifactId>common-common</artifactId> - <version>${org.gatein.common.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wci</groupId> - <artifactId>wci-wci</artifactId> - <version>${org.gatein.wci.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-bridge</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-federation</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-mc</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-portlet</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.pc</groupId> - <artifactId>pc-api</artifactId> - <version>${org.gatein.pc.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-producer-lib</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-consumer</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.wsrp</groupId> - <artifactId>wsrp-integration-api</artifactId> - <version>${org.gatein.wsrp.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-api</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-spi</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> - <dependency> - <groupId>org.gatein.mop</groupId> - <artifactId>mop-core</artifactId> - <version>${org.gatein.mop.version}</version> - </dependency> + <!-- GateIn components --> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-logging</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.common</groupId> + <artifactId>common-common</artifactId> + <version>${org.gatein.common.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wci</groupId> + <artifactId>wci-wci</artifactId> + <version>${org.gatein.wci.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-bridge</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-federation</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-mc</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-portlet</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.pc</groupId> + <artifactId>pc-api</artifactId> + <version>${org.gatein.pc.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-producer-lib</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-consumer</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.wsrp</groupId> + <artifactId>wsrp-integration-api</artifactId> + <version>${org.gatein.wsrp.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-api</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-spi</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> + <dependency> + <groupId>org.gatein.mop</groupId> + <artifactId>mop-core</artifactId> + <version>${org.gatein.mop.version}</version> + </dependency> - <!-- Chromattic --> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.apt</artifactId> - <version>${version.chromattic}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.api</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.spi</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.core</artifactId> - <version>${version.chromattic}</version> - </dependency> - <dependency> - <groupId>org.chromattic</groupId> - <artifactId>chromattic.ntdef</artifactId> - <version>${version.chromattic}</version> - </dependency> + <!-- Chromattic --> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.api</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.spi</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.core</artifactId> + <version>${version.chromattic}</version> + </dependency> + <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.ntdef</artifactId> + <version>${version.chromattic}</version> + </dependency> - <!-- Picketlink --> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-core</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-hibernate</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-ldap</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> - <dependency> - <groupId>org.picketlink.idm</groupId> - <artifactId>picketlink-idm-cache</artifactId> - <version>${org.picketlink.idm}</version> - </dependency> + <!-- Picketlink --> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-core</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-hibernate</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-ldap</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> + <dependency> + <groupId>org.picketlink.idm</groupId> + <artifactId>picketlink-idm-cache</artifactId> + <version>${org.picketlink.idm}</version> + </dependency> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>2.0</version> - </dependency> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>2.0</version> + </dependency> - <!-- Portlet bridge --> - <dependency> - <groupId>org.jboss.portletbridge</groupId> - <artifactId>portletbridge-api</artifactId> - <version>2.0.0.BETA</version> - </dependency> - <dependency> - <groupId>org.jboss.portletbridge</groupId> - <artifactId>portletbridge-impl</artifactId> - <version>2.0.0.BETA</version> - </dependency> + <!-- Portlet bridge --> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-api</artifactId> + <version>2.0.0.BETA</version> + </dependency> + <dependency> + <groupId>org.jboss.portletbridge</groupId> + <artifactId>portletbridge-impl</artifactId> + <version>2.0.0.BETA</version> + </dependency> - <dependency> - <groupId>commons-dbcp</groupId> - <artifactId>commons-dbcp</artifactId> - <version>1.2.2</version> - <exclusions> - <exclusion> + <dependency> + <groupId>commons-dbcp</groupId> + <artifactId>commons-dbcp</artifactId> + <version>1.2.2</version> + <exclusions> + <exclusion> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>org.json</groupId> + <artifactId>json</artifactId> + <version>20070829</version> + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> + <version>1.8.0.7</version> + </dependency> + <dependency> + <groupId>javax.resource</groupId> + <artifactId>connector-api</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${javax.servlet.version}</version> + </dependency> + <dependency> + <groupId>rhino</groupId> + <artifactId>js</artifactId> + <version>${rhino.version}</version> + </dependency> + <dependency> + <groupId>org.codehaus.groovy</groupId> + <artifactId>groovy-all</artifactId> + <version>${org.codehaus.groovy.version}</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2.1</version> + </dependency> + <dependency> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + <version>3.0</version> + </dependency> + + <dependency> + <groupId>caja</groupId> + <artifactId>caja</artifactId> + <version>r3375</version> + </dependency> + <dependency> + <groupId>caja</groupId> + <artifactId>json_simple</artifactId> + <version>r1</version> + </dependency> + <dependency> + <groupId>net.oauth</groupId> + <artifactId>core</artifactId> + <version>20080621</version> + </dependency> + <dependency> + <groupId>com.google.collections</groupId> + <artifactId>google-collections</artifactId> + <version>1.0-rc2</version> + </dependency> + <dependency> + <groupId>com.google.code.guice</groupId> + <artifactId>guice</artifactId> + <version>2.0</version> + </dependency> + <dependency> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + <version>2.4</version> + </dependency> + <dependency> + <groupId>rome</groupId> + <artifactId>rome</artifactId> + <version>0.9</version> + </dependency> + <dependency> + <groupId>com.ibm.icu</groupId> + <artifactId>icu4j</artifactId> + <version>3.8</version> + </dependency> + <dependency> + <groupId>net.sourceforge.nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>1.9.9</version> + </dependency> + <dependency> <groupId>xerces</groupId> <artifactId>xercesImpl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>org.json</groupId> - <artifactId>json</artifactId> - <version>20070829</version> - </dependency> - <dependency> - <groupId>hsqldb</groupId> - <artifactId>hsqldb</artifactId> - <version>1.8.0.7</version> - </dependency> - <dependency> - <groupId>javax.resource</groupId> - <artifactId>connector-api</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${javax.servlet.version}</version> - </dependency> - <dependency> - <groupId>rhino</groupId> - <artifactId>js</artifactId> - <version>${rhino.version}</version> - </dependency> - <dependency> - <groupId>org.codehaus.groovy</groupId> - <artifactId>groovy-all</artifactId> - <version>${org.codehaus.groovy.version}</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2.1</version> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0</version> - </dependency> + <version>2.9.1</version> + </dependency> + <dependency> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.1</version> + </dependency> + <dependency> + <groupId>nu.validator.htmlparser</groupId> + <artifactId>htmlparser</artifactId> + <version>1.0.7</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.7</version> + </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>caja</artifactId> - <version>r3375</version> - </dependency> - <dependency> - <groupId>caja</groupId> - <artifactId>json_simple</artifactId> - <version>r1</version> - </dependency> - <dependency> - <groupId>net.oauth</groupId> - <artifactId>core</artifactId> - <version>20080621</version> - </dependency> - <dependency> - <groupId>com.google.collections</groupId> - <artifactId>google-collections</artifactId> - <version>1.0-rc2</version> - </dependency> - <dependency> - <groupId>com.google.code.guice</groupId> - <artifactId>guice</artifactId> - <version>2.0</version> - </dependency> - <dependency> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - <version>2.4</version> - </dependency> - <dependency> - <groupId>rome</groupId> - <artifactId>rome</artifactId> - <version>0.9</version> - </dependency> - <dependency> - <groupId>com.ibm.icu</groupId> - <artifactId>icu4j</artifactId> - <version>3.8</version> - </dependency> - <dependency> - <groupId>net.sourceforge.nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>1.9.9</version> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - </dependency> - <dependency> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>nu.validator.htmlparser</groupId> - <artifactId>htmlparser</artifactId> - <version>1.0.7</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.7</version> - </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-gadgets</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-features</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-common</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-server</artifactId> + <version>${org.shindig.version}</version> + <type>war</type> + </dependency> + <dependency> + <groupId>org.apache.shindig</groupId> + <artifactId>shindig-social-api</artifactId> + <version>${org.shindig.version}</version> + </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-gadgets</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-features</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-common</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-server</artifactId> - <version>${org.shindig.version}</version> - <type>war</type> - </dependency> - <dependency> - <groupId>org.apache.shindig</groupId> - <artifactId>shindig-social-api</artifactId> - <version>${org.shindig.version}</version> - </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> + </dependencies> - </dependencies> + </dependencyManagement> - </dependencyManagement> - <dependencies> <dependency> <groupId>org.slf4j</groupId> @@ -526,10 +527,10 @@ <version>1.1.1</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.4</version> - </plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.4</version> + </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-surefire-plugin</artifactId> @@ -570,11 +571,12 @@ <phase>compile</phase> <configuration> <tasks> - <copy failonerror="false" todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> + <copy failonerror="false" + todir="${project.build.directory}/${project.build.finalName}/WEB-INF/classes"> <fileset dir="${basedir}/src/main/webapp/WEB-INF/classes"> - <include name="**/*_en.properties" /> + <include name="**/*_en.properties"/> </fileset> - <globmapper from="*_en.properties" to="*.properties" /> + <globmapper from="*_en.properties" to="*.properties"/> </copy> </tasks> </configuration> Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2010-01-06 21:58:38 UTC (rev 1187) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2010-01-06 23:36:01 UTC (rev 1188) @@ -38,18 +38,21 @@ import org.exoplatform.webui.form.UIForm; import org.exoplatform.webui.form.UIFormStringInput; import org.exoplatform.webui.form.validator.MandatoryValidator; +import org.gatein.common.util.ParameterValidation; import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.consumer.ConsumerException; import org.gatein.wsrp.consumer.ProducerInfo; import org.gatein.wsrp.consumer.registry.ConsumerRegistry; +import org.gatein.wsrp.services.ManageableServiceFactory; /** @author Wesley Hales */ @ComponentConfig(template = "app:/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl", lifecycle = UIFormLifecycle.class, events = { @EventConfig(listeners = UIWsrpConsumerEditor.SaveActionListener.class)}) public class UIWsrpConsumerEditor extends UIForm { - protected static final String CONSUMER_NAME = "Consumer Name: "; - protected static final String CACHE_EXPIRATION = "Cache Expiration Seconds: "; + protected static final String CONSUMER_NAME = "Consumer name: "; + protected static final String CACHE_EXPIRATION = "Seconds before cache expiration: "; + protected static final String TIMEOUT = "Milliseconds before timeout: "; protected static final String WSDL_URL = "WSDL URL: "; public UIWsrpConsumerEditor() throws Exception @@ -57,6 +60,7 @@ addUIFormInput(new UIFormStringInput(CONSUMER_NAME, CONSUMER_NAME, null).addValidator(MandatoryValidator.class)); addUIFormInput(new UIFormStringInput(CACHE_EXPIRATION, CACHE_EXPIRATION, null)); + addUIFormInput(new UIFormStringInput(TIMEOUT, TIMEOUT, null)); addUIFormInput(new UIFormStringInput(WSDL_URL, WSDL_URL, null)); //addChild(UIWsrpEndpointConfigForm.class,null,null); } @@ -77,6 +81,18 @@ return cacheExp; } + private Integer getTimeout() + { + int timeout = ManageableServiceFactory.DEFAULT_TIMEOUT_MS; + String timeoutString = getUIStringInput(TIMEOUT).getValue(); + if (!ParameterValidation.isNullOrEmpty(timeoutString)) + { + timeout = Integer.parseInt(timeoutString); + } + + return timeout; + } + private String getWSDLURL() { return getUIStringInput(WSDL_URL).getValue(); @@ -106,8 +122,10 @@ getUIStringInput(CONSUMER_NAME).setEditable(UIFormStringInput.ENABLE); getUIStringInput(CONSUMER_NAME).setValue(consumer.getProducerId()); - getUIStringInput(CACHE_EXPIRATION).setValue(consumer.getProducerInfo().getExpirationCacheSeconds().toString()); - getUIStringInput(WSDL_URL).setValue(consumer.getProducerInfo().getEndpointConfigurationInfo().getWsdlDefinitionURL()); + ProducerInfo producerInfo = consumer.getProducerInfo(); + getUIStringInput(CACHE_EXPIRATION).setValue(producerInfo.getExpirationCacheSeconds().toString()); + getUIStringInput(TIMEOUT).setValue("" + producerInfo.getEndpointConfigurationInfo().getWSOperationTimeOut()); + getUIStringInput(WSDL_URL).setValue(producerInfo.getEndpointConfigurationInfo().getWsdlDefinitionURL()); setNewConsumer(false); //invokeGetBindingBean(consumer.getProducerInfo()); @@ -136,9 +154,12 @@ UIWsrpConsumerOverview consumerOverview = consumerEditor.getAncestorOfType(UIWsrpConsumerOverview.class); WebuiRequestContext ctx = event.getRequestContext(); - if(consumerEditor.isNewConsumer()){ + if (consumerEditor.isNewConsumer()) + { consumerEditor.save(ctx); - }else{ + } + else + { consumerEditor.edit(ctx); } @@ -200,6 +221,7 @@ producerInfo.setId(getConsumerName()); producerInfo.setExpirationCacheSeconds(getCacheExpiration()); producerInfo.getEndpointConfigurationInfo().setWsdlDefinitionURL(getWSDLURL()); + producerInfo.getEndpointConfigurationInfo().setWSOperationTimeOut(getTimeout()); UIApplication uiApp = context.getUIApplication(); Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java =================================================================== --- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-06 21:58:38 UTC (rev 1187) +++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2010-01-06 23:36:01 UTC (rev 1188) @@ -37,7 +37,6 @@ import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle; import org.exoplatform.webui.event.Event; import org.exoplatform.webui.event.EventListener; -import org.gatein.wsrp.WSRPConsumer; import org.gatein.wsrp.producer.config.ProducerConfiguration; import org.gatein.wsrp.producer.config.ProducerConfigurationService; import org.gatein.wsrp.registration.RegistrationPropertyDescription; @@ -65,7 +64,7 @@ public static String[] FIELDS = {"name", "description", "label", "hint"}; - public static String[] SELECT_ACTIONS = {"EditProperty", "DeleteProperty"}; + public static String[] SELECT_ACTIONS = {"AddProperty", "EditProperty", "DeleteProperty"}; public UIWsrpProducerOverview() throws Exception { @@ -116,9 +115,9 @@ return Collections.singletonList(("xsd:string")); } - public LazyPageList createPageList(final List pageList) + public LazyPageList<RegistrationPropertyDescription> createPageList(final List<RegistrationPropertyDescription> pageList) { - return new LazyPageList<WSRPConsumer>(new ListAccess<WSRPConsumer>() + return new LazyPageList<RegistrationPropertyDescription>(new ListAccess<RegistrationPropertyDescription>() { public int getSize() throws Exception @@ -126,9 +125,9 @@ return pageList.size(); } - public WSRPConsumer[] load(int index, int length) throws Exception, IllegalArgumentException + public RegistrationPropertyDescription[] load(int index, int length) throws Exception, IllegalArgumentException { - WSRPConsumer[] pcs = new WSRPConsumer[pageList.size()]; + RegistrationPropertyDescription[] pcs = new RegistrationPropertyDescription[pageList.size()]; if (index < 0) { @@ -148,7 +147,7 @@ for (int i = 0; i < length; i++) { - pcs[i] = (WSRPConsumer)pageList.get(i + index); + pcs[i] = pageList.get(i + index); } return pcs;