gatein SVN: r630 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-11-17 16:25:51 -0500 (Tue, 17 Nov 2009)
New Revision: 630
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGroovyPortlet.java
Log:
- use a static final field for something that looks immutable
- avoid to compute the groovy portlet id every time it is needed
- make some field final since they are
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGroovyPortlet.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGroovyPortlet.java 2009-11-17 13:30:01 UTC (rev 629)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGroovyPortlet.java 2009-11-17 21:25:51 UTC (rev 630)
@@ -31,23 +31,26 @@
public class UIGroovyPortlet extends UIPortletApplication
{
- private String DEFAULT_TEMPLATE = "system:/groovy/portal/webui/application/UIGroovyPortlet.gtmpl";
+ private static final String DEFAULT_TEMPLATE = "system:/groovy/portal/webui/application/UIGroovyPortlet.gtmpl";
- private String template_;
+ private final String template_;
- private String windowId;
+ private final String windowId;
+ private final String id;
+
public UIGroovyPortlet() throws Exception
{
PortletRequestContext context = (PortletRequestContext)WebuiRequestContext.getCurrentInstance();
PortletRequest prequest = context.getRequest();
template_ = prequest.getPreferences().getValue("template", DEFAULT_TEMPLATE);
windowId = prequest.getWindowID();
+ id = windowId + "-portlet";
}
public String getId()
{
- return windowId + "-portlet";
+ return id;
}
public String getTemplate()
15 years, 2 months
- 1
- 0
gatein SVN: r628 - in components/wsrp/trunk/consumer: src/main/java/org/gatein/wsrp/consumer and 5 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-11-17 07:24:50 -0500 (Tue, 17 Nov 2009)
New Revision: 628
Added:
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java
Removed:
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ConsumerRegistryTestCase.java
Modified:
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/EndpointConfigurationInfoTestCase.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java
components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java
Log:
- Simplified EndpointConfigurationInfo by removing all URLs apart from WSDL as we can't currently support setting individual endpoint URLs with JAX-WS.
This simplification should probably extend to ServiceFactory as well and maybe result in a merge of both concepts.
- Re-worked associated tests.
- Moved ConsumerRegistryTestCase to more appropriate registry package. Still need to be cleaned-up.
- Fixed BehaviorBackedServiceFactory to properly mock starting mechanism of ServiceFactories.
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/pom.xml 2009-11-17 12:24:50 UTC (rev 628)
@@ -109,8 +109,7 @@
<configuration>
<excludes>
<exclude>org/gatein/wsrp/protocol/v1/*</exclude>
- <exclude>org/gatein/wsrp/consumer/ConsumerRegistryTestCase*</exclude>
- <exclude>org/gatein/wsrp/consumer/EndpointConfigurationInfoTestCase*</exclude>
+ <exclude>org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase*</exclude>
</excludes>
</configuration>
</plugin>
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/EndpointConfigurationInfo.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -34,8 +34,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.BitSet;
-
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision: 13122 $
@@ -45,285 +43,52 @@
{
private final static Logger log = LoggerFactory.getLogger(EndpointConfigurationInfo.class);
- /** DB primary key */
- private Long key;
-
- private String persistentServiceDescriptionURL = UNSET;
- private String persistentMarkupURL = UNSET;
- private String persistentRegistrationURL;
- private String persistentPortletManagementURL;
- private String persistentWsdlDefinitionURL = UNSET;
-
// transient variables
/** Access to the WS */
private transient ServiceFactory serviceFactory;
private transient String remoteHostAddress;
- // Used to ensure that even invalid values can be persisted to DB so that it can be accessed from the GUI
- public final static String UNSET = "MUST BE SET";
-
- // maintain the dirty status of each URL
- private BitSet clean = new BitSet();
- private final static int SD = 0;
- private final static int M = 1;
- private final static int PM = 2;
- private final static int R = 3;
-
- /** Whether we're using information from a WSDL or not. */
- private boolean usingWSDL = true;
- private boolean isModifiedWSDL;
-
- public EndpointConfigurationInfo(ProducerInfo producerInfo)
+ public EndpointConfigurationInfo()
{
- ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo");
- producerInfo.setEndpointConfigurationInfo(this);
serviceFactory = new SOAPServiceFactory();
}
- EndpointConfigurationInfo(ProducerInfo producerInfo, ServiceFactory serviceFactory)
+ EndpointConfigurationInfo(ServiceFactory serviceFactory)
{
- ParameterValidation.throwIllegalArgExceptionIfNull(producerInfo, "ProducerInfo");
- producerInfo.setEndpointConfigurationInfo(this);
+ ParameterValidation.throwIllegalArgExceptionIfNull(serviceFactory, "ServiceFactory");
this.serviceFactory = serviceFactory;
}
- public Long getKey()
- {
- return key;
- }
-
- public void setKey(Long key)
- {
- this.key = key;
- }
-
- public boolean usesWSDL()
- {
- return (isWSDLNotNullAndSet() && !isModifiedWSDL) || usingWSDL;
- }
-
- public void setUsesWSDL(boolean useWSDL)
- {
- usingWSDL = useWSDL;
- }
-
public String getWsdlDefinitionURL()
{
- if (serviceFactory != null)
- {
- persistentWsdlDefinitionURL = (serviceFactory).getWsdlDefinitionURL();
- }
-
- return persistentWsdlDefinitionURL;
+ return serviceFactory.getWsdlDefinitionURL();
}
- public String getServiceDescriptionURL()
+ public void setWsdlDefinitionURL(String wsdlDefinitionURL)
{
- if (serviceFactory != null)
- {
- persistentServiceDescriptionURL = serviceFactory.getServiceDescriptionURL();
- }
- return persistentServiceDescriptionURL;
+ serviceFactory.setWsdlDefinitionURL(wsdlDefinitionURL);
}
- public String getMarkupURL()
+ public void start() throws Exception
{
- if (serviceFactory != null)
- {
- persistentMarkupURL = serviceFactory.getMarkupURL();
- }
- return persistentMarkupURL;
+ serviceFactory.start();
}
- public String getPortletManagementURL()
+ public void stop() throws Exception
{
- if (serviceFactory != null)
- {
- persistentPortletManagementURL = serviceFactory.getPortletManagementURL();
- }
- return persistentPortletManagementURL;
+ serviceFactory.stop();
}
- public String getRegistrationURL()
+ ServiceFactory getServiceFactory()
{
- if (serviceFactory != null)
- {
- persistentRegistrationURL = serviceFactory.getRegistrationURL();
- }
- return persistentRegistrationURL;
- }
-
- public void setServiceDescriptionURL(String serviceDescriptionURL)
- {
- if (serviceFactory != null)
- {
- serviceFactory.setServiceDescriptionURL(serviceDescriptionURL);
- }
- this.persistentServiceDescriptionURL = modifyIfNeeded(this.persistentServiceDescriptionURL, serviceDescriptionURL, SD);
-
- }
-
- public void setMarkupURL(String markupURL)
- {
- if (serviceFactory != null)
- {
- serviceFactory.setMarkupURL(markupURL);
- }
- this.persistentMarkupURL = modifyIfNeeded(this.persistentMarkupURL, markupURL, M);
- }
-
- public void setRegistrationURL(String registrationURL)
- {
- if (serviceFactory != null)
- {
- serviceFactory.setRegistrationURL(registrationURL);
- }
- this.persistentRegistrationURL = modifyIfNeeded(this.persistentRegistrationURL, registrationURL, R);
- }
-
- public void setPortletManagementURL(String portletManagementURL)
- {
- if (serviceFactory != null)
- {
- serviceFactory.setPortletManagementURL(portletManagementURL);
- }
- this.persistentPortletManagementURL = modifyIfNeeded(this.persistentPortletManagementURL, portletManagementURL, PM);
- }
-
- public void setWsdlDefinitionURL(String wsdlDefinitionURL) throws RuntimeException
- {
- this.persistentWsdlDefinitionURL = wsdlDefinitionURL;
-
- // WSDL url is optional so can be null (and in particular, it is when loaded from Hibernate most of the time)
- // do not attempt to set the URL if the service factory hasn't been created yet to avoid issues when
- // ConsumerRegistry starts (in particular, raising an exception if the WSDL is not available)
- if (isWSDLNotNullAndSet())
- {
- usingWSDL = true;
-
- internalSetWsdlURL();
- }
- else
- {
- usingWSDL = false;
- }
- }
-
- private boolean isWSDLNotNullAndSet()
- {
- return persistentWsdlDefinitionURL != null && !UNSET.equals(persistentWsdlDefinitionURL);
- }
-
- private String modifyIfNeeded(String oldValue, String newValue, int whichURL)
- {
- if ((oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null))
- {
- if (usesWSDL())
- {
- isModifiedWSDL = true;
- usingWSDL = false;
- }
-
- oldValue = newValue;
- clean.clear(whichURL);
- }
-
- return oldValue;
- }
-
- private ServiceFactory initServiceFactoryIfNeeded() throws RuntimeException
- {
- if (serviceFactory == null)
- {
- serviceFactory = new SOAPServiceFactory();
- if (usesWSDL())
- {
-// serviceFactory = new RemoteSOAPInvokerServiceFactory();
- internalSetWsdlURL();
- }
- else
- {
- if (!UNSET.equals(persistentServiceDescriptionURL) && !UNSET.equals(persistentMarkupURL))
- {
-// serviceFactory = new PerEndpointSOAPInvokerServiceFactory();
- serviceFactory.setServiceDescriptionURL(persistentServiceDescriptionURL);
- serviceFactory.setMarkupURL(persistentMarkupURL);
- serviceFactory.setPortletManagementURL(persistentPortletManagementURL);
- serviceFactory.setRegistrationURL(persistentRegistrationURL);
- }
- else
- {
- throw new IllegalStateException("Cannot initialize ServiceFactory: missing either service description or markup URLs!");
- }
- }
-
- startServiceFactoryIfNeeded();
- }
-
- return serviceFactory;
- }
-
- private void startServiceFactoryIfNeeded()
- {
- if (!serviceFactory.isAvailable())
- {
- if (!serviceFactory.isFailed())
- {
- try
- {
- serviceFactory.start();
- refreshServices(serviceFactory);
- }
- catch (Exception e)
- {
- throw new ConsumerException("Couldn't start ServiceFactory", e);
- }
- }
- else
- {
- throw new ConsumerException("ServiceFactory has an error condition that couldn't be recovered from.");
- }
- }
- }
-
- private void internalSetWsdlURL()
- {
try
{
- serviceFactory.setWsdlDefinitionURL(persistentWsdlDefinitionURL);
-
- // update the URLs based on WSDL information
- persistentMarkupURL = serviceFactory.getMarkupURL();
- persistentPortletManagementURL = serviceFactory.getPortletManagementURL();
- persistentRegistrationURL = serviceFactory.getRegistrationURL();
- persistentServiceDescriptionURL = serviceFactory.getServiceDescriptionURL();
-
- clean.set(0, 4); // if setting the WSDL URL worked, consider everything clean
- isModifiedWSDL = false;
+ start();
}
catch (Exception e)
{
throw new RuntimeException(e);
}
- }
-
- public void start() throws Exception
- {
- initServiceFactoryIfNeeded();
- }
-
- public void stop() throws Exception
- {
- if (serviceFactory != null)
- {
- serviceFactory.stop();
- }
- }
-
- ServiceFactory getServiceFactory()
- {
- initServiceFactoryIfNeeded();
- startServiceFactoryIfNeeded();
return serviceFactory;
}
@@ -356,9 +121,7 @@
{
try
{
- T service = serviceFactory.getService(clazz);
- clean.set(getIndexFor(clazz));
- return service;
+ return serviceFactory.getService(clazz);
}
catch (Exception e)
{
@@ -367,23 +130,6 @@
}
}
- private int getIndexFor(Class clazz)
- {
- if (clazz == WSRPV1ServiceDescriptionPortType.class)
- {
- return SD;
- }
- if (clazz == WSRPV1MarkupPortType.class)
- {
- return M;
- }
- if (clazz == WSRPV1PortletManagementPortType.class)
- {
- return PM;
- }
- return R;
- }
-
public boolean isAvailable()
{
return serviceFactory.isAvailable();
@@ -391,7 +137,7 @@
public boolean isRefreshNeeded()
{
- boolean result = !isAvailable() || areURLsDirty();
+ boolean result = !isAvailable();
if (result)
{
log.debug("Refresh needed");
@@ -399,12 +145,6 @@
return result;
}
- private boolean areURLsDirty()
- {
- return !clean.get(SD) || !clean.get(M) || (persistentPortletManagementURL != null && !clean.get(PM))
- || (persistentRegistrationURL != null && !clean.get(R));
- }
-
public void refresh() throws InvokerUnavailableException
{
if (isRefreshNeeded())
@@ -415,34 +155,20 @@
void forceRefresh() throws InvokerUnavailableException
{
- ServiceFactory serviceFactory = initServiceFactoryIfNeeded();
- refreshServices(serviceFactory);
+ getService(WSRPV1ServiceDescriptionPortType.class, serviceFactory);
+ getService(WSRPV1MarkupPortType.class, serviceFactory);
+ getService(WSRPV1PortletManagementPortType.class, serviceFactory);
+ getService(WSRPV1RegistrationPortType.class, serviceFactory);
}
- private void refreshServices(ServiceFactory serviceFactory) throws InvokerUnavailableException
- {
- if (areURLsDirty())
- {
- getService(WSRPV1ServiceDescriptionPortType.class, serviceFactory);
- getService(WSRPV1MarkupPortType.class, serviceFactory);
- if (persistentPortletManagementURL != null)
- {
- getService(WSRPV1PortletManagementPortType.class, serviceFactory);
- }
- if (persistentRegistrationURL != null)
- {
- getService(WSRPV1RegistrationPortType.class, serviceFactory);
- }
- }
- }
-
public String getRemoteHostAddress()
{
- if (remoteHostAddress == null || areURLsDirty())
+ if (remoteHostAddress == null)
{
// extract host URL
- int hostBegin = persistentMarkupURL.indexOf("://") + 3;
- remoteHostAddress = persistentMarkupURL.substring(0, persistentMarkupURL.indexOf('/', hostBegin));
+ String wsdl = getWsdlDefinitionURL();
+ int hostBegin = wsdl.indexOf("://") + 3;
+ remoteHostAddress = wsdl.substring(0, wsdl.indexOf('/', hostBegin));
}
return remoteHostAddress;
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/ProducerInfo.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -126,7 +126,7 @@
public ProducerInfo()
{
- persistentEndpointInfo = new EndpointConfigurationInfo(this);
+ persistentEndpointInfo = new EndpointConfigurationInfo();
persistentRegistrationInfo = RegistrationInfo.createUndeterminedRegistration(this);
}
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLWSRPConsumerFactory.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -236,42 +236,11 @@
System.out.println("setvalue endpointInfo " + localName);
}
- if ("service-description-url".equals(localName))
+ if ("endpoint-wsdl-url".equals(localName))
{
- // Resolve value that may contain properties for that one
value = StringPropertyReplacer.replaceProperties(value);
- endpointInfo.setServiceDescriptionURL(value);
+ endpointInfo.setWsdlDefinitionURL(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,
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -34,7 +34,7 @@
import javax.xml.ws.BindingProvider;
import javax.xml.ws.Service;
import java.net.MalformedURLException;
-import java.net.URL;
+import java.net.URI;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
@@ -210,32 +210,22 @@
return wsdlDefinitionURL;
}
- public void setWsdlDefinitionURL(String wsdlDefinitionURL) throws Exception
+ public void setWsdlDefinitionURL(String wsdlDefinitionURL)
{
- if (wsdlDefinitionURL == null || wsdlDefinitionURL.length() == 0)
- {
- throw new IllegalArgumentException("Require a non-empty, non-null URL specifying where to find the WSRP " +
- "services definition");
- }
+ this.wsdlDefinitionURL = wsdlDefinitionURL;
- // only modify WSDL URL if it's different from the previous one as this will trigger re-import of data from remote host
- if (!wsdlDefinitionURL.equals(this.wsdlDefinitionURL))
- {
- this.wsdlDefinitionURL = wsdlDefinitionURL;
-
- // we need a refresh so mark as not available but not failed
- setAvailable(false);
- setFailed(false);
- }
+ // we need a refresh so mark as not available but not failed
+ setAvailable(false);
+ setFailed(false);
}
public void start() throws Exception
{
try
{
- URL wsdlURL = new URL(wsdlDefinitionURL);
+ URI wsdlURL = new URI(wsdlDefinitionURL);
- Service service = Service.create(wsdlURL, SERVICE);
+ Service service = Service.create(wsdlURL.toURL(), SERVICE);
// WSRPV1MarkupPortType markupPortType = service.getPort(WSRPBaseService, WSRPV1MarkupPortType.class);
WSRPV1MarkupPortType markupPortType = service.getPort(WSRPV1MarkupPortType.class);
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/ServiceFactory.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -70,7 +70,7 @@
void stop();
- void setWsdlDefinitionURL(String wsdlDefinitionURL) throws Exception;
+ void setWsdlDefinitionURL(String wsdlDefinitionURL);
String getWsdlDefinitionURL();
}
Deleted: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ConsumerRegistryTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ConsumerRegistryTestCase.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ConsumerRegistryTestCase.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -1,123 +0,0 @@
-/******************************************************************************
- * 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.gatein.wsrp.consumer;
-
-import junit.framework.TestCase;
-import org.gatein.wsrp.WSRPConsumer;
-import org.gatein.wsrp.consumer.registry.ConsumerRegistry;
-import org.gatein.wsrp.consumer.registry.xml.XMLConsumerRegistry;
-import org.jboss.unit.api.pojo.annotations.Test;
-
-import java.util.Collection;
-
-/**
- * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
- * @version $Revision: 12686 $
- * @since 2.6
- */
-@Test
-public class ConsumerRegistryTestCase extends TestCase
-{
- private ConsumerRegistry registry = new XMLConsumerRegistry();
-
- public ConsumerRegistry getRegistry()
- {
- return registry;
- }
-
- public void setRegistry(ConsumerRegistry registry)
- {
- this.registry = registry;
- }
-
- public void testCRUD()
- {
-// TransactionAssert.beginTransaction();
- String id = "test";
- WSRPConsumer consumer = registry.createConsumer(id, null);
- assertNotNull(consumer);
- assertEquals(id, consumer.getProducerId());
- ProducerInfo info = consumer.getProducerInfo();
- assertNotNull(info);
- assertEquals(consumer.getProducerId(), info.getId());
- EndpointConfigurationInfo endpoint = info.getEndpointConfigurationInfo();
- assertNotNull(endpoint);
- assertEquals(EndpointConfigurationInfo.UNSET, endpoint.getServiceDescriptionURL());
- assertEquals(EndpointConfigurationInfo.UNSET, endpoint.getMarkupURL());
- RegistrationInfo regInfo = info.getRegistrationInfo();
- assertTrue(regInfo.isUndetermined());
-// TransactionAssert.commitTransaction();
-
-// TransactionAssert.beginTransaction();
- try
- {
- registry.createConsumer(id, null);
- fail("Shouldn't be possible to create a consumer with an existing id");
- }
- catch (ConsumerException expected)
- {
- // transaction should have been rolled back
-// TransactionAssert.rollbackTransaction();
- }
-
-// TransactionAssert.beginTransaction();
- consumer = registry.getConsumer(id);
- assertNotNull(consumer);
- assertEquals(id, consumer.getProducerId());
- info = consumer.getProducerInfo();
- assertNotNull(info);
- assertEquals(consumer.getProducerId(), info.getId());
- endpoint = info.getEndpointConfigurationInfo();
- assertNotNull(endpoint);
- assertEquals(EndpointConfigurationInfo.UNSET, endpoint.getServiceDescriptionURL());
- assertEquals(EndpointConfigurationInfo.UNSET, endpoint.getMarkupURL());
- assertTrue(info.getRegistrationInfo().isUndetermined());
-
- assertNull(registry.getConsumer("inexistent"));
- Collection consumers = registry.getConfiguredConsumers();
- assertNotNull(consumers);
- assertEquals(1, consumers.size());
- assertTrue(consumers.contains(consumer));
-// TransactionAssert.commitTransaction();
- }
-
- public void testUpdateProducerInfo()
- {
- // create a foo consumer
-// TransactionAssert.beginTransaction();
- String id = "foo";
- WSRPConsumer consumer = registry.createConsumer(id, null);
- ProducerInfo info = consumer.getProducerInfo();
-// TransactionAssert.commitTransaction();
-
-// TransactionAssert.beginTransaction();
- // change the id on the consumer's producer info and save it
- info.setId("bar");
- registry.updateProducerInfo(info);
-
- assertNull(registry.getConsumer(id));
- assertEquals(consumer, registry.getConsumer("bar"));
-// TransactionAssert.commitTransaction();
- }
-}
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/EndpointConfigurationInfoTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/EndpointConfigurationInfoTestCase.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/EndpointConfigurationInfoTestCase.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -25,6 +25,7 @@
import junit.framework.TestCase;
import org.gatein.pc.api.InvokerUnavailableException;
import org.gatein.wsrp.services.ServiceFactory;
+import org.gatein.wsrp.test.support.BehaviorBackedServiceFactory;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -38,79 +39,26 @@
protected void setUp() throws Exception
{
-// info = new EndpointConfigurationInfo(); // todo fix me
+ info = new EndpointConfigurationInfo(new BehaviorBackedServiceFactory());
}
- public void testSetURLs() throws InvokerUnavailableException
- {
- // default state is to use WSDL
- assertTrue(info.usesWSDL());
-
-
- info.setServiceDescriptionURL(url);
- assertEquals(url, info.getServiceDescriptionURL());
-
- // changing the URLs should switch to not using WSDL anymore...
- assertFalse(info.usesWSDL());
- try
- {
- info.getServiceFactory();
- fail("Missing markup URL: service factory should not be initialized");
- }
- catch (IllegalStateException expected)
- {
- }
-
- info.setMarkupURL(url);
- assertFalse(info.usesWSDL());
- assertNotNull(info.getServiceFactory());
- assertEquals(url, info.getServiceFactory().getServiceDescriptionURL());
- assertEquals(url, info.getServiceFactory().getMarkupURL());
- assertTrue(info.getServiceFactory().isAvailable());
- }
-
public void testSetWSDLURL() throws InvokerUnavailableException
{
- assertTrue(info.usesWSDL());
-
- // todo fix me
-
- /*info.setServiceDescriptionURL(url);
- info.setMarkupURL(url);
- assertTrue(info.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
- assertFalse(info.usesWSDL());
-
String bea = "http://wsrp.bea.com:7001/producer/producer?WSDL";
info.setWsdlDefinitionURL(bea);
assertEquals(bea, info.getWsdlDefinitionURL());
- assertTrue(info.getServiceFactory() instanceof RemoteSOAPInvokerServiceFactory);
- assertEquals(bea, ((RemoteSOAPInvokerServiceFactory)info.getServiceFactory()).getWsdlDefinitionURL());
- assertTrue(info.usesWSDL());
-
- info.setMarkupURL(url);
- assertEquals(url, info.getMarkupURL());
- assertEquals(url, info.getServiceFactory().getMarkupURL());
- assertFalse(info.usesWSDL());*/
}
- public void testSetInvalidWSDLURL()
+ /**
+ * Setting the WSDL URL shouldn't trigger an attempt to retrieve the associated WSDL so it should be possible to
+ * provide a URL that doesn't correspond to a valid WSDL location without triggering an error until a refresh
+ */
+ public void testSetWSDLURLDoesNotTriggerWSDLRetrieval()
{
info.setWsdlDefinitionURL(url);
- assertTrue(info.usesWSDL());
assertEquals(url, info.getWsdlDefinitionURL());
}
- public void testSetNullWSDLURL()
- {
- info.setServiceDescriptionURL(url);
- info.setMarkupURL(url);
-
- // it should be possible to set the WSDL to null for Hibernate
- info.setWsdlDefinitionURL(null);
-
- assertFalse(info.usesWSDL());
- }
-
public void testRefreshWSDL() throws Exception
{
assertTrue(info.isRefreshNeeded());
@@ -123,25 +71,12 @@
assertTrue(info.isAvailable());
}
- public void testRefresh() throws Exception
+ public void testGetRemoteHost()
{
- assertTrue(info.isRefreshNeeded());
- assertFalse(info.isAvailable());
+ String bea = "http://wsrp.bea.com:7001/producer/producer?WSDL";
+ info.setWsdlDefinitionURL(bea);
- // change the service factory to a fake one to be able to simulate access to endpoint
-// info.setServiceFactory(new BehaviorBackedServiceFactory()); //todo
- info.refresh();
- assertFalse(info.isRefreshNeeded());
- assertTrue(info.isAvailable());
-
- info.setServiceDescriptionURL(url);
- assertTrue(info.isRefreshNeeded());
-
- info.getRegistrationService();
- assertTrue(info.isRefreshNeeded());
-
- info.getServiceDescriptionService();
- assertFalse(info.isRefreshNeeded());
+ assertEquals("http://wsrp.bea.com:7001", info.getRemoteHostAddress());
}
public void testGetServiceFactory() throws Exception
@@ -149,8 +84,6 @@
assertTrue(info.isRefreshNeeded());
assertFalse(info.isAvailable());
- // change the service factory to a fake one to be able to simulate access to endpoint
-// info.setServiceFactory(new BehaviorBackedServiceFactory()); // todo
ServiceFactory factory = info.getServiceFactory();
assertNotNull(factory);
assertFalse(info.isRefreshNeeded());
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ProducerInfoTestCase.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -68,10 +68,11 @@
{
info = new ProducerInfo();
info.setId("test");
+
serviceFactory = new BehaviorBackedServiceFactory();
+ EndpointConfigurationInfo eci = new EndpointConfigurationInfo(serviceFactory);
+ info.setEndpointConfigurationInfo(eci);
- EndpointConfigurationInfo eci = new EndpointConfigurationInfo(info, serviceFactory);
-
info.setRegistry(new MockConsumerRegistry());
}
Copied: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java (from rev 592, components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/ConsumerRegistryTestCase.java)
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java (rev 0)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -0,0 +1,122 @@
+/******************************************************************************
+ * 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.gatein.wsrp.consumer.registry;
+
+import junit.framework.TestCase;
+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.RegistrationInfo;
+import org.gatein.wsrp.consumer.registry.xml.XMLConsumerRegistry;
+import org.jboss.unit.api.pojo.annotations.Test;
+
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision: 12686 $
+ * @since 2.6
+ */
+@Test
+public class ConsumerRegistryTestCase extends TestCase
+{
+ private ConsumerRegistry registry = new XMLConsumerRegistry();
+
+ public ConsumerRegistry getRegistry()
+ {
+ return registry;
+ }
+
+ public void setRegistry(ConsumerRegistry registry)
+ {
+ this.registry = registry;
+ }
+
+ public void testCRUD()
+ {
+// TransactionAssert.beginTransaction();
+ String id = "test";
+ WSRPConsumer consumer = registry.createConsumer(id, null);
+ assertNotNull(consumer);
+ assertEquals(id, consumer.getProducerId());
+ ProducerInfo info = consumer.getProducerInfo();
+ assertNotNull(info);
+ assertEquals(consumer.getProducerId(), info.getId());
+ EndpointConfigurationInfo endpoint = info.getEndpointConfigurationInfo();
+ assertNotNull(endpoint);
+ RegistrationInfo regInfo = info.getRegistrationInfo();
+ assertTrue(regInfo.isUndetermined());
+// TransactionAssert.commitTransaction();
+
+// TransactionAssert.beginTransaction();
+ try
+ {
+ registry.createConsumer(id, null);
+ fail("Shouldn't be possible to create a consumer with an existing id");
+ }
+ catch (ConsumerException expected)
+ {
+ // transaction should have been rolled back
+// TransactionAssert.rollbackTransaction();
+ }
+
+// TransactionAssert.beginTransaction();
+ consumer = registry.getConsumer(id);
+ assertNotNull(consumer);
+ assertEquals(id, consumer.getProducerId());
+ info = consumer.getProducerInfo();
+ assertNotNull(info);
+ assertEquals(consumer.getProducerId(), info.getId());
+ endpoint = info.getEndpointConfigurationInfo();
+ assertNotNull(endpoint);
+ assertTrue(info.getRegistrationInfo().isUndetermined());
+
+ assertNull(registry.getConsumer("inexistent"));
+ Collection consumers = registry.getConfiguredConsumers();
+ assertNotNull(consumers);
+ assertEquals(1, consumers.size());
+ assertTrue(consumers.contains(consumer));
+// TransactionAssert.commitTransaction();
+ }
+
+ public void testUpdateProducerInfo()
+ {
+ // create a foo consumer
+// TransactionAssert.beginTransaction();
+ String id = "foo";
+ WSRPConsumer consumer = registry.createConsumer(id, null);
+ ProducerInfo info = consumer.getProducerInfo();
+// TransactionAssert.commitTransaction();
+
+// TransactionAssert.beginTransaction();
+ // change the id on the consumer's producer info and save it
+ info.setId("bar");
+ registry.updateProducerInfo(info);
+
+ assertNull(registry.getConsumer(id));
+ assertEquals(consumer, registry.getConsumer("bar"));
+// TransactionAssert.commitTransaction();
+ }
+}
Property changes on: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/consumer/registry/ConsumerRegistryTestCase.java
___________________________________________________________________
Name: svn:executable
+ *
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/BehaviorBackedServiceFactory.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -62,6 +62,8 @@
private final static String PM_URL = "pm";
private final static String R_URL = "r";
private boolean initialized = false;
+ private String wsdl = DEFAULT_WSDL_URL;
+ public static final String DEFAULT_WSDL_URL = "http://example.com?wsdl";
public BehaviorBackedServiceFactory()
@@ -72,6 +74,11 @@
public <T> T getService(Class<T> serviceClass) throws Exception
{
+ if (!isAvailable() && !isFailed())
+ {
+ start();
+ }
+
if (WSRPV1ServiceDescriptionPortType.class.isAssignableFrom(serviceClass))
{
return (T)registry.getServiceDescriptionBehavior();
@@ -103,12 +110,7 @@
public boolean isAvailable()
{
- if (!initialized)
- {
- initialized = true;
- return false;
- }
- return true;
+ return initialized;
}
public boolean isFailed()
@@ -168,7 +170,7 @@
public void start() throws Exception
{
- // do nothing
+ initialized = true;
}
public void stop()
@@ -176,14 +178,14 @@
throw new NotYetImplemented();
}
- public void setWsdlDefinitionURL(String wsdlDefinitionURL) throws Exception
+ public void setWsdlDefinitionURL(String wsdlDefinitionURL)
{
- //To change body of implemented methods use File | Settings | File Templates.
+ wsdl = wsdlDefinitionURL;
}
public String getWsdlDefinitionURL()
{
- return null; //To change body of implemented methods use File | Settings | File Templates.
+ return wsdl;
}
public void destroy()
Modified: components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java
===================================================================
--- components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2009-11-17 11:01:58 UTC (rev 627)
+++ components/wsrp/trunk/consumer/src/test/java/org/gatein/wsrp/test/support/MockConsumerRegistry.java 2009-11-17 12:24:50 UTC (rev 628)
@@ -121,8 +121,6 @@
MockWSRPConsumer consumer = new MockWSRPConsumer(CONSUMER2);
consumer.getProducerInfo().setActive(true);
EndpointConfigurationInfo info = consumer.getProducerInfo().getEndpointConfigurationInfo();
- info.setServiceDescriptionURL(MOCK_SERVICE_DESCRIPTION);
- info.setMarkupURL(MOCK_MARKUP);
consumers.put(CONSUMER2, consumer);
}
15 years, 2 months
- 1
- 0
gatein SVN: r627 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-17 06:01:58 -0500 (Tue, 17 Nov 2009)
New Revision: 627
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
Log:
GTNPORTAL-244: Replace AccountPortlet with RegisterPortlet in register page
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2009-11-17 10:13:06 UTC (rev 626)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal/classic/pages.xml 2009-11-17 11:01:58 UTC (rev 627)
@@ -87,9 +87,9 @@
<portlet-application>
<portlet>
<application-ref>exoadmin</application-ref>
- <portlet-ref>AccountPortlet</portlet-ref>
+ <portlet-ref>RegisterPortlet</portlet-ref>
</portlet>
- <title>New Account</title>
+ <title>Register Account</title>
<access-permissions>*:/platform/guests</access-permissions>
<show-info-bar>false</show-info-bar>
</portlet-application>
15 years, 2 months
- 1
- 0
gatein SVN: r626 - in portal/trunk/portlet/exoadmin/src/main: webapp/WEB-INF and 7 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-17 05:13:06 -0500 (Tue, 17 Nov 2009)
New Revision: 626
Added:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterPortlet.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml
portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/
portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/webui/
portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/webui/component/
portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/webui/component/DefaultStylesheet.css
Modified:
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
Log:
GTNPORTAL-244: Create a simple register account portlet
Added: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java (rev 0)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterForm.java 2009-11-17 10:13:06 UTC (rev 626)
@@ -0,0 +1,135 @@
+/**
+ * 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.
+ */
+
+package org.exoplatform.account.webui.component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.exoplatform.services.organization.OrganizationService;
+import org.exoplatform.services.organization.UserHandler;
+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.lifecycle.UIFormLifecycle;
+import org.exoplatform.webui.event.Event;
+import org.exoplatform.webui.event.EventListener;
+import org.exoplatform.webui.event.Event.Phase;
+import org.exoplatform.webui.form.UIForm;
+import org.exoplatform.webui.form.UIFormInputWithActions;
+import org.exoplatform.webui.form.UIFormInputWithActions.ActionData;
+
+/**
+ *
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * @version $Id$
+ *
+ */
+
+@ComponentConfig(
+ lifecycle = UIFormLifecycle.class,
+ template = "system:/groovy/webui/form/UIForm.gtmpl",
+ events = {
+ @EventConfig( listeners = UIRegisterForm.SubscribeActionListener.class),
+ @EventConfig( listeners = UIRegisterForm.ResetActionListener.class, phase = Phase.DECODE),
+ @EventConfig( name = UIRegisterForm.CheckUsernameAvailability.LISTENER_NAME,
+ listeners = UIRegisterForm.CheckUsernameAvailability.class,
+ phase = Phase.DECODE)
+ }
+)
+public class UIRegisterForm extends UIForm {
+
+ private final static String[] ACTIONS = {"Subscribe", "Reset"};
+
+ public UIRegisterForm() throws Exception{
+ UIFormInputWithActions registerInput = new UIRegisterInputSet("RegisterInputSet");
+ //Set actions on registerInput 's User Name field
+ List<ActionData> fieldActions = new ArrayList<ActionData>();
+ ActionData checkAvailable = new ActionData();
+ checkAvailable.setActionListener(CheckUsernameAvailability.LISTENER_NAME);
+ checkAvailable.setActionName(CheckUsernameAvailability.LISTENER_NAME);
+ checkAvailable.setActionType(ActionData.TYPE_ICON);
+ checkAvailable.setCssIconClass("SearchIcon");
+ fieldActions.add(checkAvailable);
+ registerInput.setActionField(UIRegisterInputSet.USER_NAME, fieldActions);
+
+ addUIFormInput(registerInput);
+ setActions(ACTIONS);
+ }
+
+ static public class SubscribeActionListener extends EventListener<UIRegisterForm>{
+ @Override
+ public void execute(Event<UIRegisterForm> event) throws Exception {
+ UIRegisterForm registerForm = event.getSource();
+ OrganizationService orgService = registerForm.getApplicationComponent(OrganizationService.class);
+ UserHandler userHandler = orgService.getUserHandler();
+ WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
+ UIRegisterInputSet registerInput = registerForm.getChild(UIRegisterInputSet.class);
+
+ if(registerInput.save(userHandler, context)){
+ //TODO: Send email and add Account Activating feature
+ }
+ }
+ }
+
+ static public class CheckUsernameAvailability extends EventListener<UIRegisterForm>{
+
+ final static String LISTENER_NAME = "CheckUsernameAvailability";
+
+ @Override
+ public void execute(Event<UIRegisterForm> event) throws Exception
+ {
+ UIRegisterForm registerForm = event.getSource();
+ OrganizationService orgService = registerForm.getApplicationComponent(OrganizationService.class);
+ UIRegisterInputSet registerInput = registerForm.getChild(UIRegisterInputSet.class);
+ String typedUsername = registerInput.getUIStringInput(UIRegisterInputSet.USER_NAME).getValue();
+
+ if(usernameIsUsed(typedUsername, orgService)){
+ WebuiRequestContext context = WebuiRequestContext.getCurrentInstance();
+ UIApplication uiApp = context.getUIApplication();
+
+ uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-exist", new String[]{ typedUsername}));
+ }
+ }
+
+ private boolean usernameIsUsed(String username, OrganizationService orgService){
+ UserHandler userHandler = orgService.getUserHandler();
+ try{
+ if( userHandler.findUserByName(username) != null){
+ return true;
+ }
+ }catch(Exception ex){
+ ex.printStackTrace();
+ }
+ return false;
+ }
+ }
+
+ static public class ResetActionListener extends EventListener<UIRegisterForm>{
+ @Override
+ public void execute(Event<UIRegisterForm> event) throws Exception
+ {
+ // TODO Auto-generated method stub
+ UIRegisterForm registerForm = event.getSource();
+ registerForm.reset();
+ }
+ }
+}
Added: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java (rev 0)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterInputSet.java 2009-11-17 10:13:06 UTC (rev 626)
@@ -0,0 +1,152 @@
+/*
+ * 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.
+ */
+package org.exoplatform.account.webui.component;
+
+import org.exoplatform.services.organization.Query;
+import org.exoplatform.services.organization.User;
+import org.exoplatform.services.organization.UserHandler;
+import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.webui.application.WebuiRequestContext;
+import org.exoplatform.webui.core.UIApplication;
+import org.exoplatform.webui.form.UIFormInputWithActions;
+import org.exoplatform.webui.form.UIFormStringInput;
+import org.exoplatform.webui.form.validator.EmailAddressValidator;
+import org.exoplatform.webui.form.validator.ExpressionValidator;
+import org.exoplatform.webui.form.validator.MandatoryValidator;
+import org.exoplatform.webui.form.validator.PasswordStringLengthValidator;
+import org.exoplatform.webui.form.validator.ResourceValidator;
+import org.exoplatform.webui.form.validator.StringLengthValidator;
+
+/**
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * @version $Id$
+ *
+ */
+public class UIRegisterInputSet extends UIFormInputWithActions
+{
+ protected static final String USER_NAME = "User Name:";
+
+ protected static final String PASSWORD = "Password:";
+
+ protected static final String CONFIRM_PASSWORD = "Confirm Password:";
+
+ protected static final String FIRST_NAME = "First Name:";
+
+ protected static final String LAST_NAME = "Last Name:";
+
+ protected static final String EMAIL_ADDRESS = "Email Address:";
+
+ public UIRegisterInputSet(String name) throws Exception{
+ super(name);
+
+ addUIFormInput(new UIFormStringInput(USER_NAME, USER_NAME, null).addValidator(MandatoryValidator.class)
+ .addValidator(StringLengthValidator.class, 3, 30).addValidator(ResourceValidator.class).addValidator(
+ ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\-\\d]+$", "ResourceValidator.msg.Invalid-char"));
+
+ addUIFormInput(new UIFormStringInput(PASSWORD, PASSWORD, null).setType(UIFormStringInput.PASSWORD_TYPE)
+ .addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class, 6, 30));
+
+ addUIFormInput(new UIFormStringInput(CONFIRM_PASSWORD, CONFIRM_PASSWORD, null).setType(UIFormStringInput.PASSWORD_TYPE)
+ .addValidator(MandatoryValidator.class).addValidator(PasswordStringLengthValidator.class, 6, 30));
+
+ addUIFormInput(new UIFormStringInput(FIRST_NAME, FIRST_NAME, null).addValidator(StringLengthValidator.class, 3,
+ 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$",
+ "FirstCharacterNameValidator.msg").addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$",
+ "ResourceValidator.msg.Invalid-char"));
+
+ addUIFormInput(new UIFormStringInput(LAST_NAME, LAST_NAME, null).addValidator(StringLengthValidator.class, 3,
+ 45).addValidator(MandatoryValidator.class).addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{ASCII}]+$",
+ "FirstCharacterNameValidator.msg").addValidator(ExpressionValidator.class, "^[\\p{L}][\\p{L}._\\- \\d]+$",
+ "ResourceValidator.msg.Invalid-char"));
+
+ addUIFormInput(new UIFormStringInput(EMAIL_ADDRESS, EMAIL_ADDRESS, null).addValidator(MandatoryValidator.class).addValidator(
+ EmailAddressValidator.class));
+ }
+
+ private String getUserName(){
+ return getUIStringInput(USER_NAME).getValue();
+ }
+
+ private String getEmail(){
+ return getUIStringInput(EMAIL_ADDRESS).getValue();
+ }
+
+ private String getPassword(){
+ return getUIStringInput(PASSWORD).getValue();
+ }
+
+ private String getFirstName(){
+ return getUIStringInput(FIRST_NAME).getValue();
+ }
+
+ private String getLastName(){
+ return getUIStringInput(LAST_NAME).getValue();
+ }
+
+ /**
+ * Use this method instead of invokeSetBinding, to avoid abusing reflection
+ * @param user
+ */
+ private void bindingFields(User user){
+ user.setPassword(getPassword());
+ user.setFirstName(getFirstName());
+ user.setLastName(getLastName());
+ user.setEmail(getEmail());
+ }
+
+ public boolean save(UserHandler userHandler, WebuiRequestContext context) throws Exception
+ {
+ UIApplication uiApp = context.getUIApplication();
+ String pass = getPassword();
+ String confirm_pass = getUIStringInput(CONFIRM_PASSWORD).getValue();
+
+ if (!pass.equals(confirm_pass))
+ {
+ uiApp.addMessage(new ApplicationMessage("UIAccountForm.msg.password-is-not-match", null));
+ return false;
+ }
+
+ String username = getUserName();
+
+ //Check if user name already existed
+ if (userHandler.findUserByName(username) != null)
+ {
+ Object[] args = {username};
+ uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.user-exist", args));
+ return false;
+ }
+
+ //Check if mail address is already used
+ Query query = new Query();
+ query.setEmail(getEmail());
+ if (userHandler.findUsers(query).getAll().size() > 0)
+ {
+ Object[] args = {username};
+ uiApp.addMessage(new ApplicationMessage("UIAccountInputSet.msg.email-exist", args));
+ return false;
+ }
+
+ User user = userHandler.createUserInstance(username);
+ bindingFields(user);
+
+ userHandler.createUser(user, true);//Broadcast user creaton event
+ reset();//Reset the input form
+ return true;
+ }
+}
Added: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterPortlet.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterPortlet.java (rev 0)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/account/webui/component/UIRegisterPortlet.java 2009-11-17 10:13:06 UTC (rev 626)
@@ -0,0 +1,39 @@
+/**
+ * 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.
+ */
+
+package org.exoplatform.account.webui.component;
+
+import org.exoplatform.webui.config.annotation.ComponentConfig;
+import org.exoplatform.webui.core.UIPortletApplication;
+import org.exoplatform.webui.core.lifecycle.UIApplicationLifecycle;
+
+/**
+ *
+ * @author <a href="mailto:hoang281283@gmail.com">Minh Hoang TO</a>
+ * @version $Id$
+ *
+ */
+
+@ComponentConfig(lifecycle = UIApplicationLifecycle.class)
+public class UIRegisterPortlet extends UIPortletApplication {
+
+ public UIRegisterPortlet() throws Exception{
+ addChild(UIRegisterForm.class, null, null);
+ }
+}
Added: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml (rev 0)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/RegisterPortlet/webui/configuration.xml 2009-11-17 10:13:06 UTC (rev 626)
@@ -0,0 +1,30 @@
+<!--
+
+ 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.
+
+-->
+
+<webui-configuration>
+ <application>
+ <ui-component-root>org.exoplatform.account.webui.component.UIRegisterPortlet</ui-component-root>
+ <state-manager>org.exoplatform.webui.application.portlet.ParentAppStateManager</state-manager>
+ <application-lifecycle-listeners>
+ <listener>org.exoplatform.portal.application.PortletStatisticLifecycle</listener>
+ </application-lifecycle-listeners>
+ </application>
+</webui-configuration>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2009-11-17 09:47:57 UTC (rev 625)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2009-11-17 10:13:06 UTC (rev 626)
@@ -74,6 +74,15 @@
<skin-name>Default</skin-name>
<css-path>/skin/navigation/webui/component/DefaultStylesheet.css</css-path>
</portlet-skin>
+
+ <!-- Register Portlet skins -->
+
+ <portlet-skin>
+ <application-name>exoadmin</application-name>
+ <portlet-name>RegisterPortlet</portlet-name>
+ <skin-name>Default</skin-name>
+ <css-path>/skin/register/webui/component/DefaultStylesheet.css</css-path>
+ </portlet-skin>
</gatein-resources>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-17 09:47:57 UTC (rev 625)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-17 10:13:06 UTC (rev 626)
@@ -79,7 +79,6 @@
</portlet-info>
</portlet>
- <!--
<portlet>
<description xml:lang="EN">Register Portlet</description>
<portlet-name>RegisterPortlet</portlet-name>
@@ -98,14 +97,13 @@
</supports>
<supported-locale>en</supported-locale>
- <resource-bundle>locale.portlet.exoadmin.RegisterPortlet</resource-bundle>
+ <!--<resource-bundle>locale.portlet.exoadmin.RegisterPortlet</resource-bundle>-->
<portlet-info>
<title>Register Portlet</title>
<short-title>Register Portlet</short-title>
<keywords>Administration</keywords>
</portlet-info>
</portlet>
- -->
<portlet>
<description xml:lang="EN">Group Navigation Portlet</description>
Added: portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/webui/component/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/webui/component/DefaultStylesheet.css (rev 0)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/skin/register/webui/component/DefaultStylesheet.css 2009-11-17 10:13:06 UTC (rev 626)
@@ -0,0 +1,18 @@
+/**
+ * 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.
+ */
15 years, 2 months
- 1
- 0
gatein SVN: r625 - portal/branches.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2009-11-17 04:47:57 -0500 (Tue, 17 Nov 2009)
New Revision: 625
Added:
portal/branches/portalsession/
Log:
copied trunk at revision 624 for prototyping portal session replication
Copied: portal/branches/portalsession (from rev 624, portal/trunk)
15 years, 2 months
- 1
- 0
gatein SVN: r624 - portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-17 04:02:44 -0500 (Tue, 17 Nov 2009)
New Revision: 624
Modified:
portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java
Log:
GTNPORTAL-250 NPE when edit user in user and group management page
Modified: portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java
===================================================================
--- portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2009-11-17 08:26:49 UTC (rev 623)
+++ portal/trunk/webui/eXo/src/main/java/org/exoplatform/webui/organization/UIUserProfileInputSet.java 2009-11-17 09:02:44 UTC (rev 624)
@@ -106,7 +106,7 @@
{
UIFormSelectBox langSelectBox = new UIFormSelectBox(key, key, null);
set.addUIFormInput(langSelectBox);
- initLanguageCombo();
+ initLanguageCombo(langSelectBox);
continue;
}
set.addUIFormInput(new UIFormStringInput(key, null, null));
@@ -119,13 +119,13 @@
@Override
public void processRender(WebuiRequestContext context) throws Exception
{
- initLanguageCombo();
+ UIFormSelectBox langSelectBox = this.findComponentById("user.language");
+ initLanguageCombo(langSelectBox);
super.processRender(context);
}
- private void initLanguageCombo()
- {
- UIFormSelectBox langSelectBox = this.findComponentById("user.language");
+ private void initLanguageCombo(UIFormSelectBox langSelectBox)
+ {
if (langSelectBox == null)
return;
String selectedLang = langSelectBox.getSelectedValues()[0];
15 years, 2 months
- 1
- 0
gatein SVN: r623 - in portal/trunk: web/portal/src/main/webapp/groovy/portal/webui/application and 2 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-17 03:26:49 -0500 (Tue, 17 Nov 2009)
New Revision: 623
Modified:
portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
Log:
GTNPORTAL-83: Update relevant Javascript and server-side action listeners
Modified: portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js
===================================================================
--- portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2009-11-17 05:20:43 UTC (rev 622)
+++ portal/trunk/web/eXoResources/src/main/webapp/javascript/eXo/portal/UIPortal.js 2009-11-17 08:26:49 UTC (rev 623)
@@ -515,9 +515,7 @@
window.location = url + '&action='+ action ;
} ;
-UIPortal.prototype.removeComponent = function(uri, componentId) {
- var result = ajaxAsyncGetRequest(uri, false) ;
- if(result == "OK") {
+UIPortal.prototype.removeComponent = function(componentId) {
var comp = document.getElementById(componentId);
var viewPage = eXo.core.DOMUtil.findAncestorByClass(comp, "VIEW-PAGE");
eXo.core.DOMUtil.removeElement(comp);
@@ -528,16 +526,15 @@
viewPage.style.paddingBottom = "50px";
viewPage.style.paddingLeft = "0px";
}
- }
};
+
UIPortal.prototype.changeComposerSaveButton = function() {
if(eXo.portal.hasEditted == false) {
var uiWorkingWS = document.getElementById("UIWorkingWorkspace");
var portalComposer = eXo.core.DOMUtil.findFirstDescendantByClass(uiWorkingWS, "div", "UIPortalComposer");
var saveButton = eXo.core.DOMUtil.findFirstDescendantByClass(portalComposer, "a", "SaveButton");
if(saveButton) eXo.core.DOMUtil.replaceClass(saveButton, "SaveButton", "EdittedSaveButton");
- ajaxAsyncGetRequest(eXo.env.server.createPortalURL(portalComposer.id, "ChangeEdittedState", true));
}
};
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-11-17 05:20:43 UTC (rev 622)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/application/UIPortlet.gtmpl 2009-11-17 08:26:49 UTC (rev 623)
@@ -16,13 +16,6 @@
String onControlOver = "eXo.webui.UIPortlet.onControlOver(this, true);";
String onControlOut = "eXo.webui.UIPortlet.onControlOver(this, false);";
-
- String deleteUri = uicomponent.url('DeleteComponent', uicomponent.id);
- String keyMark = "window.location=";
- String confirm = deleteUri.substring(0, deleteUri.indexOf(keyMark));
- String url = deleteUri.substring(deleteUri.indexOf(keyMark) + keyMark.length());
- url = url.substring(0, url.lastIndexOf(";"));
- deleteUri = confirm + " eXo.portal.UIPortal.removeComponent(" + url + ",'UIPortlet-" + uicomponent.id + "')";
WindowState windowState = uicomponent.getCurrentWindowState();
boolean isDesktop = "Window".equals(uicomponent.getPortletStyle());
@@ -321,10 +314,7 @@
%>
<div class="PortletIcon $portletIcon">$title</div>
<a href="<%=uicomponent.event("EditPortlet","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditPortletPropertiesIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.editPortlet");%>"></a>
- <!--
<a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
- -->
- <a href="$deleteUri;eXo.portal.UIPortal.changeComposerSaveButton()" class="DeletePortletIcon" title="<%=_ctx.appRes("UIPortlet.tooltip.deletePortlet");%>"></a>
</div>
<div class="ClearLeft"><span></span></div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2009-11-17 05:20:43 UTC (rev 622)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIContainer.gtmpl 2009-11-17 08:26:49 UTC (rev 623)
@@ -17,13 +17,6 @@
if(uiComponentHeight != null) cssStyle += "height: "+uiComponentHeight+";"
if(cssStyle.length() > 0) cssStyle += "\"";
- String deleteUri = uicomponent.url('DeleteComponent', uicomponent.id);
- String keyMark = "window.location=";
- String confirm = deleteUri.substring(0, deleteUri.indexOf(keyMark));
- String url = deleteUri.substring(deleteUri.indexOf(keyMark) + keyMark.length());
- url = url.substring(0, url.lastIndexOf(";"));
- deleteUri = confirm + " eXo.portal.UIPortal.removeComponent(" + url + ",'UIContainer-" + uicomponent.id + "')";
-
%>
<div class="UIContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" ${cssStyle} onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
@@ -72,10 +65,7 @@
<%=_ctx.appRes("UIContainer.title.Container")%>
<%}%>
</div>
- <!--
<a href="<%=uicomponent.event("DeleteComponent","$uicomponent.id")%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
- -->
- <a href="$deleteUri;eXo.portal.UIPortal.changeComposerSaveButton()" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"><span></span></a>
<div class="ClearBoth"><span></span></div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2009-11-17 05:20:43 UTC (rev 622)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UITableColumnContainer.gtmpl 2009-11-17 08:26:49 UTC (rev 623)
@@ -8,12 +8,6 @@
UIPortalApplication uiPortalApp = rcontext.getUIApplication();
if(!uiPortalApp.isEditting() && !uicomponent.hasPermission()) return;
- String deleteUri = uicomponent.url('DeleteComponent', uicomponent.id);
- String keyMark = "window.location=";
- String confirm = deleteUri.substring(0, deleteUri.indexOf(keyMark));
- String url = deleteUri.substring(deleteUri.indexOf(keyMark) + keyMark.length());
- url = url.substring(0, url.lastIndexOf(";"));
- deleteUri = confirm + " eXo.portal.UIPortal.removeComponent(" + url + ",'UIContainer-" + uicomponent.id + "')";
%>
<div class="UIContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
<div class="NormalContainerBlock">
@@ -76,7 +70,7 @@
<%}%>
</div>
- <a href="$deleteUri;eXo.portal.UIPortal.changeComposerSaveButton()" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event('DeleteComponent', uicomponent.id); %>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
<div class="ClearBoth"><span></span></div>
</div>
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2009-11-17 05:20:43 UTC (rev 622)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/container/UIToolbarContainer.gtmpl 2009-11-17 08:26:49 UTC (rev 623)
@@ -10,12 +10,6 @@
JavascriptManager jsmanager = rcontext.getJavascriptManager();
jsmanager.importJavascript('eXo.portal.PortalDragDrop');
- String deleteUri = uicomponent.url('DeleteComponent', uicomponent.id);
- String keyMark = "window.location=";
- String confirm = deleteUri.substring(0, deleteUri.indexOf(keyMark));
- String url = deleteUri.substring(deleteUri.indexOf(keyMark) + keyMark.length());
- url = url.substring(0, url.lastIndexOf(";"));
- deleteUri = confirm + " eXo.portal.UIPortal.removeComponent(" + url + ",'UIContainer-" + uicomponent.id + "')";
%>
<div class="UIContainer UIToolbarContainer <%=uiPortalApp.isEditting()?"EdittingContainer":""%>" id="UIContainer-${uicomponent.id}" onmouseover="eXo.portal.UIPortal.blockOnMouseOver(event, this, true);" onmouseout="eXo.portal.UIPortal.blockOnMouseOver(event, this, false);">
<div class="NormalContainerBlock">
@@ -78,7 +72,7 @@
<%}%>
</div>
- <a href="$deleteUri;eXo.portal.UIPortal.changeComposerSaveButton()" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
+ <a href="<%=uicomponent.event('DeleteComponent', uicomponent.id);%>" class="DeleteContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.closeContainer")%>"><span></span></a>
<a href="<%=uicomponent.event("EditContainer","$uicomponent.id")%>;eXo.portal.UIPortal.changeComposerSaveButton()" class="EditContainerIcon" title="<%=_ctx.appRes("UIContainer.tooltip.editContainer")%>"></a>
<div class="ClearBoth"><span></span></div>
</div>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-17 05:20:43 UTC (rev 622)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.java 2009-11-17 08:26:49 UTC (rev 623)
@@ -55,6 +55,7 @@
import org.exoplatform.services.rss.parser.RSSDocument;
import org.exoplatform.services.rss.parser.RSSParser;
import org.exoplatform.web.application.ApplicationMessage;
+import org.exoplatform.web.application.JavascriptManager;
import org.exoplatform.webui.core.UIComponent;
import org.exoplatform.webui.core.UIContainer;
import org.exoplatform.webui.core.UITabPane;
@@ -94,42 +95,30 @@
}
}
- //
- // static public class RemoveJSApplicationToDesktopActionListener extends
- // EventListener<UIPortalComponent> {
- // public void execute(Event<UIPortalComponent> event) throws Exception {
- // UIPortal uiPortal = Util.getUIPortal();
- // UIPortalApplication uiApp =
- // uiPortal.getAncestorOfType(UIPortalApplication.class);
- // UIPage uiPage = uiApp.findFirstComponentOfType(UIPage.class);
- // String id = event.getRequestContext().getRequestParameter("jsInstanceId");
- // uiPage.removeChildById(id);
- //
- // Page page = PortalDataMapper.toPageModel(uiPage);
- // UserPortalConfigService configService =
- // uiPortal.getApplicationComponent(UserPortalConfigService.class);
- // if(page.getChildren() == null) page.setChildren(new ArrayList<Object>());
- // configService.update(page);
- // }
- // }
-
static public class DeleteComponentActionListener extends EventListener<UIComponent>
{
+ private final static String UI_CONTAINER = "UIContainer";
+
+ private final static String UI_PORTLET = "UIPortlet";
+
public void execute(Event<UIComponent> event) throws Exception
{
String id = event.getRequestContext().getRequestParameter(UIComponent.OBJECTID);
UIComponent uiComponent = event.getSource();
UIPortalComponent uiParent = (UIPortalComponent)uiComponent.getParent();
UIComponent uiRemoveComponent = uiParent.findComponentById(id);
+ UIPortalApplication uiApp = Util.getUIPortalApplication();
if (uiRemoveComponent.findFirstComponentOfType(UIPageBody.class) != null)
{
- Util.getUIPortalApplication().addMessage(
- new ApplicationMessage("UIPortalApplication.msg.deletePageBody", new Object[]{},
- ApplicationMessage.WARNING));
+ uiApp.addMessage(new ApplicationMessage("UIPortalApplication.msg.deletePageBody", new Object[]{},
+ ApplicationMessage.WARNING));
return;
}
uiParent.removeChildById(id);
+ UIPortalComposer portalComposer = uiApp.findFirstComponentOfType(UIPortalComposer.class);
+ portalComposer.setEditted(true);
+
UIPage uiPage = uiParent.getAncestorOfType(UIPage.class);
if (uiPage != null && uiPage.getMaximizedUIPortlet() != null)
{
@@ -162,11 +151,35 @@
}
Util.showComponentLayoutMode(uiRemoveComponent.getClass());
- PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- pcontext.setFullRender(false);
- pcontext.getWriter().write("OK");
- pcontext.setResponseComplete(true);
+ String componentType = null;
+ if (uiComponent instanceof UIPortlet)
+ {
+ componentType = UI_PORTLET;
+ }
+ else if (uiComponent instanceof UIContainer)
+ {
+ componentType = UI_CONTAINER;
+ }
+
+ if (componentType != null)
+ {
+ PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
+ JavascriptManager jsManager = pcontext.getJavascriptManager();
+ jsManager.addJavascript(scriptRemovingComponent(id, componentType));
+ jsManager.addJavascript("eXo.portal.UIPortal.changeComposerSaveButton();");
+ }
}
+
+ private String scriptRemovingComponent(String componentId, String componentType)
+ {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append("eXo.portal.UIPortal.removeComponent('");
+ buffer.append(componentType);
+ buffer.append("-");
+ buffer.append(componentId);
+ buffer.append("');");
+ return buffer.toString();
+ }
}
static public class MoveChildActionListener extends EventListener<UIContainer>
@@ -251,7 +264,7 @@
app = appList.getApplication(sourceId);
ApplicationType applicationType = app.getType();
- //TanPD: Hardcoded to fix bug GTNPORTAL-91
+ // TanPD: Hardcoded to fix bug GTNPORTAL-91
Application temp = null;
if (applicationType.equals(ApplicationType.GADGET))
{
@@ -289,7 +302,7 @@
//
uiPortlet.setState(new PortletState(state, applicationType));
- //TanPD: Fix bug GTNPORTAL-91
+ // TanPD: Fix bug GTNPORTAL-91
if (temp != null && applicationType.equals(ApplicationType.PORTLET))
{
Portlet pref = uiPortlet.getPreferences();
@@ -301,7 +314,7 @@
}
catch (Exception e)
{
- //Fix in case: RSS Reader Gadget
+ // Fix in case: RSS Reader Gadget
Preference aggIdPref = pref.getPreference("aggregatorId");
String aggregatorId = null;
if (aggIdPref == null || aggIdPref.getValue() == null || aggIdPref.getValue().length() == 0)
@@ -310,7 +323,7 @@
aggregatorId = aggIdPref.getValue();
GadgetRegistryService gadgetSrv = uiApp.getApplicationComponent(GadgetRegistryService.class);
org.exoplatform.application.gadget.Gadget gadget = gadgetSrv.getGadget(aggregatorId);
- //TODO make sure it's an rss feed
+ // TODO make sure it's an rss feed
// TODO make sure that we did not add it already
UIGadget uiGadget = uiPortlet.createUIComponent(UIGadget.class, null, null);
uiGadget.setState(new TransientApplicationState<org.exoplatform.portal.pom.spi.gadget.Gadget>(
15 years, 2 months
- 1
- 0
gatein SVN: r622 - portal/trunk/packaging.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2009-11-17 00:20:43 -0500 (Tue, 17 Nov 2009)
New Revision: 622
Modified:
portal/trunk/packaging/pom.xml
Log:
GTNPORTAL-256: Replace the exopackage structure with maven tooling
* rollback usage of embedded exopackage until mvn install in packaging/ performs correctely the goals included in exopackage
Modified: portal/trunk/packaging/pom.xml
===================================================================
--- portal/trunk/packaging/pom.xml 2009-11-17 04:54:23 UTC (rev 621)
+++ portal/trunk/packaging/pom.xml 2009-11-17 05:20:43 UTC (rev 622)
@@ -32,7 +32,7 @@
<name>GateIn Portal Packaging</name>
<modules>
- <module>exopackage</module>
+ <!--module>exopackage</module-->
<module>module</module>
<module>product</module>
<module>pkg</module>
15 years, 2 months
- 1
- 0
gatein SVN: r621 - in portal/trunk: portlet/exoadmin/src/main/java/org/exoplatform and 6 other directories.
by do-not-reply＠jboss.org
Author: tan_pham_dinh
Date: 2009-11-16 23:54:23 -0500 (Mon, 16 Nov 2009)
New Revision: 621
Removed:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/i18n/
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ar.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_de.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_es.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_nl.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ru.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_uk.properties
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_vi.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/conf/portlet/exoadmin/I18nPortlet/
portal/trunk/portlet/exoadmin/src/main/webapp/skin/i18n/
Modified:
portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/navigation.xml
portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/pages.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_ar.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_vi.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
Log:
GTNPORTAL-254: Remove I18n Portlet
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/navigation.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/navigation.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/navigation.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -53,13 +53,6 @@
</node>
<node>
- <uri>administration/i18n</uri>
- <name>i18n</name>
- <label>#{administration.i18n}</label>
- <page-reference>group::platform/administrators::i18n</page-reference>
- </node>
-
- <node>
<uri>administration/pageManagement</uri>
<name>i18n</name>
<label>#{administration.pageManagement}</label>
Modified: portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/pages.xml
===================================================================
--- portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/pages.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/component/portal/src/test/resources/portal/group/platform/administrators/pages.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -53,21 +53,6 @@
</page>
<page>
- <page-id>group::platform/administrators::i18n</page-id>
- <owner-type>group</owner-type>
- <owner-id>platform/administrators</owner-id>
- <name>i18n</name>
- <title>Internationalization</title>
- <access-permissions>manager:/platform/administrators</access-permissions>
- <edit-permission>manager:/platform/administrators</edit-permission>
- <application>
- <instance-id>group#platform/administrators:/exoadmin/I18nPortlet/i18n</instance-id>
- <title>Internationalization</title>
- <show-info-bar>false</show-info-bar>
- </application>
- </page>
-
- <page>
<page-id>group::platform/administrators::registry</page-id>
<owner-type>group</owner-type>
<owner-id>platform/administrators</owner-id>
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ar.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ar.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ar.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-
-<bundle>
- <UIForm>
- <title>بحث المصادر</title>
- <action>
- <Search>ابحث</Search>
- <NewResource>مصدر جديد</NewResource>
- </action>
- </UIForm>
- <UISearchI18n>
- <label>
- <name>اسم</name>
- <language>اللغة</language>
- <option>
- <All>All</All>
- </option>
- </label>
- </UISearchI18n>
- <UII18nPortlet>
- <header>
- <name>اسم</name>
- <language>اللغة</language>
- <action>حركة</action>
- </header>
- <action>
- <title>
- <View>عرض</View>
- <Delete>حذف</Delete>
- </title>
- </action>
- </UII18nPortlet>
- <UIEditResource>
- <title>بيانات المصادر</title>
- <label>
- <resource>المصادر</resource>
- <name>اسم</name>
- <language>اللغة</language>
- </label>
- <action>
- <Save>احفظ</Save>
- <Cancel>الغاء</Cancel>
- <Edit>تحرير</Edit>
- </action>
- <add>
- <exist>!هذا المصدر موجود ، من فضلك ادخل واحد آخر</exist>
- </add>
- </UIEditResource>
- <UII18n>
- <deleteResource>هل أنت متأكد من حذف هذا المصدر؟</deleteResource>
- </UII18n>
-</bundle>
-
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_de.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_de.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_de.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
-UIForm.title=Suchquelle
- UISearchI18n.label.name=Name
- UISearchI18n.label.language=Sprache
- UISearchI18n.label.option.All=All
- UIForm.action.Search=Suche
- UIForm.action.NewResource=Neue Quelle
- UII18nPortlet.header.name=Name
- UII18nPortlet.header.language=Sprache
- UII18nPortlet.header.action=Aktion
- UII18nPortlet.action.title.View=Anschauen
- UII18nPortlet.action.title.Delete=Löschen
- UIEditResource.title=Quellendata
- UIEditResource.label.resource=Quelle
- UIEditResource.label.name=Name
- UIEditResource.label.language=Sprache
- UIEditResource.action.Save=Speichern
- UIEditResource.action.Cancel=Abbrechen
- UIEditResource.action.Edit=Ändern
- UIEditResource.add.exist=Diese Quelle besteht schon, bitte geben Sie eine neue ein!
- UII18n.deleteResource = Sind Sie sich sicher, dass Sie diese Quelle löschen wollen?
\ No newline at end of file
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
- UIForm.title=Search Resource
- UISearchI18n.label.name=Name
- UISearchI18n.label.language=Language
- UISearchI18n.label.option.All=All
- UIForm.action.Search=Search
- UIForm.action.NewResource=New Resource
- UII18nPortlet.header.name=Name
- UII18nPortlet.header.language=Language
- UII18nPortlet.header.action=Action
- UII18nPortlet.action.title.View=View
- UII18nPortlet.action.title.Delete=Delete
- UIEditResource.title=Resource Data
- UIEditResource.label.resource=Resource
- UIEditResource.label.name=Name
- UIEditResource.label.language=Language
- UIEditResource.action.Save=Save
- UIEditResource.action.Cancel=Cancel
- UIEditResource.action.Edit=Edit
- UIEditResource.add.exist=This resource is existing, please enter another one!
- UII18n.deleteResource = Are you sure you want to delete this resource?
\ No newline at end of file
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_en.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-
-<bundle>
- <UIForm>
- <title>Search Resource</title>
- <action>
- <Search>Search</Search>
- <NewResource>New Resource</NewResource>
- </action>
- </UIForm>
- <UISearchI18n>
- <label>
- <name>Name</name>
- <language>Language</language>
- <option>
- <All>All</All>
- </option>
- </label>
- </UISearchI18n>
- <UII18nPortlet>
- <header>
- <name>Name</name>
- <language>Language</language>
- <action>Action</action>
- </header>
- <action>
- <title>
- <View>View</View>
- <Delete>Delete</Delete>
- </title>
- </action>
- </UII18nPortlet>
- <UIEditResource>
- <title>Resource Data</title>
- <label>
- <resource>Resource</resource>
- <name>Name</name>
- <language>Language</language>
- </label>
- <action>
- <Save>Save</Save>
- <Cancel>Cancel</Cancel>
- <Edit>Edit</Edit>
- </action>
- <add>
- <exist>This resource is existing, please enter another one!</exist>
- </add>
- </UIEditResource>
- <UII18n>
- <deleteResource>Are you sure you want to delete this resource?</deleteResource>
- </UII18n>
-</bundle>
-
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_es.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_es.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_es.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
- UIForm.title=Buscar Recurso
- UISearchI18n.label.name=Nombre
- UISearchI18n.label.language=Idioma
- UISearchI18n.label.option.All=Todo
- UIForm.action.Search=Buscar
- UIForm.action.NewResource=Nuevo Recurso
- UII18nPortlet.header.name=Nombre
- UII18nPortlet.header.language=Idioma
- UII18nPortlet.header.action=Acci\u00f3n
- UII18nPortlet.action.title.View=Ver
- UII18nPortlet.action.title.Delete=Borrar
- UIEditResource.title=Informaci\u00f3n sobre el Recurso
- UIEditResource.label.resource=Recurso
- UIEditResource.label.name=Nombre
- UIEditResource.label.language=Idioma
- UIEditResource.action.Save=Guardar
- UIEditResource.action.Cancel=Cancelar
- UIEditResource.action.Edit=Editar
- UIEditResource.add.exist=Este recurso ya existe, por favor introduce otro!
- UII18n.deleteResource = \u00bfEst\u00e1s seguro de que deseas borrar este recurso?
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
- UIForm.title=Rechercher une ressource
- UISearchI18n.label.name=Nom
- UISearchI18n.label.language=Langue
- UISearchI18n.label.option.All=All
- UIForm.action.Search=Rechercher
- UIForm.action.NewResource=Nouvelle Ressource
- UII18nPortlet.header.name=Nom
- UII18nPortlet.header.language=Langue
- UII18nPortlet.header.action=Action
- UII18nPortlet.action.title.View=Consulter
- UII18nPortlet.action.title.Delete=Supprimer
- UIEditResource.title=D\u00e9tails d'une ressource
- UIEditResource.label.resource=Ressource
- UIEditResource.label.name=Nom
- UIEditResource.label.language=Langue
- UIEditResource.action.Save=Sauver
- UIEditResource.action.Cancel=Annuler
- UIEditResource.action.Edit=Editer
- UIEditResource.add.exist=Cette ressource existe d\u00e9j\u00e0, veuillez en cr\u00e9er une autre!
- UII18n.deleteResource =Etes vous s\u00fbr de vouloir supprimer cette ressource ?
\ No newline at end of file
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_fr.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-
-<bundle>
- <UIForm>
- <title>Rechercher une ressource</title>
- <action>
- <Search>Rechercher</Search>
- <NewResource>Nouvelle Ressource</NewResource>
- </action>
- </UIForm>
- <UISearchI18n>
- <label>
- <name>Nom</name>
- <language>Langue</language>
- <option>
- <All>All</All>
- </option>
- </label>
- </UISearchI18n>
- <UII18nPortlet>
- <header>
- <name>Nom</name>
- <language>Langue</language>
- <action>Action</action>
- </header>
- <action>
- <title>
- <View>Consulter</View>
- <Delete>Supprimer</Delete>
- </title>
- </action>
- </UII18nPortlet>
- <UIEditResource>
- <title>D\u00e9tails d'une ressource</title>
- <label>
- <resource>Ressource</resource>
- <name>Nom</name>
- <language>Langue</language>
- </label>
- <action>
- <Save>Sauver</Save>
- <Cancel>Annuler</Cancel>
- <Edit>Editer</Edit>
- </action>
- <add>
- <exist>Cette ressource existe d\u00e9j\u00e0, veuillez en cr\u00e9er une autre!</exist>
- </add>
- </UIEditResource>
- <UII18n>
- <deleteResource>Etes vous s\u00fbr de vouloir supprimer cette ressource ?</deleteResource>
- </UII18n>
-</bundle>
-
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_nl.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_nl.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_nl.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
- UIForm.title=Zoek Resource
- UISearchI18n.label.name=Naam
- UISearchI18n.label.language=Taal
- UISearchI18n.label.option.All=All
- UIForm.action.Search=Zoeken
- UIForm.action.NewResource=Nieuw Resource
- UII18nPortlet.header.name=Naam
- UII18nPortlet.header.language=Taal
- UII18nPortlet.header.action=Actie
- UII18nPortlet.action.title.View=Toon
- UII18nPortlet.action.title.Delete=Verwijderen
- UIEditResource.title=Resource Data
- UIEditResource.label.resource=Resource
- UIEditResource.label.name=Naam
- UIEditResource.label.language=Taal
- UIEditResource.action.Save=Opslaan
- UIEditResource.action.Cancel=Annuleren
- UIEditResource.action.Edit=Wijzigen
- UIEditResource.add.exist=resource bestaat al, gebruik een ander!
- UII18n.deleteResource = Bent u zeker om deze resource te verwijderen?
\ No newline at end of file
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ru.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ru.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_ru.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
- UIForm.title=Искать ресурсы
- UISearchI18n.label.name=Название
- UISearchI18n.label.language=Язык
- UISearchI18n.label.option.All=Все
- UIForm.action.Search=Искать
- UIForm.action.NewResource=Новый ресурс
- UII18nPortlet.header.name=Название
- UII18nPortlet.header.language=Язык
- UII18nPortlet.header.action=Действие
- UII18nPortlet.action.title.View=Просмотреть
- UII18nPortlet.action.title.Delete=Удалить
- UIEditResource.title=Данные ресурса
- UIEditResource.label.resource=Ресурс
- UIEditResource.label.name=Название
- UIEditResource.label.language=Язык
- UIEditResource.action.Save=Сохранить
- UIEditResource.action.Cancel=Отменить
- UIEditResource.action.Edit=Изменить
- UIEditResource.add.exist=Это ресурс уже существует. Пожалуйста выберите другой!
- UII18n.deleteResource =Вы действительно хотите удалить этот ресурс?
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_uk.properties 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_uk.properties 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,39 +0,0 @@
-#
-# 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.
-#
-
- UIForm.title=Пошук ресурсів
- UISearchI18n.label.name=Назва
- UISearchI18n.label.language=Мова
- UISearchI18n.label.option.All=ВСІ
- UIForm.action.Search=Шукати
- UIForm.action.NewResource=Новий ресурс
- UII18nPortlet.header.name=Назва
- UII18nPortlet.header.language=Мова
- UII18nPortlet.header.action=Дія
- UII18nPortlet.action.title.View=Перегляд
- UII18nPortlet.action.title.Delete=Видалити
- UIEditResource.title=Ресурсні дані
- UIEditResource.label.resource=Ресурс
- UIEditResource.label.name=Назва
- UIEditResource.label.language=Мова
- UIEditResource.action.Save=Зберегти
- UIEditResource.action.Cancel=Скасувати
- UIEditResource.action.Edit=Редагувати
- UIEditResource.add.exist=Такий ресурс вже існує, будь ласка, введіть інший!
- UII18n.deleteResource = Ви впевнені, що бажаєте видалити цей ресурс?
\ No newline at end of file
Deleted: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_vi.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_vi.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/classes/locale/portlet/exoadmin/I18nPortlet_vi.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- 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.
-
--->
-
-<bundle>
- <UIForm>
- <title>Tìm kiếm mã nguồn</title>
- <action>
- <Search>Tìm kiếm</Search>
- <NewResource>Tạo mã nguồn mới</NewResource>
- </action>
- </UIForm>
- <UISearchI18n>
- <label>
- <name>Tên:</name>
- <language>Ngôn ngữ:</language>
- <option>
- <All>Tất cả</All>
- </option>
- </label>
- </UISearchI18n>
- <UII18nPortlet>
- <header>
- <name>Tên</name>
- <language>Ngôn ngữ</language>
- <action>Thực hiện</action>
- </header>
- <action>
- <title>
- <View>Xem</View>
- <Delete>Xóa</Delete>
- </title>
- </action>
- </UII18nPortlet>
- <UIEditResource>
- <title>Dữ liệu mã nguồn</title>
- <label>
- <resource>Mã nguồn:</resource>
- <name>Tên:</name>
- <language>Ngôn ngữ:</language>
- </label>
- <action>
- <Save>Lưu</Save>
- <Cancel>Hủy</Cancel>
- <Edit>Sửa</Edit>
- </action>
- <add>
- <exist>Mã nguồn này đã tồn tại, xin vui lòng chọn cái khác!</exist>
- </add>
- </UIEditResource>
- <UII18n>
- <deleteResource>Bạn có chắc chắn muốn xóa mã nguồn này?</deleteResource>
- </UII18n>
-</bundle>
-
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/gatein-resources.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -44,15 +44,6 @@
<css-path>/skin/account/webui/component/UIAccountPortlet/DefaultStylesheet.css</css-path>
</portlet-skin>
- <!-- I18nPortlet skins -->
-
- <portlet-skin>
- <application-name>exoadmin</application-name>
- <portlet-name>I18nPortlet</portlet-name>
- <skin-name>Default</skin-name>
- <css-path>/skin/i18n/webui/component/UII18nPortlet/DefaultStylesheet.css</css-path>
- </portlet-skin>
-
<!-- ApplicationRegistryPortlet skins -->
<portlet-skin>
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -186,31 +186,6 @@
</portlet>
<portlet>
- <description xml:lang="EN">Internationalization Portlet</description>
- <portlet-name>I18nPortlet</portlet-name>
- <display-name xml:lang="EN">Internationalization Portlet</display-name>
- <portlet-class>org.exoplatform.webui.application.portlet.PortletApplicationController</portlet-class>
-
- <init-param>
- <name>webui.configuration</name>
- <value>/WEB-INF/conf/portlet/exoadmin/I18nPortlet/webui/configuration.xml</value>
- </init-param>
-
- <expiration-cache>0</expiration-cache>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>help</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <resource-bundle>locale.portlet.exoadmin.I18nPortlet</resource-bundle>
- <portlet-info>
- <title>Internationalization Portlet</title>
- <short-title>Internationalization</short-title>
- <keywords>Administration</keywords>
- </portlet-info>
- </portlet>
-
- <portlet>
<description xml:lang="EN">Application Registry</description>
<portlet-name>ApplicationRegistryPortlet</portlet-name>
<display-name xml:lang="EN">Application Registry</display-name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_ar.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_ar.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_ar.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -26,7 +26,6 @@
<application-registry>سجل الخدمات</application-registry>
<newAccount>حساب جديد</newAccount>
<community-management>ادارة الاعضاء</community-management>
- <i18n>تدويل</i18n>
<console>خزانة الانترنات</console>
<pageManagement>Page Management</pageManagement>
</administration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_vi.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_vi.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/navigation/group/platform/administrators_vi.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -26,7 +26,6 @@
<application-registry>Quản lý ứng dụng</application-registry>
<newAccount>Tài khoản mới</newAccount>
<community-management>Quản lý cộng đồng</community-management>
- <i18n>Quốc tế hóa</i18n>
<console>Web Console</console>
<pageManagement>Quản lý trang</pageManagement>
</administration>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/navigation.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -35,30 +35,8 @@
<label>#{administration.application-registry}</label>
<page-reference>group::/platform/administrators::registry</page-reference>
</node>
- <!--
- <node>
- <uri>administration/newAccount</uri>
- <name>newAccount</name>
- <label>#{administration.newAccount}</label>
- <page-reference>group::/platform/administrators::newAccount</page-reference>
- </node>
<node>
- <uri>administration/communityManagement</uri>
- <name>communityManagement</name>
- <label>#{administration.community-management}</label>
- <page-reference>group::/platform/administrators::communityManagement</page-reference>
- </node>
- -->
-
- <node>
- <uri>administration/i18n</uri>
- <name>i18n</name>
- <label>#{administration.i18n}</label>
- <page-reference>group::/platform/administrators::i18n</page-reference>
- </node>
-
- <node>
<uri>administration/pageManagement</uri>
<name>pageManagement</name>
<label>#{administration.pageManagement}</label>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2009-11-17 04:51:30 UTC (rev 620)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/group/platform/administrators/pages.xml 2009-11-17 04:54:23 UTC (rev 621)
@@ -55,22 +55,6 @@
</page>
<page>
- <name>i18n</name>
- <title>Internationalization</title>
- <access-permissions>manager:/platform/administrators</access-permissions>
- <edit-permission>manager:/platform/administrators</edit-permission>
- <portlet-application>
- <portlet>
- <application-ref>exoadmin</application-ref>
- <portlet-ref>I18nPortlet</portlet-ref>
- </portlet>
- <title>Internationalization</title>
- <access-permissions>manager:/platform/administrators</access-permissions>
- <show-info-bar>false</show-info-bar>
- </portlet-application>
- </page>
-
- <page>
<name>registry</name>
<title>Registry</title>
<access-permissions>manager:/platform/administrators</access-permissions>
15 years, 2 months
- 1
- 0
gatein SVN: r620 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-16 23:51:30 -0500 (Mon, 16 Nov 2009)
New Revision: 620
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
Log:
GTNPORTAL-138 Should limit character in Container Title (should set max length for the input is 50 characters)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2009-11-17 04:43:50 UTC (rev 619)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/container/UIContainerForm.java 2009-11-17 04:51:30 UTC (rev 620)
@@ -75,8 +75,7 @@
infoInputSet.addUIFormInput(
new UIFormStringInput("id", "id", null).addValidator(MandatoryValidator.class).addValidator(
StringLengthValidator.class, 3, 30).addValidator(NameValidator.class)).addUIFormInput(
- new UIFormStringInput("title", "title", null)).
- //addValidator(StringLengthValidator.class, 3, 30)).
+ new UIFormStringInput("title", "title", null).addValidator(StringLengthValidator.class, 50)).
addUIFormInput(
new UIFormStringInput("width", "width", null).addValidator(ExpressionValidator.class,
"(^([1-9]\\d*)(px|%)$)?", "UIContainerForm.msg.InvalidWidthHeight")).addUIFormInput(
15 years, 2 months
- 1
- 0