gatein SVN: r1102 - in portal/trunk/docs/user-guide/en/modules: terms and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-21 09:33:23 -0500 (Mon, 21 Dec 2009)
New Revision: 1102
Modified:
portal/trunk/docs/user-guide/en/modules/Introduction.xml
portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
Log:
- GateIn is a merge of projects (not the product)
- Would not build with twice the same id used
Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2009-12-21 13:59:10 UTC (rev 1101)
+++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2009-12-21 14:33:23 UTC (rev 1102)
@@ -2,28 +2,9 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Introduction">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- 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.
-
- --><title>Introduction</title>
+ <title>Introduction</title>
<para>
- Enterprise Portal Platform (<acronym>EPP</acronym>) 5.0 is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs.
+ GateIn is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs.
</para>
<mediaobject>
<imageobject>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-21 13:59:10 UTC (rev 1101)
+++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2009-12-21 14:33:23 UTC (rev 1102)
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
-<section id="sect-User_Guide-Toolbar">
+<section id="sect-User_Guide-Toolbar-Concept">
<!--
Copyright (C) 2009 eXo Platform SAS.
15 years
gatein SVN: r1101 - portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-12-21 08:59:10 -0500 (Mon, 21 Dec 2009)
New Revision: 1101
Modified:
portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java
portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java
Log:
- Fixed consumer creation where given values weren't used.
- Started adding display of error messages.
Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2009-12-21 11:51:08 UTC (rev 1100)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerEditor.java 2009-12-21 13:59:10 UTC (rev 1101)
@@ -22,34 +22,25 @@
******************************************************************************/
package org.exoplatform.wsrp.webui.component;
-import org.exoplatform.applicationregistry.webui.component.UIAddApplicationForm;
-import org.exoplatform.applicationregistry.webui.component.UIApplicationForm;
-import org.exoplatform.applicationregistry.webui.component.UIApplicationOrganizer;
import org.exoplatform.commons.utils.LazyPageList;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.services.organization.User;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.UIApplication;
-import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.UIGrid;
import org.exoplatform.webui.core.UIPopupWindow;
import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
import org.exoplatform.webui.event.Event;
import org.exoplatform.webui.event.EventListener;
import org.exoplatform.webui.form.UIForm;
-import org.exoplatform.webui.form.UIFormCheckBoxInput;
import org.exoplatform.webui.form.UIFormStringInput;
import org.exoplatform.webui.form.validator.MandatoryValidator;
-import org.exoplatform.webui.organization.UIAccountInputSet;
import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.consumer.ConsumerException;
-import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
import org.gatein.wsrp.consumer.ProducerInfo;
-import org.gatein.wsrp.consumer.WSRPConsumerImpl;
import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
/** @author Wesley Hales */
@@ -71,22 +62,29 @@
//addChild(UIWsrpEndpointConfigForm.class,null,null);
}
- private String getConsumerName(){
+ private String getConsumerName()
+ {
return getUIStringInput(CONSUMER_NAME).getValue();
}
- private Integer getCacheExpiration(){
+ private Integer getCacheExpiration()
+ {
Integer cacheExp = 0;
String cacheExpString = getUIStringInput(CACHE_EXPIRATION).getValue();
- if(cacheExpString != null){
+ if (cacheExpString != null)
+ {
cacheExp = Integer.parseInt(cacheExpString);
}
return cacheExp;
}
+ private String getWSDLURL()
+ {
+ return getUIStringInput(WSDL_URL).getValue();
+ }
-
- public void setConsumer(WSRPConsumer consumer) throws Exception{
+ public void setConsumer(WSRPConsumer consumer) throws Exception
+ {
//UIWsrpEndpointConfigForm uiWsrpEndpointConfigForm = getChild(UIWsrpEndpointConfigForm.class);
if (consumer == null)
{
@@ -98,14 +96,15 @@
getUIStringInput(CONSUMER_NAME).setValue(consumer.getProducerId());
getUIStringInput(CACHE_EXPIRATION).setValue(consumer.getProducerInfo().getExpirationCacheSeconds().toString());
getUIStringInput(WSDL_URL).setValue(consumer.getProducerInfo().getEndpointConfigurationInfo().getWsdlDefinitionURL());
- //invokeGetBindingBean(consumer.getProducerInfo());
+ //invokeGetBindingBean(consumer.getProducerInfo());
//uiWsrpEndpointConfigForm.setProducerInfo(consumer.getProducerInfo());
//uiWsrpEndpointConfigForm.invokeGetBindingBean(consumer.getProducerInfo().getEndpointConfigurationInfo());
//bindingFields(consumer);
}
- private void bindingFields(WSRPConsumer consumer){
+ private void bindingFields(WSRPConsumer consumer)
+ {
//ExoContainer manager = ExoContainerContext.getCurrentContainer();
//ConsumerRegistry consumerRegistry = (ConsumerRegistry)manager.getComponentInstanceOfType(ConsumerRegistry.class);
ProducerInfo producerInfo = consumer.getProducerInfo();
@@ -141,7 +140,7 @@
LazyPageList pageList = consumerOverview.createPageList(consumerOverview.getTempArrayList());
UIGrid uiGrid = consumerOverview.getChild(UIGrid.class);
uiGrid.getUIPageIterator().setPageList(pageList);
-
+
ctx.addUIComponentToUpdateByAjax(consumerOverview);
//consumerOverview.renderUIComponent(consumerEditor.getParent().getParent().findComponentById("ConsumerSelector"));
@@ -183,10 +182,16 @@
UIApplication uiApp = context.getUIApplication();
- try{
- consumerRegistry.createConsumer(getConsumerName(),300);
+ try
+ {
+ WSRPConsumer consumer = consumerRegistry.createConsumer(getConsumerName(), getCacheExpiration());
+ ProducerInfo producerInfo = consumer.getProducerInfo();
+ producerInfo.getEndpointConfigurationInfo().setWsdlDefinitionURL(getWSDLURL());
+ consumerRegistry.updateProducerInfo(producerInfo);
uiApp.addMessage(new ApplicationMessage("Consumer Successfully Added", null));
- }catch(ConsumerException ce){
+ }
+ catch (ConsumerException ce)
+ {
//todo - add to resource bundle
uiApp.addMessage(new ApplicationMessage("Consumer already exists!", null));
}
@@ -203,16 +208,19 @@
//UIWsrpEndpointConfigForm uiWsrpEndpointConfigForm = getChild(UIWsrpEndpointConfigForm.class);
//uiWsrpEndpointConfigForm.invokeSetBindingBean(consumer.getProducerInfo().getEndpointConfigurationInfo());
- producerInfo.setId(getUIStringInput(CONSUMER_NAME).getValue());
- producerInfo.setExpirationCacheSeconds(Integer.parseInt(getUIStringInput(CACHE_EXPIRATION).getValue()));
- producerInfo.getEndpointConfigurationInfo().setWsdlDefinitionURL(getUIStringInput(WSDL_URL).getValue());
+ producerInfo.setId(getConsumerName());
+ producerInfo.setExpirationCacheSeconds(getCacheExpiration());
+ producerInfo.getEndpointConfigurationInfo().setWsdlDefinitionURL(getWSDLURL());
UIApplication uiApp = context.getUIApplication();
- try{
+ try
+ {
consumerRegistry.updateProducerInfo(producerInfo);
uiApp.addMessage(new ApplicationMessage("Edit Consumer Successful!", null));
- }catch(ConsumerException ce){
+ }
+ catch (ConsumerException ce)
+ {
//todo - add to resource bundle
uiApp.addMessage(new ApplicationMessage("Edit Consumer Problem!", null));
}
Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java 2009-12-21 11:51:08 UTC (rev 1100)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java 2009-12-21 13:59:10 UTC (rev 1101)
@@ -26,12 +26,6 @@
import org.exoplatform.commons.utils.ListAccess;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.organization.webui.component.UIMembershipManagement;
-import org.exoplatform.organization.webui.component.UIMembershipTypeForm;
-import org.exoplatform.portal.config.model.PortalConfig;
-import org.exoplatform.portal.pom.data.PortalData;
-import org.exoplatform.services.organization.MembershipType;
-import org.exoplatform.services.organization.OrganizationService;
import org.exoplatform.web.application.ApplicationMessage;
import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
@@ -47,8 +41,6 @@
import org.gatein.wsrp.WSRPConsumer;
import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
-import java.io.Writer;
-import java.util.ArrayList;
import java.util.List;
/** @author Wesley Hales */
@@ -91,7 +83,7 @@
public LazyPageList createPageList(final List pageList)
{
- return new LazyPageList(new ListAccess<WSRPConsumer>()
+ return new LazyPageList<WSRPConsumer>(new ListAccess<WSRPConsumer>()
{
public int getSize() throws Exception
@@ -160,16 +152,17 @@
}
}
- public void refreshGrid(Event<UIWsrpConsumerOverview> event) throws Exception {
- UIWsrpConsumerOverview consumerOverview = event.getSource();
- WebuiRequestContext ctx = event.getRequestContext();
+ public void refreshGrid(Event<UIWsrpConsumerOverview> event) throws Exception
+ {
+ UIWsrpConsumerOverview consumerOverview = event.getSource();
+ WebuiRequestContext ctx = event.getRequestContext();
- UIGrid uiGrid = consumerOverview.getChild(UIGrid.class);
- //refresh the list
- LazyPageList pageList = consumerOverview.createPageList(consumerOverview.getTempArrayList());
- uiGrid.getUIPageIterator().setPageList(pageList);
+ UIGrid uiGrid = consumerOverview.getChild(UIGrid.class);
+ //refresh the list
+ LazyPageList pageList = consumerOverview.createPageList(consumerOverview.getTempArrayList());
+ uiGrid.getUIPageIterator().setPageList(pageList);
- ctx.addUIComponentToUpdateByAjax(consumerOverview);
+ ctx.addUIComponentToUpdateByAjax(consumerOverview);
}
static public class OpenPopupActionListener extends EventListener<UIWsrpConsumerOverview>
@@ -221,19 +214,26 @@
static public class DeleteActionListener extends EventListener<UIWsrpConsumerOverview>
{
- public void execute(Event<UIWsrpConsumerOverview> event) throws Exception
+ public void execute(Event<UIWsrpConsumerOverview> event)
{
- UIWsrpConsumerOverview consumerOverview = event.getSource();
- WSRPConsumer consumer = consumerOverview.getConsumerFromEvent(event);
- ConsumerRegistry consumerRegistry = consumerOverview.getConsumerRegistry();
UIApplication uiApp = event.getRequestContext().getUIApplication();
- String id = event.getRequestContext().getRequestParameter(OBJECTID);
- if (consumer != null)
+ try
{
- consumerRegistry.destroyConsumer(id);
- uiApp.addMessage(new ApplicationMessage("Consumer has been deleted.", null));
- consumerOverview.refreshGrid(event);
+ UIWsrpConsumerOverview consumerOverview = event.getSource();
+ WSRPConsumer consumer = consumerOverview.getConsumerFromEvent(event);
+ ConsumerRegistry consumerRegistry = consumerOverview.getConsumerRegistry();
+ String id = event.getRequestContext().getRequestParameter(OBJECTID);
+ if (consumer != null)
+ {
+ consumerRegistry.destroyConsumer(id);
+ uiApp.addMessage(new ApplicationMessage("Consumer has been deleted.", null));
+ consumerOverview.refreshGrid(event);
+ }
}
+ catch (Exception e)
+ {
+ uiApp.addMessage(new ApplicationMessage("Failed to delete Consumer. Cause: " + e.getCause(), null, ApplicationMessage.ERROR));
+ }
}
}
@@ -292,17 +292,24 @@
static public class RefreshActionListener extends EventListener<UIWsrpConsumerOverview>
{
- public void execute(Event<UIWsrpConsumerOverview> event) throws Exception
+ public void execute(Event<UIWsrpConsumerOverview> event)
{
- UIWsrpConsumerOverview consumerOverview = event.getSource();
- WSRPConsumer consumer = consumerOverview.getConsumerFromEvent(event);
UIApplication uiApp = event.getRequestContext().getUIApplication();
+ try
+ {
+ UIWsrpConsumerOverview consumerOverview = event.getSource();
+ WSRPConsumer consumer = consumerOverview.getConsumerFromEvent(event);
- if (consumer != null)
+ if (consumer != null)
+ {
+ consumer.refresh(true);
+ uiApp.addMessage(new ApplicationMessage("Consumer Refreshed Successfully", null));
+ consumerOverview.refreshGrid(event);
+ }
+ }
+ catch (Exception e)
{
- consumer.refresh(true);
- uiApp.addMessage(new ApplicationMessage("Consumer Refreshed Successfully", null));
- consumerOverview.refreshGrid(event);
+ uiApp.addMessage(new ApplicationMessage("Failed to refresh Consumer. Cause: " + e.getCause(), null, ApplicationMessage.ERROR));
}
}
}
15 years
gatein SVN: r1100 - in portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo: portal and 1 other directories.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-12-21 06:51:08 -0500 (Mon, 21 Dec 2009)
New Revision: 1100
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
Log:
GTNPORTAL-376: Adding cancel for DnD. Using it for IE when drag outside of document
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js 2009-12-21 11:48:10 UTC (rev 1099)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop.js 2009-12-21 11:51:08 UTC (rev 1100)
@@ -64,6 +64,7 @@
var dndEvent = this.dndEvent = new DragDropEvent(clickObject, dragObject) ;
document.onmousemove = this.onMouseMove ;
document.onmouseup = this.onDrop ;
+ document.onmouseout = this.onCancel ;
document.onkeypress = this.onKeyPressEvt ;
if(this.initCallback != null) {
@@ -115,6 +116,10 @@
eXo.core.DragDrop.destroy() ;
} ;
+DragDrop.prototype.onCancel = function(evt) {
+ if(eXo.core.DragDrop.cancelCallback) eXo.core.DragDrop.cancelCallback(eXo.core.DragDrop.dndEvent);
+} ;
+
DragDrop.prototype.destroy = function() {
if(this.destroyCallback != null) {
this.destroyCallback(this.dndEvent) ;
@@ -122,6 +127,7 @@
document.onmousemove = null ;
document.onmouseup = null ;
+ document.onmouseout = null ;
document.onkeypress = null ;
this.dndEvent = null ;
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js 2009-12-21 11:48:10 UTC (rev 1099)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/core/DragDrop2.js 2009-12-21 11:51:08 UTC (rev 1100)
@@ -49,6 +49,7 @@
o.root.onDragStart(x, y, o.lastMouseX, o.lastMouseY, e);
document.onmousemove = eXo.core.DragDrop2.drag;
document.onmouseup = eXo.core.DragDrop2.end;
+ document.onmouseout = eXo.core.DragDrop2.cancel;
return false;
},
@@ -76,11 +77,16 @@
e = eXo.core.DragDrop2.fixE(e);
document.onmousemove = null;
document.onmouseup = null;
+ document.onmouseout = null;
eXo.core.DragDrop2.obj.root.onDragEnd( parseInt(eXo.core.DragDrop2.obj.root.style["left"]),
parseInt(eXo.core.DragDrop2.obj.root.style["top"]), e.clientX, e.clientY);
eXo.core.DragDrop2.obj = null;
},
+ cancel : function(e) {
+ if(eXo.core.DragDrop2.obj.root.onCancel) eXo.core.DragDrop2.obj.root.onCancel(e);
+ },
+
fixE : function(e) {
if (typeof e == 'undefined') e = window.event;
if (typeof e.layerX == 'undefined') e.layerX = e.offsetX;
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2009-12-21 11:48:10 UTC (rev 1099)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/PortalDragDrop.js 2009-12-21 11:51:08 UTC (rev 1100)
@@ -222,11 +222,6 @@
/*Set properties for drag object */
eXo.portal.PortalDragDrop.setDragObjectProperties(dragObject, tdElementList, "column", dndEvent.backupMouseEvent) ;
}
- //when dragObject out of page
- if ((Browser.findPosY(dragObject) < 0) || (Browser.findPosX(dragObject) + 64 > eXo.core.Browser.getBrowserWidth())) {
- DragDrop.dropCallback(dndEvent);
- document.onmousemove = null;
- }
}
} ;
@@ -248,8 +243,14 @@
eXo.portal.isInDragging = false;
eXo.portal.UIPortal.changeComposerSaveButton();
- }
+ };
+ DragDrop.cancelCallback = function(dndEvent) {
+ if(Browser.browserType == "ie" && Browser.findMouseYInClient(dndEvent.backupMouseEvent) < 0) {
+ DragDrop.onDrop(dndEvent.backupMouseEvent);
+ }
+ };
+
var clickObject = this;
var componentBlock = DOMUtil.findAncestorByClass(clickObject, "UIComponentBlock") ;
@@ -338,12 +339,10 @@
var deltaBottom = mouseY - (Math.round(browserHeight/6)) ;
if(deltaTop > 0) {
document.documentElement.scrollTop += deltaTop - 5 ;
-// if(!dragObject.isComponent) dragObject.style.top = parseInt(dragObject.style.top) + (deltaTop -5) + "px";
}
if(deltaBottom < 0 && document.documentElement.scrollTop > 0) {
document.documentElement.scrollTop += deltaBottom ;
-// if(!dragObject.isComponent) dragObject.style.top = parseInt(dragObject.style.top) + deltaBottom + "px";
}
};
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2009-12-21 11:48:10 UTC (rev 1099)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/webui/UIDashboard.js 2009-12-21 11:51:08 UTC (rev 1100)
@@ -251,7 +251,14 @@
uiTarget = eXo.core.DOMUtil.findFirstDescendantByClass(portletFragment, "div", "UITarget");
}
uiDashboard.targetObj = uiDashboard.currCol = uiDashboard.compId = null;
- }
+ }
+
+
+ dragObj.onCancel = function(e){
+ if(eXo.core.Browser.browserType == "ie" && eXo.core.Browser.findMouseYInClient() < 0) {
+ eXo.core.DragDrop2.end(e);
+ }
+ }
},
onLoad : function(windowId, canEdit) {
15 years
gatein SVN: r1099 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-21 06:48:10 -0500 (Mon, 21 Dec 2009)
New Revision: 1099
Modified:
portal/trunk/README.txt
Log:
Added a note
Modified: portal/trunk/README.txt
===================================================================
--- portal/trunk/README.txt 2009-12-21 11:42:31 UTC (rev 1098)
+++ portal/trunk/README.txt 2009-12-21 11:48:10 UTC (rev 1099)
@@ -9,7 +9,11 @@
* mvn install
For example: mvn install
-
+
+Note: If you run "mvn install" twice in a row without cleaning, one test will
+fail. To workaround this issue you will need to delete the test data located
+here: component/portal/target/temp/
+
**********************
* MAVEN CONFIGURATION:
**********************
15 years
gatein SVN: r1098 - in portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations: mapping and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-12-21 06:42:31 -0500 (Mon, 21 Dec 2009)
New Revision: 1098
Modified:
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
Log:
- Added @Create method for RegistrationPropertiesMapping.
- Added missing mapping for RegistrationPropertiesMapping when initializing persister for JCRRegistrationPersistenceManager.
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2009-12-21 11:05:51 UTC (rev 1097)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2009-12-21 11:42:31 UTC (rev 1098)
@@ -30,6 +30,7 @@
import org.gatein.portal.wsrp.state.producer.registrations.mapping.ConsumerMapping;
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.ConsumerGroup;
import org.gatein.registration.Registration;
import org.gatein.registration.RegistrationException;
@@ -59,7 +60,7 @@
List<Class> mappingClasses = new ArrayList<Class>(5);
Collections.addAll(mappingClasses, ConsumersAndGroupsMapping.class, ConsumerMapping.class, ConsumerGroupMapping.class,
- RegistrationMapping.class, ConsumerCapabilitiesMapping.class);
+ RegistrationMapping.class, ConsumerCapabilitiesMapping.class, RegistrationPropertiesMapping.class);
persister.initializeBuilderFor(mappingClasses);
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2009-12-21 11:05:51 UTC (rev 1097)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2009-12-21 11:42:31 UTC (rev 1098)
@@ -22,6 +22,7 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
+import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.Id;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
@@ -70,6 +71,11 @@
@MappedBy("properties")
public abstract RegistrationPropertiesMapping getProperties();
+ public abstract void setProperties(RegistrationPropertiesMapping rpm);
+
+ @Create
+ public abstract RegistrationPropertiesMapping createProperties();
+
/**
* At this point, this RegistrationMapping should already have been added to its parent
*
@@ -83,7 +89,8 @@
Map<QName, Object> properties = registration.getProperties();
if (ParameterValidation.existsAndIsNotEmpty(properties))
{
- RegistrationPropertiesMapping rpm = getProperties(); // todo: how to create a new one if there isn't one already?
+ RegistrationPropertiesMapping rpm = createProperties();
+ setProperties(rpm);
rpm.initFrom(properties);
}
}
15 years
gatein SVN: r1083 - in portal/branches/wsrp-integration/portlet/exoadmin/src/main: webapp/groovy/wsrp/webui/component and 1 other directory.
by do-not-reply＠jboss.org
Author: wesleyhales
Date: 2009-12-20 20:53:29 -0500 (Sun, 20 Dec 2009)
New Revision: 1083
Added:
portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java
portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java
portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl
portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl
Modified:
portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java
portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java
portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsoleContent.gtmpl
Log:
groundwork for producer ui done, still need to add a few more inputs and cleanup ui
Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java 2009-12-21 01:27:20 UTC (rev 1082)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsole.java 2009-12-21 01:53:29 UTC (rev 1083)
@@ -54,7 +54,7 @@
{
UITabPane uiTabPane = addChild(UITabPane.class, "UIWsrpConsoleTab", null);
uiTabPane.addChild(UIWsrpConsumerOverview.class, null, null).setRendered(true);
- uiTabPane.addChild(UIContainerList.class, null, null);
+ uiTabPane.addChild(UIWsrpProducerOverview.class, null, null);
uiTabPane.setSelectedTab(1);
}
@@ -70,15 +70,15 @@
{
if (portalMode == UIPortalApplication.APP_VIEW_EDIT_MODE)
{
- Util.showComponentEditInViewMode(UIPortlet.class);
+ Util.showComponentEditInViewMode(org.exoplatform.portal.webui.container.UIContainer.class);
}
else
{
uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- Util.showComponentLayoutMode(UIPortlet.class);
+ Util.showComponentLayoutMode(org.exoplatform.portal.webui.container.UIContainer.class);
}
}
- else if (uiComponent instanceof UIContainerList)
+ else if (uiComponent instanceof UIWsrpProducerOverview)
{
if (portalMode == UIPortalApplication.CONTAINER_VIEW_EDIT_MODE)
{
@@ -109,15 +109,15 @@
if (portalMode % 2 == 0)
{
uiPortalApp.setModeState(UIPortalApplication.APP_VIEW_EDIT_MODE);
- Util.showComponentEditInViewMode(UIPortlet.class);
+ Util.showComponentEditInViewMode(org.exoplatform.portal.webui.container.UIContainer.class);
}
else
{
uiPortalApp.setModeState(UIPortalApplication.APP_BLOCK_EDIT_MODE);
- Util.showComponentLayoutMode(UIPortlet.class);
+ Util.showComponentLayoutMode(org.exoplatform.portal.webui.container.UIContainer.class);
}
}
- else if (uiComponent instanceof UIContainerList)
+ else if (uiComponent instanceof UIWsrpProducerOverview)
{ // Swicth to
// Containers Tab
if (portalMode % 2 == 0)
Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java 2009-12-21 01:27:20 UTC (rev 1082)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpConsumerOverview.java 2009-12-21 01:53:29 UTC (rev 1083)
@@ -83,10 +83,9 @@
private List tempArrayList;
- public List getTempArrayList()
+ public List getTempArrayList() throws Exception
{
- ExoContainer manager = ExoContainerContext.getCurrentContainer();
- ConsumerRegistry consumerRegistry = (ConsumerRegistry)manager.getComponentInstanceOfType(ConsumerRegistry.class);
+ ConsumerRegistry consumerRegistry = getConsumerRegistry();
return consumerRegistry.getConfiguredConsumers();
}
@@ -161,7 +160,7 @@
}
}
- public void refreshGrid(Event<UIWsrpConsumerOverview> event){
+ public void refreshGrid(Event<UIWsrpConsumerOverview> event) throws Exception {
UIWsrpConsumerOverview consumerOverview = event.getSource();
WebuiRequestContext ctx = event.getRequestContext();
Added: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java (rev 0)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerEditor.java 2009-12-21 01:53:29 UTC (rev 1083)
@@ -0,0 +1,126 @@
+/******************************************************************************
+ * 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.exoplatform.wsrp.webui.component;
+
+import org.exoplatform.commons.utils.LazyPageList;
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.config.annotation.EventConfig;
+import org.exoplatform.webui.core.UIApplication;
+import org.exoplatform.webui.core.UIGrid;
+import org.exoplatform.webui.core.UIPopupWindow;
+import org.exoplatform.webui.core.lifecycle.UIFormLifecycle;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
+import org.exoplatform.webui.form.UIForm;
+import org.exoplatform.webui.form.UIFormCheckBoxInput;
+import org.exoplatform.webui.form.UIFormStringInput;
+import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.gatein.registration.RegistrationPersistenceManager;
+import org.gatein.wsrp.consumer.ConsumerException;
+import org.gatein.wsrp.consumer.ProducerInfo;
+import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
+import org.gatein.wsrp.producer.config.ProducerConfiguration;
+import org.gatein.wsrp.producer.config.ProducerConfigurationService;
+
+/** @author Wesley Hales */
+@ComponentConfig(template = "app:/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl", lifecycle = UIFormLifecycle.class, events = {
+ @EventConfig(listeners = UIWsrpProducerEditor.SaveActionListener.class)})
+public class UIWsrpProducerEditor extends UIForm
+{
+
+ protected static final String REG_REQUIRED_FOR_DESCRIPTION = "registrationrequiredforfulldescription";
+ protected static final String STRICT_MODE = "strictmode";
+ protected static final String REQUIRES_REGISTRATION = "requiresregistration";
+
+ public UIWsrpProducerEditor() throws Exception
+ {
+ addUIFormInput(new UIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION, REG_REQUIRED_FOR_DESCRIPTION, null));
+ addUIFormInput(new UIFormCheckBoxInput(STRICT_MODE, STRICT_MODE, null));
+ addUIFormInput(new UIFormCheckBoxInput(REQUIRES_REGISTRATION, REQUIRES_REGISTRATION, null));
+ }
+
+ public void setProducerConfig(ProducerConfiguration producerConfiguration) throws Exception {
+
+ getUIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION).setValue(producerConfiguration.getRegistrationRequirements().isRegistrationRequiredForFullDescription());
+ getUIFormCheckBoxInput(STRICT_MODE).setValue(producerConfiguration.isUsingStrictMode());
+ getUIFormCheckBoxInput(REQUIRES_REGISTRATION).setValue(producerConfiguration.getRegistrationRequirements().isRegistrationRequired());
+ //producerInfo.setRegistrationInfo();
+ }
+
+
+ static public class SaveActionListener extends EventListener<UIWsrpProducerEditor>
+ {
+ public void execute(Event<UIWsrpProducerEditor> event) throws Exception
+ {
+ UIWsrpProducerEditor producerEditor = event.getSource();
+
+ UIWsrpProducerEditor producerOverview = producerEditor.getAncestorOfType(UIWsrpProducerEditor.class);
+
+ WebuiRequestContext ctx = event.getRequestContext();
+ producerEditor.save(ctx);
+ //producerEditor.reset();
+
+ }
+ }
+
+ public boolean save(WebuiRequestContext context) throws Exception
+ {
+ //ConsumerRegistry consumerRegistry = getConsumerRegistry();
+ //ProducerInfo producerInfo = consumerRegistry.getProducerInfoByKey("").getRegistrationInfo().
+ ProducerConfigurationService pconfService = getProducerConfigurationService();
+ ProducerConfiguration producerConfiguration = pconfService.getConfiguration();
+
+ producerConfiguration.getRegistrationRequirements().setRegistrationRequiredForFullDescription(Boolean.parseBoolean(getUIFormCheckBoxInput(REG_REQUIRED_FOR_DESCRIPTION).getValue().toString()));
+ producerConfiguration.setUsingStrictMode(Boolean.parseBoolean(getUIFormCheckBoxInput(STRICT_MODE).getValue().toString()));
+ producerConfiguration.getRegistrationRequirements().setRegistrationRequired(Boolean.parseBoolean(getUIFormCheckBoxInput(REQUIRES_REGISTRATION).getValue().toString()));
+
+ UIApplication uiApp = context.getUIApplication();
+
+ try{
+ pconfService.saveConfiguration();
+ uiApp.addMessage(new ApplicationMessage("Producer Successfully Changed", null));
+ }catch(Exception e){
+ uiApp.addMessage(new ApplicationMessage("Producer Modification Error", null));
+
+ }
+
+ return true;
+ }
+
+
+ public ConsumerRegistry getConsumerRegistry() throws Exception
+ {
+ ExoContainer manager = ExoContainerContext.getCurrentContainer();
+ return (ConsumerRegistry)manager.getComponentInstanceOfType(ConsumerRegistry.class);
+ }
+
+ public ProducerConfigurationService getProducerConfigurationService() throws Exception
+ {
+ ExoContainer manager = ExoContainerContext.getCurrentContainer();
+ return (ProducerConfigurationService)manager.getComponentInstanceOfType(ProducerConfigurationService.class);
+ }
+}
Added: portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java (rev 0)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/java/org/exoplatform/wsrp/webui/component/UIWsrpProducerOverview.java 2009-12-21 01:53:29 UTC (rev 1083)
@@ -0,0 +1,82 @@
+/******************************************************************************
+ * 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.exoplatform.wsrp.webui.component;
+
+import org.exoplatform.container.ExoContainer;
+import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.config.annotation.ComponentConfigs;
+import org.exoplatform.webui.config.annotation.EventConfig;
+import org.exoplatform.webui.core.UIContainer;
+import org.exoplatform.webui.core.UIGrid;
+import org.exoplatform.webui.core.UIPopupWindow;
+import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
+import org.gatein.wsrp.producer.config.ProducerConfiguration;
+import org.gatein.wsrp.producer.config.ProducerConfigurationService;
+
+/** @author Wesley Hales */
+@ComponentConfigs({
+ @ComponentConfig(id = "RegPropertyGrid", type = UIGrid.class, template = "system:/groovy/webui/core/UIGrid.gtmpl"),
+ @ComponentConfig(
+ lifecycle = UIApplicationLifecycle.class,
+ template = "app:/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl",
+ events = {
+ @EventConfig(listeners = UIWsrpProducerOverview.OpenPopupActionListener.class)
+ }
+)})
+public class UIWsrpProducerOverview extends UIContainer
+{
+ public UIWsrpProducerOverview() throws Exception
+ {
+ ProducerConfiguration producerConfiguration = getProducerConfigurationService().getConfiguration();
+ UIWsrpProducerEditor producerForm = createUIComponent(UIWsrpProducerEditor.class, null, null);
+ producerForm.setProducerConfig(producerConfiguration);
+ addChild(producerForm);
+ }
+
+ static public class OpenPopupActionListener extends EventListener<UIWsrpProducerOverview>
+ {
+ public void execute(Event<UIWsrpProducerOverview> event) throws Exception
+ {
+ UIWsrpProducerOverview wsrpProducerOverview = event.getSource();
+ UIPopupWindow popup = wsrpProducerOverview.getChild(UIPopupWindow.class);
+ //UIWsrpProducerEditor editor = (UIWsrpProducerEditor)popup.getUIComponent();
+
+ //reset the form
+ //editor.setConsumer(null);
+ popup.setRendered(true);
+ popup.setShow(true);
+ popup.setShowCloseButton(true);
+ //popup.setShowMask(true);
+
+ }
+ }
+
+ public ProducerConfigurationService getProducerConfigurationService() throws Exception
+ {
+ ExoContainer manager = ExoContainerContext.getCurrentContainer();
+ return (ProducerConfigurationService)manager.getComponentInstanceOfType(ProducerConfigurationService.class);
+ }
+}
Modified: portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsoleContent.gtmpl
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsoleContent.gtmpl 2009-12-21 01:27:20 UTC (rev 1082)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsoleContent.gtmpl 2009-12-21 01:53:29 UTC (rev 1083)
@@ -1,5 +1,6 @@
<%
import org.exoplatform.wsrp.webui.component.UIWsrpConsumerOverview;
+ import org.exoplatform.wsrp.webui.component.UIWsrpProducerOverview;
def rcontext = _ctx.getRequestContext();
@@ -14,13 +15,14 @@
String selTabId = uicomponent.getSelectedTabId();
UIWsrpConsumerOverview consumerOverview = uicomponent.getChild(UIWsrpConsumerOverview.class);
+ UIWsrpProducerOverview producerOverview = uicomponent.getChild(UIWsrpProducerOverview.class);
%>
<div class="UITab GrayTabStyle">
<div class="<%= consumerOverview.getId().equals(selTabId) ? "SelectedTab" : "NormalTab" %>">
<div class="LeftTab">
<div class="RightTab">
- <% String appLink = "ajaxAsyncGetRequest('" + uicomponent.url("SelectTab",consumerOverview.getId()) + "', true)" %>
- <div class="MiddleTab" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, '${consumerOverview.getId()}', '$url');$appLink;if(eXo.portal.portalMode) eXo.portal.portalMode -= 2;">
+ <% String consumerLink = "ajaxAsyncGetRequest('" + uicomponent.url("SelectTab",consumerOverview.getId()) + "', true)" %>
+ <div class="MiddleTab" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, '${consumerOverview.getId()}', '$url');$consumerLink;if(eXo.portal.portalMode) eXo.portal.portalMode -= 2;">
<%=_ctx.appRes("UITabPane.title." + consumerOverview.getId());%>
</div>
</div>
@@ -28,12 +30,12 @@
</div>
</div>
<div class="UITab GrayTabStyle">
- <div class="NormalTab">
+ <div class="<%= producerOverview.getId().equals(selTabId) ? "SelectedTab" : "NormalTab" %>">
<div class="LeftTab">
<div class="RightTab">
-
- <div class="MiddleTab" onclick="">
- Manage Producers
+ <% String producerLink = "ajaxAsyncGetRequest('" + uicomponent.url("SelectTab",producerOverview.getId()) + "', true)" %>
+ <div class="MiddleTab" onclick="eXo.webui.UIHorizontalTabs.changeTabForUITabPane(this, '${producerOverview.getId()}', '$url');$producerLink;if(eXo.portal.portalMode) eXo.portal.portalMode -= 2;">
+ <%=_ctx.appRes("UITabPane.title." + producerOverview.getId());%>
</div>
</div>
</div>
@@ -43,6 +45,6 @@
</div>
<div class="UITabContentContainer GrayTabContainer">
<div class="UITabContent" style="display: <%=consumerOverview.getId().equals(selTabId) ? "block": "none"%>;overflow:auto;clear:both"><% uicomponent.renderUIComponent(consumerOverview); %></div>
- <div class="UITabContent" style="display:none;overflow:auto;clear:both">Producer content</div>
+ <div class="UITabContent" style="display: <%=producerOverview.getId().equals(selTabId) ? "block": "none"%>;overflow:auto;clear:both"><% uicomponent.renderUIComponent(producerOverview); %></div>
</div>
</div>
Copied: portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl (from rev 1079, portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerEditor.gtmpl)
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl (rev 0)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerEditor.gtmpl 2009-12-21 01:53:29 UTC (rev 1083)
@@ -0,0 +1,39 @@
+<%
+ import org.exoplatform.webui.form.UIFormStringInput;
+%>
+
+<div class="UILoginForm" id="ChildTest">
+ <% uiform.begin() %>
+ <%
+ UIFormStringInput name = uicomponent.getChild(UIFormStringInput.class);
+ %>
+ <div class="SignIn">Access to full service description requires consumers to be registered. <% uiform.renderChild(0); %></div>
+ <div class="SignIn">Use strict WSRP compliance. <% uiform.renderChild(1); %></div>
+ <div class="SignIn">Requires registration. Modifying this information will trigger invalidation of consumer registrations. <% uiform.renderChild(2); %></div>
+ <div class="FloatRight">
+
+
+ <div class="UIAction">
+ <table class="ActionContainer">
+ <tr>
+ <td>
+ <div onclick="<%=uicomponent.event("Save")%>" class="ActionButton LightBlueStyle">
+ <div class="ButtonLeft">
+ <div class="ButtonRight">
+ <div class="ButtonMiddle">
+ <a href="javascript:void(0);"><%=_ctx.appRes(uicomponent.getId() + ".action.Save")%></a>
+ </div>
+ </div>
+ </div>
+ </div>
+ </td>
+ </tr>
+ </table>
+ </div>
+
+
+
+ <div class="ClearRight"><span></span></div>
+ <% uiform.end() %>
+</div>
+</div>
\ No newline at end of file
Copied: portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl (from rev 1079, portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpConsumerOverview.gtmpl)
===================================================================
--- portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl (rev 0)
+++ portal/branches/wsrp-integration/portlet/exoadmin/src/main/webapp/groovy/wsrp/webui/component/UIWsrpProducerOverview.gtmpl 2009-12-21 01:53:29 UTC (rev 1083)
@@ -0,0 +1,16 @@
+
+<%
+ import org.exoplatform.webui.core.UIComponent ;
+ import org.exoplatform.webui.form.UIFormPageIterator ;
+ import org.exoplatform.webui.form.UIFormCheckBoxInput ;
+
+%>
+
+
+<div class="<%=uicomponent.getId()%>" id="<%=uicomponent.getId()%>">
+
+ <a href="<%=uicomponent.event("OpenPopup", "")%>">Edit Producer</a> |
+
+ <% uicomponent.renderChildren(); %>
+
+</div>
\ No newline at end of file
15 years
gatein SVN: r1097 - in portal/branches/wsrp-integration: web/portal/src/main/webapp/WEB-INF/conf/wsrp and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-12-21 06:05:51 -0500 (Mon, 21 Dec 2009)
New Revision: 1097
Modified:
portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml
portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
Log:
- Fixed NPE at startup as name param was renamed to domain-name.
Modified: portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml 2009-12-21 10:53:09 UTC (rev 1096)
+++ portal/branches/wsrp-integration/component/wsrp/src/test/resources/conf/test-configuration.xml 2009-12-21 11:05:51 UTC (rev 1097)
@@ -61,7 +61,7 @@
<type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
<init-params>
<value-param>
- <name>name</name>
+ <name>domain-name</name>
<value>wsrp</value>
</value-param>
<value-param>
Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
===================================================================
--- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2009-12-21 10:53:09 UTC (rev 1096)
+++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2009-12-21 11:05:51 UTC (rev 1097)
@@ -50,7 +50,7 @@
<type>org.exoplatform.commons.chromattic.ChromatticLifeCycle</type>
<init-params>
<value-param>
- <name>name</name>
+ <name>domain-name</name>
<value>wsrp</value>
</value-param>
<value-param>
15 years
gatein SVN: r1095 - tools/packager/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-21 05:52:57 -0500 (Mon, 21 Dec 2009)
New Revision: 1095
Added:
tools/packager/tags/1.0.0-Beta05/
Log:
[maven-scm] copy for tag 1.0.0-Beta05
Copied: tools/packager/tags/1.0.0-Beta05 (from rev 1094, tools/packager/trunk)
15 years