gatein SVN: r1181 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 10:55:44 -0500 (Wed, 06 Jan 2010)
New Revision: 1181
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java
Log:
- Use default time out value.
- Removed now unused QNames.
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 2010-01-06 15:42:40 UTC (rev 1180)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/services/SOAPServiceFactory.java 2010-01-06 15:55:44 UTC (rev 1181)
@@ -49,10 +49,6 @@
private String wsdlDefinitionURL;
private final static QName SERVICE = new QName("urn:oasis:names:tc:wsrp:v1:wsdl", "WSRPService");
- private final static QName WSRPServiceDescriptionService = new QName("urn:oasis:names:tc:wsrp:v1:wsdl", "WSRPServiceDescriptionService");
- private final static QName WSRPBaseService = new QName("urn:oasis:names:tc:wsrp:v1:wsdl", "WSRPBaseService");
- private final static QName WSRPPortletManagementService = new QName("urn:oasis:names:tc:wsrp:v1:wsdl", "WSRPPortletManagementService");
- private final static QName WSRPRegistrationService = new QName("urn:oasis:names:tc:wsrp:v1:wsdl", "WSRPRegistrationService");
private Map<Class, Object> services = new ConcurrentHashMap<Class, Object>();
private String markupURL;
@@ -61,7 +57,7 @@
private String registrationURL;
private boolean failed;
private boolean available;
- private int msBeforeTimeOut;
+ private int msBeforeTimeOut = DEFAULT_TIMEOUT_MS;
public <T> T getService(Class<T> clazz) throws Exception
{
@@ -243,22 +239,18 @@
Service service = Service.create(wsdlURL.toURL(), SERVICE);
-// WSRPV1MarkupPortType markupPortType = service.getPort(WSRPBaseService, WSRPV1MarkupPortType.class);
WSRPV1MarkupPortType markupPortType = service.getPort(WSRPV1MarkupPortType.class);
services.put(WSRPV1MarkupPortType.class, markupPortType);
markupURL = (String)((BindingProvider)markupPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
-// WSRPV1ServiceDescriptionPortType sdPort = service.getPort(WSRPServiceDescriptionService, WSRPV1ServiceDescriptionPortType.class);
WSRPV1ServiceDescriptionPortType sdPort = service.getPort(WSRPV1ServiceDescriptionPortType.class);
services.put(WSRPV1ServiceDescriptionPortType.class, sdPort);
serviceDescriptionURL = (String)((BindingProvider)sdPort).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
-// WSRPV1PortletManagementPortType managementPortType = service.getPort(WSRPPortletManagementService, WSRPV1PortletManagementPortType.class);
WSRPV1PortletManagementPortType managementPortType = service.getPort(WSRPV1PortletManagementPortType.class);
services.put(WSRPV1PortletManagementPortType.class, managementPortType);
portletManagementURL = (String)((BindingProvider)managementPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
-// WSRPV1RegistrationPortType registrationPortType = service.getPort(WSRPRegistrationService, WSRPV1RegistrationPortType.class);
WSRPV1RegistrationPortType registrationPortType = service.getPort(WSRPV1RegistrationPortType.class);
services.put(WSRPV1RegistrationPortType.class, registrationPortType);
registrationURL = (String)((BindingProvider)registrationPortType).getRequestContext().get(BindingProvider.ENDPOINT_ADDRESS_PROPERTY);
14 years, 11 months
- 1
- 0
gatein SVN: r1180 - in portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations: mapping and 1 other directory.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 10:42:40 -0500 (Wed, 06 Jan 2010)
New Revision: 1180
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
Log:
- Fixed ConsumerMapping.createAndAddRegistrationMappingFrom method that was resulting in creating more registrations than needed.
- Load registrations on init.
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-01-06 15:32:56 UTC (rev 1179)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/JCRRegistrationPersistenceManager.java 2010-01-06 15:42:40 UTC (rev 1180)
@@ -81,7 +81,14 @@
for (ConsumerMapping cm : mappings.getConsumers())
{
- internalAddConsumer(cm.toConsumer(this));
+ ConsumerSPI consumer = cm.toConsumer(this);
+ internalAddConsumer(consumer);
+
+ // get the registrations and add them to local map.
+ for (Registration registration : consumer.getRegistrations())
+ {
+ internalAddRegistration((RegistrationSPI)registration);
+ }
}
}
@@ -155,6 +162,27 @@
return consumer;
}
+ /*@Override
+ protected ConsumerSPI internalSaveChangesTo(Consumer consumer)
+ {
+ ConsumerSPI consumerSPI = super.internalSaveChangesTo(consumer);
+
+ ChromatticSession session = persister.getSession();
+ try
+ {
+ ConsumerMapping cm = session.findById(ConsumerMapping.class, consumer.getPersistentKey());
+ cm.initFrom(consumer);
+ persister.closeSession(session, true);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(); // todo: fix me
+ persister.closeSession(session, false);
+ }
+
+ return consumerSPI;
+ }*/
+
@Override
protected ConsumerGroupSPI internalRemoveConsumerGroup(String name)
{
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 15:32:56 UTC (rev 1179)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-01-06 15:42:40 UTC (rev 1180)
@@ -95,15 +95,37 @@
@FindById
public abstract ConsumerGroupMapping findGroupById(String id);
+ @FindById
+ public abstract RegistrationMapping findRegistrationById(String id);
+
public RegistrationMapping createAndAddRegistrationMappingFrom(Registration registration)
{
- // create, add to parent then init
- RegistrationMapping rm = createRegistration("" + System.nanoTime());
- getRegistrations().add(rm);
+ RegistrationMapping rm;
if (registration != null)
{
+ // check if the registration has already been persisted and it should already be associated to this ConsumerMapping
+ String key = registration.getPersistentKey();
+ if (key != null)
+ {
+ rm = findRegistrationById(key);
+ }
+ else
+ {
+ // else create the registration, add to parent
+ rm = createRegistration("" + System.nanoTime());
+ getRegistrations().add(rm);
+ }
+
+ // then init
rm.initFrom(registration);
}
+ else
+ {
+ // only create the registration and add to parent
+ rm = createRegistration("" + System.nanoTime());
+ getRegistrations().add(rm);
+ }
+
return rm;
}
14 years, 11 months
- 1
- 0
gatein SVN: r1179 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 10:32:56 -0500 (Wed, 06 Jan 2010)
New Revision: 1179
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-01-06 15:32:42 UTC (rev 1178)
+++ components/mop/trunk/api/pom.xml 2010-01-06 15:32:56 UTC (rev 1179)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13</version>
+ <version>1.0.0-Beta14-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-01-06 15:32:42 UTC (rev 1178)
+++ components/mop/trunk/core/pom.xml 2010-01-06 15:32:56 UTC (rev 1179)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13</version>
+ <version>1.0.0-Beta14-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-01-06 15:32:42 UTC (rev 1178)
+++ components/mop/trunk/pom.xml 2010-01-06 15:32:56 UTC (rev 1179)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13</version>
+ <version>1.0.0-Beta14-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-B...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-Beta13</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-Beta13</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
</scm>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-01-06 15:32:42 UTC (rev 1178)
+++ components/mop/trunk/spi/pom.xml 2010-01-06 15:32:56 UTC (rev 1179)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13</version>
+ <version>1.0.0-Beta14-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 11 months
- 1
- 0
gatein SVN: r1178 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 10:32:42 -0500 (Wed, 06 Jan 2010)
New Revision: 1178
Added:
components/mop/tags/1.0.0-Beta13/
Log:
[maven-scm] copy for tag 1.0.0-Beta13
Copied: components/mop/tags/1.0.0-Beta13 (from rev 1177, components/mop/trunk)
14 years, 11 months
- 1
- 0
gatein SVN: r1177 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 10:32:24 -0500 (Wed, 06 Jan 2010)
New Revision: 1177
Modified:
components/mop/trunk/api/pom.xml
components/mop/trunk/core/pom.xml
components/mop/trunk/pom.xml
components/mop/trunk/spi/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta13
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-01-06 15:29:57 UTC (rev 1176)
+++ components/mop/trunk/api/pom.xml 2010-01-06 15:32:24 UTC (rev 1177)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13-SNAPSHOT</version>
+ <version>1.0.0-Beta13</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-01-06 15:29:57 UTC (rev 1176)
+++ components/mop/trunk/core/pom.xml 2010-01-06 15:32:24 UTC (rev 1177)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13-SNAPSHOT</version>
+ <version>1.0.0-Beta13</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-01-06 15:29:57 UTC (rev 1176)
+++ components/mop/trunk/pom.xml 2010-01-06 15:32:24 UTC (rev 1177)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13-SNAPSHOT</version>
+ <version>1.0.0-Beta13</version>
<packaging>pom</packaging>
<name>GateIn - MOP</name>
<description>Model Object for Portal</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/mop/tags/1.0.0-B...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0-Beta13</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0-Beta13</url>
</scm>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-01-06 15:29:57 UTC (rev 1176)
+++ components/mop/trunk/spi/pom.xml 2010-01-06 15:32:24 UTC (rev 1177)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-Beta13-SNAPSHOT</version>
+ <version>1.0.0-Beta13</version>
</parent>
<!-- ****************** -->
14 years, 11 months
- 1
- 0
gatein SVN: r1176 - in components/wsrp/trunk/producer/src: main/java/org/gatein/registration/impl and 2 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-01-06 10:29:57 -0500 (Wed, 06 Jan 2010)
New Revision: 1176
Modified:
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Consumer.java
components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java
components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java
components/wsrp/trunk/producer/src/test/java/org/gatein/registration/ConsumerTestCase.java
components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationManagerTestCase.java
Log:
- Consumer status is now computed from registrations' status.
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2010-01-06 15:27:28 UTC (rev 1175)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/AbstractRegistrationPersistenceManager.java 2010-01-06 15:29:57 UTC (rev 1176)
@@ -42,7 +42,6 @@
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(consumerName, "Consumer name", null);
ConsumerSPI consumer = internalCreateConsumer(consumerId, consumerName);
- consumer.setStatus(RegistrationStatus.PENDING);
internalAddConsumer(consumer);
return consumer;
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Consumer.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Consumer.java 2010-01-06 15:27:28 UTC (rev 1175)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/Consumer.java 2010-01-06 15:29:57 UTC (rev 1176)
@@ -51,13 +51,6 @@
RegistrationStatus getStatus();
/**
- * Set the registration status of the consumer entity.
- *
- * @param status the registration status
- */
- void setStatus(RegistrationStatus status);
-
- /**
* Return all the registrations for the specified consumer.
*
* @return the consumer registrations
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java 2010-01-06 15:27:28 UTC (rev 1175)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/registration/impl/ConsumerImpl.java 2010-01-06 15:29:57 UTC (rev 1176)
@@ -50,7 +50,6 @@
private String identity;
private String consumerAgent;
private Set<Registration> registrations;
- private RegistrationStatus status;
private ConsumerGroup group;
private ConsumerCapabilities capabilities;
private String key;
@@ -74,7 +73,6 @@
private void init()
{
registrations = new HashSet<Registration>(7);
- status = RegistrationStatus.PENDING;
capabilities = new ConsumerCapabilitiesImpl();
}
@@ -142,13 +140,27 @@
public RegistrationStatus getStatus()
{
- return status;
- }
+ if (ParameterValidation.existsAndIsNotEmpty(registrations))
+ {
+ RegistrationStatus result = RegistrationStatus.VALID;
+ for (Registration registration : registrations)
+ {
+ RegistrationStatus status = registration.getStatus();
- public void setStatus(RegistrationStatus status)
- {
- ParameterValidation.throwIllegalArgExceptionIfNull(status, "RegistrationStatus");
- this.status = status;
+ // anytime an invalid registration is found, that makes the consumer invalid as well, no need for further processing
+ if (RegistrationStatus.INVALID == status)
+ {
+ return RegistrationStatus.INVALID;
+ }
+ else if (RegistrationStatus.PENDING == status)
+ {
+ result = status;
+ }
+ }
+
+ return result;
+ }
+ return RegistrationStatus.PENDING;
}
public Collection<Registration> getRegistrations() throws RegistrationException
@@ -178,12 +190,6 @@
ParameterValidation.throwIllegalArgExceptionIfNull(registration, "Registration");
registrations.remove(registration);
-
- // status should become pending if there are no registrations
- if (registrations.isEmpty())
- {
- setStatus(RegistrationStatus.PENDING);
- }
}
public void setGroup(ConsumerGroup group) throws RegistrationException
Modified: components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java
===================================================================
--- components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java 2010-01-06 15:27:28 UTC (rev 1175)
+++ components/wsrp/trunk/producer/src/main/java/org/gatein/wsrp/producer/RegistrationHandler.java 2010-01-06 15:29:57 UTC (rev 1176)
@@ -113,7 +113,6 @@
registration.setStatus(RegistrationStatus.VALID);
Consumer consumer = registration.getConsumer();
consumer.setConsumerAgent(registrationData.getConsumerAgent());
- consumer.setStatus(RegistrationStatus.VALID);
ConsumerCapabilities capabilities = consumer.getCapabilities();
List<String> modeStrings = registrationData.getConsumerModes();
Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/registration/ConsumerTestCase.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/registration/ConsumerTestCase.java 2010-01-06 15:27:28 UTC (rev 1175)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/registration/ConsumerTestCase.java 2010-01-06 15:29:57 UTC (rev 1176)
@@ -28,6 +28,11 @@
import org.gatein.registration.impl.RegistrationPersistenceManagerImpl;
import org.gatein.registration.policies.DefaultRegistrationPolicy;
+import javax.xml.namespace.QName;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
* @version $Revision: 8784 $
@@ -53,24 +58,39 @@
assertEquals("name", consumer.getName());
}
- public void testStatus()
+ public void testStatus() throws RegistrationException
{
assertEquals(RegistrationStatus.PENDING, consumer.getStatus());
- consumer.setStatus(RegistrationStatus.VALID);
+ String name = consumer.getName();
+
+ // adding a registration that isn't validated doesn't change the status
+ Registration registration = manager.addRegistrationTo(name, Collections.<QName, Object>emptyMap(), false);
+ assertEquals(RegistrationStatus.PENDING, consumer.getStatus());
+
+ // but the consumer's status should become valid if the registration becomes so as well
+ registration.setStatus(RegistrationStatus.VALID);
assertEquals(RegistrationStatus.VALID, consumer.getStatus());
- }
- public void testIllegalStatus()
- {
- try
- {
- consumer.setStatus(null);
- fail("Was expecting an IllegalArgumentException to be thrown on setStatus(null)");
- }
- catch (IllegalArgumentException expected)
- {
- }
+ // adding a new registration makes the consumer's status pending
+ // need to change the registration props to register this consumer again
+ Map<QName, Object> props = new HashMap<QName, Object>(1);
+ props.put(new QName("prop"), "value");
+ registration = manager.addRegistrationTo(name, props, false);
+ assertEquals(2, consumer.getRegistrations().size());
+ assertEquals(RegistrationStatus.PENDING, consumer.getStatus());
+
+ // and if the new registration is marked as invalid, so does the consumer's status
+ registration.setStatus(RegistrationStatus.INVALID);
+ assertEquals(RegistrationStatus.INVALID, consumer.getStatus());
+
+ // if the registration is returned to pending, then so is the consumer
+ registration.setStatus(RegistrationStatus.PENDING);
+ assertEquals(RegistrationStatus.PENDING, consumer.getStatus());
+
+ // if all the registrations are valid, then so is the consumer
+ registration.setStatus(RegistrationStatus.VALID);
+ assertEquals(RegistrationStatus.VALID, consumer.getStatus());
}
public void testSetGroup() throws Exception
Modified: components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationManagerTestCase.java
===================================================================
--- components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationManagerTestCase.java 2010-01-06 15:27:28 UTC (rev 1175)
+++ components/wsrp/trunk/producer/src/test/java/org/gatein/registration/RegistrationManagerTestCase.java 2010-01-06 15:29:57 UTC (rev 1176)
@@ -320,9 +320,6 @@
assertTrue(consumer.getRegistrations().contains(reg));
- // set the consumer status to valid
- consumer.setStatus(RegistrationStatus.VALID);
-
manager.removeRegistration(handle);
assertTrue(!consumer.getRegistrations().contains(reg));
assertNull(manager.getRegistration(handle));
14 years, 11 months
- 1
- 0
gatein SVN: r1175 - in components/mop/trunk/core/src/main/java/org/gatein/mop/core/api: workspace and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 10:27:28 -0500 (Wed, 06 Jan 2010)
New Revision: 1175
Modified:
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
Log:
- navigation container must use @FormattedBy
- model workspace stored under mop:workspace
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/ModelImpl.java 2010-01-06 15:27:28 UTC (rev 1175)
@@ -135,10 +135,10 @@
{
if (workspace == null)
{
- workspace = session.findByPath(WorkspaceImpl.class, "workspace");
+ workspace = session.findByPath(WorkspaceImpl.class, "mop:workspace");
if (workspace == null)
{
- workspace = session.insert(WorkspaceImpl.class, "workspace");
+ workspace = session.insert(WorkspaceImpl.class, "mop:workspace");
}
}
return workspace;
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-01-06 15:27:28 UTC (rev 1175)
@@ -18,11 +18,13 @@
*/
package org.gatein.mop.core.api.workspace;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
+import org.gatein.mop.core.api.MOPFormatter;
import java.util.List;
import java.util.Map;
@@ -32,6 +34,7 @@
* @version $Revision$
*/
@PrimaryType(name = "mop:navigationcontainer")
+(a)FormattedBy(MOPFormatter.class)
public abstract class NavigationContainer
{
14 years, 11 months
- 1
- 0
gatein SVN: r1174 - in components/mop/trunk/core: src/main/java/org/gatein/mop/core/api and 8 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-01-06 08:33:19 -0500 (Wed, 06 Jan 2010)
New Revision: 1174
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIBodyImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/URLLinkImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java
components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NameEncodingTestCase.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetContentProvider.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetState.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletContentProvider.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java
components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java
components/mop/trunk/core/src/test/resources/conf/content-nodetypes.xml
Log:
- use mop: prefix for children name and properties
- update to chromattic 1.0.0-beta13
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/pom.xml 2010-01-06 13:33:19 UTC (rev 1174)
@@ -56,14 +56,14 @@
<dependency>
<groupId>org.chromattic</groupId>
- <version>1.0.0-beta9</version>
+ <version>1.0.0-beta13</version>
<artifactId>chromattic.api</artifactId>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>1.0.0-beta9</version>
+ <version>1.0.0-beta13</version>
<scope>compile</scope>
</dependency>
@@ -83,20 +83,20 @@
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.common</artifactId>
- <version>1.0.0-beta9</version>
+ <version>1.0.0-beta13</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.core</artifactId>
- <version>1.0.0-beta9</version>
+ <version>1.0.0-beta13</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.exo</artifactId>
- <version>1.0.0-beta9</version>
+ <version>1.0.0-beta13</version>
<scope>test</scope>
</dependency>
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/MOPFormatter.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -114,6 +114,11 @@
public String decodeNodeName(FormatterContext context, String internalName)
{
+ if (!internalName.startsWith("mop:"))
+ {
+ throw new IllegalStateException("Incorrect internal name " + internalName);
+ }
+ internalName = internalName.substring(4);
int length = internalName.length();
for (int i = 0; i < length; i++)
{
@@ -151,24 +156,31 @@
public String encodeNodeName(FormatterContext context, String externalName)
{
int length = externalName.length();
+
+ //
for (int i = 0; i < length; i++)
{
char c = externalName.charAt(i);
if (isSpecialChar(c))
{
- return encode(externalName, i);
+ externalName = encode(externalName, i);
+ break;
}
}
- return externalName;
+
+ //
+ return "mop:" + externalName;
}
+/*
public String decodePropertyName(FormatterContext context, String internalName)
{
- return internalName;
+ return decodeNodeName(context, internalName);
}
public String encodePropertyName(FormatterContext context, String externalName)
{
- return externalName;
+ return encodeNodeName(context, externalName);
}
+*/
}
\ No newline at end of file
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSite.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,7 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.Site;
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:groupsite")
+@PrimaryType(name = "mop:groupsite")
public abstract class GroupSite extends SiteImpl
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,14 +18,14 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:groupsites")
+@PrimaryType(name = "mop:groupsites")
public abstract class GroupSiteContainer extends SiteContainer<GroupSite>
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,10 +18,10 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
import java.util.List;
@@ -31,7 +31,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:navigationcontainer")
+@PrimaryType(name = "mop:navigationcontainer")
public abstract class NavigationContainer
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -22,8 +22,8 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.Destroy;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
import org.chromattic.api.RelationshipType;
import org.gatein.mop.api.workspace.Navigation;
@@ -39,7 +39,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:navigation")
+@PrimaryType(name = "mop:navigation")
public abstract class NavigationImpl extends WorkspaceObjectImpl implements Navigation
{
@@ -70,7 +70,7 @@
public abstract PageLinkImpl createPageLink();
@ManyToOne(type = RelationshipType.PATH)
- @MappedBy("template")
+ @MappedBy("mop:template")
public abstract PageImpl getPageTemplate();
public abstract void setPageTemplate(PageImpl template);
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -19,10 +19,10 @@
package org.gatein.mop.core.api.workspace;
import org.chromattic.api.annotations.FormattedBy;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
import org.gatein.mop.core.api.MOPFormatter;
@@ -32,7 +32,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:pagecontainer")
+@PrimaryType(name = "mop:pagecontainer")
@FormattedBy(MOPFormatter.class)
public abstract class PageContainer
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -21,8 +21,8 @@
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.ManyToOne;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Destroy;
import org.chromattic.api.RelationshipType;
@@ -48,7 +48,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:page")
+@PrimaryType(name = "mop:page")
public abstract class PageImpl extends WorkspaceObjectImpl implements Page, WorkspaceCustomizationContext
{
@@ -72,21 +72,21 @@
};
@ManyToOne(type = RelationshipType.PATH)
- @MappedBy("template")
+ @MappedBy("mop:template")
public abstract PageImpl getPageTemplate();
public abstract void setPageTemplate(PageImpl template);
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("template")
+ @RelatedMappedBy("mop:template")
public abstract Collection<NavigationImpl> getTemplatizedNavigations();
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("template")
+ @RelatedMappedBy("mop:template")
public abstract Collection<PageImpl> getTemplatizedPages();
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("template")
+ @RelatedMappedBy("mop:template")
public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects();
@OneToOne
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,9 +18,9 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.chromattic.api.annotations.Path;
import org.chromattic.api.RelationshipType;
@@ -32,22 +32,16 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:pagelink")
+@PrimaryType(name = "mop:pagelink")
public abstract class PageLinkImpl extends LinkImpl implements PageLink
{
@ManyToOne(type = RelationshipType.PATH)
- @MappedBy("page")
+ @MappedBy("mop:page")
public abstract PageImpl getPage();
public abstract void setPage(PageImpl page);
- @Path
- @Property(name = "path")
- public abstract String getPathPath();
-
- public abstract void setPagePath(String path);
-
public void setPage(Page page)
{
setPage((PageImpl)page);
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSite.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,7 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.Site;
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:portalsite")
+@PrimaryType(name = "mop:portalsite")
public abstract class PortalSite extends SiteImpl
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,16 +18,14 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
-import org.gatein.mop.core.api.workspace.SiteContainer;
-import org.gatein.mop.core.api.workspace.WorkspaceImpl;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:portalsites")
+@PrimaryType(name = "mop:portalsites")
public abstract class PortalSiteContainer extends SiteContainer<PortalSite>
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIBodyImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIBodyImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIBodyImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,7 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.ui.UIBody;
import org.gatein.mop.api.workspace.ObjectType;
@@ -26,7 +26,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:uibody")
+@PrimaryType(name = "mop:uibody")
public abstract class UIBodyImpl extends UIComponentImpl implements UIBody
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIContainerImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,10 +18,10 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.Name;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.ui.UIContainer;
import org.gatein.mop.api.workspace.ui.UIComponent;
import org.gatein.mop.api.workspace.ObjectType;
@@ -36,7 +36,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:uicontainer")
+@PrimaryType(name = "mop:uicontainer")
public abstract class UIContainerImpl extends UIComponentImpl implements UIContainer
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,10 +18,10 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.ui.UIWindow;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.WorkspaceCustomizationContext;
@@ -36,7 +36,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:uiwindow")
+@PrimaryType(name = "mop:uiwindow")
public abstract class UIWindowImpl extends UIComponentImpl implements UIWindow, CustomizationContext
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/URLLinkImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/URLLinkImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/URLLinkImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,7 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.gatein.mop.api.workspace.link.URLLink;
import org.gatein.mop.api.workspace.ObjectType;
@@ -27,11 +27,11 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:urllink")
+@PrimaryType(name = "mop:urllink")
public abstract class URLLinkImpl extends LinkImpl implements URLLink
{
- @Property(name = "url")
+ @Property(name = "mop:url")
public abstract String getURL();
public abstract void setURL(String url);
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSite.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,7 +18,7 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.core.api.workspace.SiteImpl;
import org.gatein.mop.api.workspace.ObjectType;
import org.gatein.mop.api.workspace.Site;
@@ -27,7 +27,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:usersite")
+@PrimaryType(name = "mop:usersite")
public abstract class UserSite extends SiteImpl
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,14 +18,14 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:usersites")
+@PrimaryType(name = "mop:usersites")
public abstract class UserSiteContainer extends SiteContainer<UserSite>
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,10 +18,10 @@
*/
package org.gatein.mop.core.api.workspace;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.FindById;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.Workspace;
import org.gatein.mop.api.workspace.Site;
import org.gatein.mop.api.workspace.ObjectType;
@@ -37,7 +37,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:workspace")
+@PrimaryType(name = "mop:workspace")
public abstract class WorkspaceImpl extends WorkspaceObjectImpl implements Workspace, WorkspaceCustomizationContext
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextSpecialization.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -20,7 +20,7 @@
import org.chromattic.api.annotations.Name;
import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.content.CustomizationContext;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.core.api.content.CustomizationContextResolver;
@@ -29,7 +29,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:contextspecialization")
+@PrimaryType(name = "mop:contextspecialization")
public abstract class ContextSpecialization extends AbstractCustomization
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextType.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -20,9 +20,9 @@
import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.Name;
import org.chromattic.api.annotations.ManyToOne;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.core.api.MOPFormatter;
import java.util.Map;
@@ -31,7 +31,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:contexttype")
+@PrimaryType(name = "mop:contexttype")
@FormattedBy(MOPFormatter.class)
public abstract class ContextType
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -21,7 +21,7 @@
import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.core.api.MOPFormatter;
import java.util.Map;
@@ -30,7 +30,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:contexttypecontainer")
+@PrimaryType(name = "mop:contexttypecontainer")
@FormattedBy(MOPFormatter.class)
public abstract class ContextTypeContainer
{
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -19,13 +19,13 @@
package org.gatein.mop.core.api.workspace.content;
import org.chromattic.api.annotations.FormattedBy;
+import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.content.Customization;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.api.workspace.WorkspaceCustomizationContext;
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.RelatedMappedBy;
import org.gatein.mop.core.api.MOPFormatter;
@@ -35,13 +35,13 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:customizationcontainer")
+@PrimaryType(name = "mop:customizationcontainer")
@FormattedBy(MOPFormatter.class)
public abstract class CustomizationContainer
{
@OneToOne
- @RelatedMappedBy("customizations")
+ @RelatedMappedBy("mop:customizations")
public abstract WorkspaceCustomizationContext getOwner();
@OneToMany
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,8 +18,7 @@
*/
package org.gatein.mop.core.api.workspace.content;
-import org.chromattic.api.annotations.Property;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Name;
import org.chromattic.api.annotations.RelatedMappedBy;
import org.chromattic.api.annotations.OneToMany;
@@ -36,7 +35,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:workspaceclone")
+@PrimaryType(name = "mop:workspaceclone")
public abstract class WorkspaceClone extends WorkspaceCustomization
{
@@ -49,7 +48,7 @@
public abstract String getFooName();
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("customization")
+ @RelatedMappedBy("mop:customization")
public abstract Collection<WorkspaceSpecialization> getSpecializations();
//
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceCustomization.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -33,12 +33,12 @@
public abstract class WorkspaceCustomization extends AbstractCustomization
{
- @Property(name = "mimetype")
+ @Property(name = "mop:mimetype")
public abstract String getMimeType();
public abstract void setMimeType(String mimeType);
- @Property(name = "contentid")
+ @Property(name = "mop:contentid")
public abstract String getContentId();
public abstract void setContentId(String contentId);
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,21 +18,21 @@
*/
package org.gatein.mop.core.api.workspace.content;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.RelationshipType;
+import org.chromattic.api.annotations.PrimaryType;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:workspacespecialization")
+@PrimaryType(name = "mop:workspacespecialization")
public abstract class WorkspaceSpecialization extends WorkspaceCustomization
{
@ManyToOne(type = RelationshipType.PATH)
- @MappedBy("customization")
+ @MappedBy("mop:customization")
public abstract WorkspaceCustomization getCustomization();
public abstract void setCustomization(WorkspaceCustomization customization);
Modified: components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml
===================================================================
--- components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/main/resources/conf/mop-nodetypes.xml 2010-01-06 13:33:19 UTC (rev 1174)
@@ -63,13 +63,13 @@
<supertype>mix:referenceable</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="contexttypes" defaultPrimaryType="mop:contexttypecontainer" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:contexttypes" defaultPrimaryType="mop:contexttypecontainer" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:contexttypecontainer</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="state" defaultPrimaryType="mop:customizationstate" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="mop:state" defaultPrimaryType="mop:customizationstate" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:customizationstate</requiredPrimaryType>
@@ -85,10 +85,10 @@
<supertype>mop:customization</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="contentid" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:contentid" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="mimetype" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:mimetype" requiredType="String" autoCreated="false" mandatory="true" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -105,7 +105,7 @@
<supertype>mop:workspacecustomization</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="customization" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:customization" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -137,7 +137,7 @@
<supertype>nt:base</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="customizations" defaultPrimaryType="mop:customizationcontainer" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:customizations" defaultPrimaryType="mop:customizationcontainer" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:customizationcontainer</requiredPrimaryType>
@@ -186,7 +186,7 @@
<supertype>mop:uicomponent</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="customization" defaultPrimaryType="mop:workspacecustomization" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="mop:customization" defaultPrimaryType="mop:workspacecustomization" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:workspacecustomization</requiredPrimaryType>
@@ -203,7 +203,7 @@
<nodeType name="mop:templatized" isMixin="true" hasOrderableChildNodes="false" primaryItemName="">
<propertyDefinitions>
- <propertyDefinition name="template" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:template" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -215,13 +215,13 @@
<supertype>mop:templatized</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="children" defaultPrimaryType="mop:navigationcontainer" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:children" defaultPrimaryType="mop:navigationcontainer" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:navigationcontainer</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="link" defaultPrimaryType="mop:link" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="mop:link" defaultPrimaryType="mop:link" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:link</requiredPrimaryType>
@@ -256,7 +256,7 @@
<supertype>mop:link</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="page" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:page" requiredType="Path" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -267,7 +267,7 @@
<supertype>mop:link</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="url" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:url" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -280,13 +280,13 @@
<supertype>mop:customizationcontext</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="children" defaultPrimaryType="mop:pagecontainer" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:children" defaultPrimaryType="mop:pagecontainer" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:pagecontainer</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="rootcomponent" defaultPrimaryType="mop:uicontainer" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:rootcomponent" defaultPrimaryType="mop:uicontainer" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:uicontainer</requiredPrimaryType>
@@ -316,13 +316,13 @@
<supertype>mop:customizationcontext</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="rootpage" defaultPrimaryType="mop:page" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:rootpage" defaultPrimaryType="mop:page" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:page</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="rootnavigation" defaultPrimaryType="mop:navigation" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:rootnavigation" defaultPrimaryType="mop:navigation" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:navigation</requiredPrimaryType>
@@ -400,19 +400,19 @@
<supertype>mop:customizationcontext</supertype>
</supertypes>
<childNodeDefinitions>
- <childNodeDefinition name="portalsites" defaultPrimaryType="mop:portalsites" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:portalsites" defaultPrimaryType="mop:portalsites" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:portalsites</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="groupsites" defaultPrimaryType="mop:groupsites" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:groupsites" defaultPrimaryType="mop:groupsites" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:groupsites</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="usersites" defaultPrimaryType="mop:usersites" autoCreated="true" mandatory="false"
+ <childNodeDefinition name="mop:usersites" defaultPrimaryType="mop:usersites" autoCreated="true" mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>mop:usersites</requiredPrimaryType>
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/POMFormatterTestCase.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -51,19 +51,19 @@
public void testStrings()
{
- assertString("", "");
- assertString("a", "a");
- assertString("%00", "{");
- assertString("%01", "}");
- assertString("%02", ".");
- assertString("%03", "/");
- assertString("%04", ":");
- assertString("%05", "[");
- assertString("%06", "]");
- assertString("%07", "|");
- assertString("%08", "*");
- assertString("%09", "%");
- assertString("a%03b", "a/b");
+ assertString("mop:", "");
+ assertString("mop:a", "a");
+ assertString("mop:%00", "{");
+ assertString("mop:%01", "}");
+ assertString("mop:%02", ".");
+ assertString("mop:%03", "/");
+ assertString("mop:%04", ":");
+ assertString("mop:%05", "[");
+ assertString("mop:%06", "]");
+ assertString("mop:%07", "|");
+ assertString("mop:%08", "*");
+ assertString("mop:%09", "%");
+ assertString("mop:a%03b", "a/b");
}
public void testDecodeFailure()
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NameEncodingTestCase.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NameEncodingTestCase.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/api/workspace/NameEncodingTestCase.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -41,6 +41,6 @@
Site site = workspace.addSite(ObjectType.GROUP_SITE, ":");
DomainSession session = (DomainSession)model.getSession();
Node siteNode = session.getNode(site);
- assertEquals("%04", siteNode.getName());
+ assertEquals("mop:%04", siteNode.getName());
}
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetContentProvider.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetContentProvider.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetContentProvider.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -50,9 +50,9 @@
//
GadgetState prefs;
- if (node.hasNode("state"))
+ if (node.hasNode("mop:state"))
{
- Node stateNode = node.getNode("state");
+ Node stateNode = node.getNode("mop:state");
prefs = (GadgetState)session.findById(Object.class, stateNode.getUUID());
if (state == null)
{
@@ -68,7 +68,7 @@
}
else
{
- Node stateNode = node.addNode("state", "mop:gadget");
+ Node stateNode = node.addNode("mop:state", "mop:gadget");
prefs = (GadgetState)session.findById(Object.class, stateNode.getUUID());
}
}
@@ -92,9 +92,9 @@
//
GadgetState prefs;
- if (node.hasNode("state"))
+ if (node.hasNode("mop:state"))
{
- Node stateNode = node.getNode("state");
+ Node stateNode = node.getNode("mop:state");
prefs = (GadgetState)session.findById(Object.class, stateNode.getUUID());
Gadget gadget = new Gadget();
gadget.setUserPref(prefs.getUserPrefs());
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetState.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetState.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/gadget/GadgetState.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,18 +18,18 @@
*/
package org.gatein.mop.core.support.content.gadget;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:gadget")
+@PrimaryType(name = "mop:gadget")
public abstract class GadgetState
{
- @Property(name = "prefs")
+ @Property(name = "mop:prefs")
public abstract String getUserPrefs();
public abstract void setUserPrefs(String userPrefs);
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletContentProvider.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletContentProvider.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletContentProvider.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -68,9 +68,9 @@
//
PortletPreferencesState prefs;
- if (node.hasNode("state"))
+ if (node.hasNode("mop:state"))
{
- Node stateNode = node.getNode("state");
+ Node stateNode = node.getNode("mop:state");
prefs = (PortletPreferencesState)session.findById(Object.class, stateNode.getUUID());
if (state == null)
{
@@ -86,7 +86,7 @@
}
else
{
- Node stateNode = node.addNode("state", "mop:portletpreferences");
+ Node stateNode = node.addNode("mop:state", "mop:portletpreferences");
prefs = (PortletPreferencesState)session.findById(Object.class, stateNode.getUUID());
}
}
@@ -110,9 +110,9 @@
//
PortletPreferencesState prefs;
- if (node.hasNode("state"))
+ if (node.hasNode("mop:state"))
{
- Node stateNode = node.getNode("state");
+ Node stateNode = node.getNode("mop:state");
prefs = (PortletPreferencesState)session.findById(Object.class, stateNode.getUUID());
return (Preferences)prefs.getPayload();
}
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferenceState.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,10 +18,12 @@
*/
package org.gatein.mop.core.support.content.portlet;
-import org.chromattic.api.annotations.NodeMapping;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.Name;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
+import org.gatein.mop.core.api.MOPFormatter;
import java.util.List;
@@ -29,7 +31,8 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:portletpreference")
+@PrimaryType(name = "mop:portletpreference")
+(a)FormattedBy(MOPFormatter.class)
public abstract class PortletPreferenceState
{
@@ -39,17 +42,17 @@
@Name
public abstract String getName();
- @Property(name = "value")
+ @Property(name = "mop:value")
public abstract List<String> getValue();
public abstract void setValue(List<String> value);
- @Property(name = "value")
+ @Property(name = "mop:value")
public abstract List<String> getValues();
public abstract void setValues(List<String> value);
- @Property(name = "readonly")
+ @Property(name = "mop:readonly")
public abstract boolean getReadOnly();
public abstract void setReadOnly(boolean readOnly);
Modified: components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java
===================================================================
--- components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/java/org/gatein/mop/core/support/content/portlet/PortletPreferencesState.java 2010-01-06 13:33:19 UTC (rev 1174)
@@ -18,14 +18,11 @@
*/
package org.gatein.mop.core.support.content.portlet;
-import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.OneToOne;
+import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.RelatedMappedBy;
-import org.gatein.mop.core.support.content.portlet.Preferences;
-import org.gatein.mop.core.support.content.portlet.Preference;
-import org.gatein.mop.core.support.content.portlet.PreferencesBuilder;
import org.gatein.mop.core.api.workspace.content.AbstractCustomization;
import java.util.Map;
@@ -34,7 +31,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-@NodeMapping(name = "mop:portletpreferences")
+@PrimaryType(name = "mop:portletpreferences")
public abstract class PortletPreferencesState
{
Modified: components/mop/trunk/core/src/test/resources/conf/content-nodetypes.xml
===================================================================
--- components/mop/trunk/core/src/test/resources/conf/content-nodetypes.xml 2010-01-06 11:25:14 UTC (rev 1173)
+++ components/mop/trunk/core/src/test/resources/conf/content-nodetypes.xml 2010-01-06 13:33:19 UTC (rev 1174)
@@ -40,10 +40,10 @@
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
+ <propertyDefinition name="mop:value" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
</propertyDefinition>
- <propertyDefinition name="readonly" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:readonly" requiredType="Boolean" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
@@ -54,7 +54,7 @@
<supertype>mop:customizationstate</supertype>
</supertypes>
<propertyDefinitions>
- <propertyDefinition name="prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
+ <propertyDefinition name="mop:prefs" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="false">
<valueConstraints/>
</propertyDefinition>
</propertyDefinitions>
14 years, 11 months
- 1
- 0
gatein SVN: r1173 - in portal/trunk/docs/user-guide/en/modules: portletsUser and 1 other directory.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-01-06 06:25:14 -0500 (Wed, 06 Jan 2010)
New Revision: 1173
Modified:
portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
Log:
further edits
Modified: portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml 2010-01-06 08:37:18 UTC (rev 1172)
+++ portal/trunk/docs/user-guide/en/modules/portal/Change_Node_Order.xml 2010-01-06 11:25:14 UTC (rev 1173)
@@ -22,8 +22,13 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--><title>Change Node Order</title>
+<warning>
+<para>
+The <emphasis role="bold">Administration</emphasis> menu entry reported to be under the <emphasis role="bold">GateIn Start</emphasis> button does not exist in GateIn 3.0 Beta 3. Therefore some of the instructions in this section may be incomplete or inaccurate.
+</para>
+</warning>
<para>
- You can easily change the position of node on the navigation bar on their own convenient order by following these steps:
+ You can easily change the position of nodes in the navigation bar following these steps:
</para>
<procedure>
<step>
@@ -53,7 +58,7 @@
</step>
<step>
<para>
- The selected node will be moved up/down.
+ The selected node will be moved up or down within the list.
</para>
</step>
</procedure>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-01-06 08:37:18 UTC (rev 1172)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Navigation_Nodes.xml 2010-01-06 11:25:14 UTC (rev 1173)
@@ -22,10 +22,15 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
--><title>Manage Navigation Nodes</title>
+<warning>
+<para>The <emphasis role="bold">User Workspace</emphasis> has been deprecated in GateIn 3.0 Beta 3. The introductory paragraph below may be obsolete.
+<emphasis role="bold">Also</emphasis>
+The <emphasis role="bold">Administration</emphasis> menu entry reported to be under the <emphasis role="bold">GateIn Start</emphasis> button does not exist in GateIn 3.0 Beta 3. Therefore some of the instructions in this section may be incomplete or inaccurate.
+</para>
+</warning>
<para>
If you are allowed to access GateIn Start in the User Workspace, you can take all actions related to a node such as : add a new node, edit, copy, cut, delete and clone node.
</para>
-
<section id="sect-User_Guide-Manage_Navigation_Nodes-Add_a_new_node">
<title>Add a new node</title>
<procedure>
@@ -41,12 +46,12 @@
</step>
<step>
<para>
- Select a node from list (to create a new node like sub-node of the selected node) or click the icon!images/UpIcon.png! to create a new node on root
+ Select a node from list (to create a new node like sub-node of the selected node) or click the <emphasis role="bold">Up</emphasis> icon to create a new node at the root level of the portal.
</para>
</step>
<step>
<para>
- Right-click on the selected navigation or node and select <emphasis role="bold">Add new Node</emphasis> option. Add new node form appears:
+ Right-click on the selected navigation or node and select <emphasis role="bold">Add new Node</emphasis> option. The <emphasis role="bold">Add new node</emphasis> form appears:
</para>
<mediaobject>
<imageobject>
@@ -56,78 +61,66 @@
<para>
The <emphasis role="bold">Page Node Setting</emphasis> tab includes:
</para>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Name </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- Uri
- </entry>
- <entry>
+
+
+ <variablelist>
+ <varlistentry>
+ <term>Uri</term>
+ <listitem>
+ <para>
An identification of the node. The Uri is automatically created after adding a new node
- </entry>
- </row>
- <row>
- <entry>
- Node name
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Node name</term>
+ <listitem>
+ <para>
The name of the node. This field is required and must be unique. Only alpha, digit and underscore characters are allowed for this field and it must have at least 3 characters.
- </entry>
- </row>
- <row>
- <entry>
- Label
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Label</term>
+ <listitem>
+ <para>
The display name of the node on the screen. This field is not required and may be changed. This field must have a length between 3 and 120 characters.
- </entry>
- </row>
- <row>
- <entry>
- Visible
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Visible</term>
+ <listitem>
+ <para>
This check box allow to hide (and show) the page and its node at the navigation bar, the page navigation and the site map
- </entry>
- </row>
- <row>
- <entry>
- Publication date & time
- </entry>
- <entry>
- This option allows publishing this node for a period of time. *Start Publication Date* and *End Publication Date* only appear when this option is selected.
- </entry>
- </row>
- <row>
- <entry>
- Start Publication Date
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Publication date & time</term>
+ <listitem>
+ <para>
+ This option allows publishing this node for a period of time. <emphasis>Start Publication Date</emphasis> and <emphasis>End Publication Date</emphasis> only appear when this option is selected.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Start Publication Date</term>
+ <listitem>
+ <para>
The start date and time to publish the node.
- </entry>
- </row>
- <row>
- <entry>
- End Publication Date
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>End Publication Date</term>
+ <listitem>
+ <para>
The end date and time to publish the node.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
In the <emphasis role="bold">Page Selector</emphasis> tab, you can select a page or not for this node.
</para>
@@ -136,48 +129,34 @@
<imagedata fileref="images/PageSelector.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- <informaltable colsep="0" frame="none" rowsep="0">
- <tgroup cols="2">
- <colspec align="center"></colspec>
- <colspec align="center"></colspec>
- <tbody>
- <row>
- <entry>
- <emphasis role="bold"> Name </emphasis>
- </entry>
- <entry>
- <emphasis role="bold"> Description </emphasis>
- </entry>
- </row>
- <row>
- <entry>
- Page Id
- </entry>
- <entry>
+ <variablelist>
+ <varlistentry>
+ <term>Page Id</term>
+ <listitem>
+ <para>
The identification string of the page.
- </entry>
- </row>
- <row>
- <entry>
- Name
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Name</term>
+ <listitem>
+ <para>
The selected page's name.
- </entry>
- </row>
- <row>
- <entry>
- Title
- </entry>
- <entry>
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term>Title</term>
+ <listitem>
+ <para>
The selected page's title.
- </entry>
- </row>
- </tbody>
- </tgroup>
- </informaltable>
+ </para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
<para>
- You do not have to input values in these fields. It is automatically displayed after selecting an existing page by clicking the <emphasis role="bold">Search and Select Page</emphasis> button. The <emphasis role="bold">Select a page</emphasis> form appears like:
+ You do not have to input values in these fields. It is automatically displayed after selecting an existing page by clicking the <emphasis role="bold">Search and Select Page</emphasis> button. The <emphasis role="bold">Select a page</emphasis> form appears:
</para>
<mediaobject>
<imageobject>
@@ -213,12 +192,12 @@
</step>
<step>
<para>
- Click the magnifying glass!images/NewGlassIcon.png! icon to perform searching. All pages matching with search term will be listed.
+ Click the magnifying glass icon to perform the search. All pages matching with search term will be listed.
</para>
</step>
<step>
<para>
- Click the OK!images/NewOkIcon.png! icon on the row of the page to select.
+ Click the OK icon on the row of the page you wish to select.
</para>
</step>
<step>
@@ -257,7 +236,7 @@
</imageobject>
</mediaobject>
<para>
- It will displays a form to edit this node:
+ This will display a form to edit this node:
</para>
<mediaobject>
<imageobject>
@@ -267,8 +246,24 @@
</step>
<step>
<para>
- In the <emphasis role="bold">Page Node Setting</emphasis> tab: you can change the value of these fields: Label, Visible and Publication Date & time. After finish changing, click the <emphasis role="bold">Save</emphasis> button to accept changing or <emphasis role="bold">Cancel</emphasis> button to refuse it.
+ In the <emphasis role="bold">Page Node Setting</emphasis> tab you can change the value of these fields:
</para>
+ <itemizedlist>
+ <listitem>
+ <para>Label</para>
+ </listitem>
+ <listitem>
+ <para>Visible</para>
+ </listitem>
+ <listitem>
+ <para>Publication Date & time</para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ After you finish making the desired changes, click the <emphasis role="bold">Save</emphasis> button to accept changes or <emphasis role="bold">Cancel</emphasis> button to exit without change.
+ </para>
<mediaobject>
<imageobject>
<imagedata fileref="images/PageSelector6.png" format="PNG" width="444" />
@@ -277,8 +272,14 @@
</step>
<step>
<para>
- In the <emphasis role="bold">Page Selector</emphasis> tab : you also search and select another page for this node by clicking the <emphasis role="bold">Search and Select Page</emphasis> button. You can see more details on how to select a page for a node on the above <emphasis role="bold">Add a new node</emphasis> section. After finish changing another page for this node, click the <emphasis role="bold">Save</emphasis> button to accept changing or <emphasis role="bold">Cancel</emphasis> button to leave without saving any changes.
+ In the <emphasis role="bold">Page Selector</emphasis> tab you can also search and select another page for this node by clicking the <emphasis role="bold">Search and Select Page</emphasis> button.
</para>
+ <para>
+You can see more details on how to select a page for a node in <xref linkend="sect-User_Guide-Manage_Navigation_Nodes-Add_a_new_node" />.
+ </para>
+ <para>
+ After you finish edit any another page required for this node, click the <emphasis role="bold">Save</emphasis> button to accept changing or <emphasis role="bold">Cancel</emphasis> button to leave without saving any changes.
+ </para>
</step>
</procedure>
</section>
@@ -308,7 +309,7 @@
</step>
<step>
<para>
- Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the!images/MarkIcon.png! icon to <emphasis role="bold">Save</emphasis>.
+ Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>.
</para>
<mediaobject>
<imageobject>
@@ -322,8 +323,14 @@
<section id="sect-User_Guide-Manage_Navigation_Nodes-Clone_nodes">
<title>Clone nodes</title>
<para>
- <emphasis role="bold">Clone node</emphasis> function allows you to copy the node. However, the differences between <emphasis role="bold">copy node</emphasis> and <emphasis role="bold">clone node</emphasis> is that the clone node has its own page and this page has the same content as the selected node, so there will be a new page that has the same name with the selected node's page, is shown in the page list when you access<emphasis role="bold">Manage Pages</emphasis>.
+ The <emphasis role="bold">Clone node</emphasis> function allows you to copy a node.
</para>
+ <para>
+ The differences between <emphasis role="bold">clone node</emphasis> and <emphasis role="bold">copy node</emphasis> is that the clone node has its own page and which has the same content as the selected node.
+ </para>
+ <para>
+Therefore there will be a new page that has the same name as the cloned node's page shown in the page list when you access <emphasis role="bold">Manage Pages</emphasis>.
+ </para>
<procedure>
<step>
<para>
@@ -347,7 +354,7 @@
</step>
<step>
<para>
- Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the!images/MarkIcon.png! icon to <emphasis role="bold">Save</emphasis>.
+ Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the mark icon to <emphasis role="bold">Save</emphasis>.
</para>
<mediaobject>
<imageobject>
@@ -391,7 +398,7 @@
</step>
<step>
<para>
- Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. Click the!images/MarkIcon.png! icon to <emphasis role="bold">Save</emphasis>.
+ Select the position that you want to paste this node and select <emphasis role="bold">Paste Node</emphasis> option. mark icon to <emphasis role="bold">Save</emphasis>.
</para>
<mediaobject>
<imageobject>
@@ -425,7 +432,7 @@
</imageobject>
</mediaobject>
<para>
- It will display an alert message, click the <emphasis role="bold">OK</emphasis> button to accept deleting or <emphasis role="bold">Cancel</emphasis> button to quit without deleting a node.
+ It will display an alert message confirming the removal of the node. Click the <emphasis role="bold">OK</emphasis> button to accept the deletion or <emphasis role="bold">Cancel</emphasis> button to quit without deleting the node.
</para>
<mediaobject>
<imageobject>
Modified: portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-06 08:37:18 UTC (rev 1172)
+++ portal/trunk/docs/user-guide/en/modules/portal/Manage_Page_Navigation.xml 2010-01-06 11:25:14 UTC (rev 1173)
@@ -23,7 +23,7 @@
--><title>Manage Page Navigation</title>
<para>
- Navigation types that &PRODUCT; supports, please refer the <xref linkend="sect-User_Guide-Navigation" /> page.
+ Navigation types that &PRODUCT; supports are outlined in <xref linkend="sect-User_Guide-Navigation" />.
</para>
<!-- <section id="User_Guide-Manage_Page_Navigation-Portals_page_navigation">
@@ -53,15 +53,20 @@
<para>
Go to <emphasis role="bold">GateIn Start</emphasis>-> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis>--> <emphasis role="bold">Edit Page and Navigation</emphasis>.
</para>
+<warning>
+ <para>
+ The <emphasis role="bold">Administration</emphasis> menu entry mentioned above is not present in GateIn 3.0 Beta 3
+ </para>
+</warning>
</step>
<step>
<para>
- Select Portal navigation in list on the left pane (eg: portal: classic's Nav).
+ Select Portal navigation in the list in the left pane (eg: portal: classic's Nav).
</para>
</step>
<step>
<para>
- Right click the blank space on the left pane and select <emphasis role="bold">Edit Navigation</emphasis> in the menu:
+ Right click the blank space on the left pane and select <emphasis role="bold">Edit Navigation</emphasis> in the context-menu:
</para>
<mediaobject>
<imageobject>
@@ -69,21 +74,21 @@
</imageobject>
</mediaobject>
<para>
- The form for editing the portal navigation will be opened:
+ This will open a dialogue box allowing you to edit the navigation menu.
</para>
<mediaobject>
<imageobject>
<imagedata fileref="images/EditPortalNavigation2.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- <para>
- The number that users select in the <emphasis role="bold">Priority</emphasis> field is the priority of a page navigation on the Navigation bar.
- </para>
</step>
<step>
<para>
Make changes to fields in this form: <emphasis role="bold">Description</emphasis>, <emphasis role="bold">Priority</emphasis>.
</para>
+ <para>
+ The <emphasis role="bold">Priority</emphasis> field sets the priority of a page navigation on the Navigation bar.
+ </para>
</step>
<step>
<para>
@@ -92,7 +97,7 @@
</step>
<step>
<para>
- Click the!images/OKIcon.png! to take effect of new change or click the <emphasis role="bold">Cancel</emphasis> button to quit without saving any change.
+ Click the <emphasis role="bold">OK</emphasis> button to submit changes or click the <emphasis role="bold">Cancel</emphasis> button to quit without saving.
</para>
</step>
</procedure>
@@ -101,14 +106,14 @@
<section id="User_Guide-Manage_Page_Navigation-Deleting_a_portals_navigation">
<title>Deleting a portal's navigation</title>
<para>
- No one can create the portal's page navigation so no one can delete it. A navigation is deleted automatically after you delete its portal.
+ A navigation is deleted automatically after you delete the portal it correseponds to.
</para>
</section>
<section id="User_Guide-Manage_Page_Navigation-Groups_page_navigation">
<title>Group's page navigation</title>
<para>
- Each group has only one page navigation. Only users of that group have the "manager" membership can create/edit/delete navigation for that group
+ Each group has only one page navigation. Only users of that group who have the "manager" membership can create, edit or delete navigation for that group.
</para>
</section>
@@ -119,6 +124,12 @@
<para>
Go to <emphasis role="bold">GateIn Start</emphasis> -> <emphasis role="bold">Administration</emphasis> -> <emphasis role="bold">Advanced</emphasis> --> <emphasis role="bold">Edit Page and Navigation</emphasis>.
</para>
+<warning>
+ <para>
+ The <emphasis role="bold">Administration</emphasis> menu entry mentioned above is not present in GateIn 3.0 Beta 3
+ </para>
+</warning>
+
</step>
<step>
<para>
@@ -127,7 +138,7 @@
</step>
<step>
<para>
- Right click the blank space on the left pane and select <emphasis role="bold">Edit Navigation</emphasis> in the context menu:
+ Right click the blank space in the left pane and select <emphasis role="bold">Edit Navigation</emphasis> in the context menu:
</para>
<mediaobject>
<imageobject>
@@ -145,36 +156,36 @@
</step>
<step>
<para>
- Make changes for two fields: <emphasis role="bold">Description</emphasis> and <emphasis role="bold">Priority</emphasis>.
+ Make changes in the <emphasis role="bold">Description</emphasis> and <emphasis role="bold">Priority</emphasis> fields.
</para>
<para>
- The number that users select in the <emphasis role="bold">Priority</emphasis> field is the priority of a page navigation on the Navigation bar.
+ The <emphasis role="bold">Priority</emphasis> field is the priority of a page navigation on the Navigation bar.
</para>
</step>
<step>
<para>
- Click the <emphasis role="bold">Save</emphasis> button to accept any changes.
+ Click the <emphasis role="bold">Save</emphasis> button to submit any changes.
</para>
</step>
<step>
<para>
- Click the!images/OKIcon.png! to take effect new changes on the Navigation bar or click the <emphasis role="bold">Cancel</emphasis> button to quit without saving any change.
+ Click the <emphasis role='bold'>OK</emphasis> button to effect the changes on the Navigation bar or click the <emphasis role="bold">Cancel</emphasis> button to quit without saving any change.
</para>
</step>
</procedure>
</section>
- <section id="User_Guide-Manage_Page_Navigation-Users_page_navigation">
+<!-- <section id="User_Guide-Manage_Page_Navigation-Users_page_navigation">
<title>User's page navigation</title>
<para>
Stuff Goes here?
</para>
- </section>
+ </section> Editing out pending content -->
<section id="User_Guide-Manage_Page_Navigation-Creating_a_users_navigation">
<title>Creating a user's navigation</title>
<para>
- The page navigation of a user is created automatically when a user is created (registered). So an administrator don't have to create it.
+ The page navigation of a user is created automatically when a user is registered.
</para>
</section>
@@ -188,7 +199,7 @@
<section id="User_Guide-Manage_Page_Navigation-Deleting_a_users_navigation">
<title>Deleting a user's navigation</title>
<para>
- No one can create user's page navigation so that no one can delete it. A user's navigation is deleted automatically when its user is deleted.
+ A user's navigation is deleted automatically when that user is deleted.
</para>
</section>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-01-06 08:37:18 UTC (rev 1172)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-01-06 11:25:14 UTC (rev 1173)
@@ -114,7 +114,7 @@
</step>
<step>
<para>
- The Dashboard Workspace dialog appear :
+ The Dashboard Workspace dialog appears:
<mediaobject>
<imageobject>
<imagedata fileref="images/EnterLink.png" format="PNG" />
@@ -124,7 +124,7 @@
</step>
<step>
<para>
- Enter a link (a .xml or .rss) in the text box above the gadgets list.
+ Enter a link (.xml or .rss) in the text box above the gadgets list.
</para>
<note>
<title>Note</title>
14 years, 11 months
- 1
- 0
gatein SVN: r1172 - in portal/trunk/docs/user-guide/en: modules and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-01-06 03:37:18 -0500 (Wed, 06 Jan 2010)
New Revision: 1172
Added:
portal/trunk/docs/user-guide/en/User_Guide.ent
Modified:
portal/trunk/docs/user-guide/en/master.xml
portal/trunk/docs/user-guide/en/modules/Introduction.xml
portal/trunk/docs/user-guide/en/modules/Portal.xml
portal/trunk/docs/user-guide/en/modules/PortletsUser.xml
portal/trunk/docs/user-guide/en/modules/Terms.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml
portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml
portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
Log:
- Reviewed chapter 1 - 4 (Introduction, portletUser, terms and account) (Mostly removed parts that are not available anymore)
- Added usage on XML entities in the Maven build
Added: portal/trunk/docs/user-guide/en/User_Guide.ent
===================================================================
--- portal/trunk/docs/user-guide/en/User_Guide.ent (rev 0)
+++ portal/trunk/docs/user-guide/en/User_Guide.ent 2010-01-06 08:37:18 UTC (rev 1172)
@@ -0,0 +1,4 @@
+<!ENTITY PRODUCT "GateIn 3.0">
+<!ENTITY BOOKID "User Guide">
+<!ENTITY YEAR "2010">
+<!ENTITY HOLDER "Red Hat, Inc">
Modified: portal/trunk/docs/user-guide/en/master.xml
===================================================================
--- portal/trunk/docs/user-guide/en/master.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/master.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?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.
-
--->
-
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "User_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
<book lang="en">
<bookinfo>
<title>GateIn Documentation</title>
@@ -29,11 +12,9 @@
<releaseinfo>This is a very rough documentation issued from the merge,
content still has to be validated, we still hope that it can help the
beta testers. Thanks !</releaseinfo>
-
</bookinfo>
<toc />
-
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml" />
<!--
Table of content in Wiki Format <xi:include
Modified: portal/trunk/docs/user-guide/en/modules/Introduction.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/Introduction.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -4,7 +4,7 @@
<chapter id="chap-User_Guide-Introduction">
<title>Introduction</title>
<para>
- GateIn is a merge of two mature projects; the JBoss Portal and the eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs.
+ GateIn is a merge of two mature projects; JBoss Portal and eXo Portal. It takes the best of both offerings and incorporates them into a single new project. The aim is to provide an intuitive portal for as-is use and a framework to build upon depending on your needs.
</para>
<mediaobject>
<imageobject>
Modified: portal/trunk/docs/user-guide/en/modules/Portal.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Portal.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/Portal.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -2,26 +2,7 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Portal_Administration">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Portal Administration</title>
+ <title>Portal Administration</title>
<!-- xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="portal/User_Workspace.xml" /> -->
<xi:include href="portal/Toolbar.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portal/User_Management.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
Modified: portal/trunk/docs/user-guide/en/modules/PortletsUser.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/PortletsUser.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/PortletsUser.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -2,29 +2,12 @@
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
]>
<chapter id="chap-User_Guide-Portlets">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Portlets</title>
+ <title>Portlets</title>
<xi:include href="portletsUser/Functional_Portlets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portletsUser/Interface_Portlets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="portletsUser/Dashboard_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!--
<xi:include href="portletsUser/FCK_Portlet.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ -->
</chapter>
Modified: portal/trunk/docs/user-guide/en/modules/Terms.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/Terms.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/Terms.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<chapter id="chap-User_Guide-Terms">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Terms</title>
+ <title>Terms &PRODUCT;</title>
<xi:include href="terms/Portal_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Portlet_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Toolbar_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
@@ -29,8 +12,5 @@
<xi:include href="terms/Gadget_concept.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Public_mode_and_Private_mode.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="terms/Permission_levels.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- Deprecated
-<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="terms/Workspace_concept.xml" />-->
-
</chapter>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Dashboard_Portlet">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Dashboard Portlet</title>
+ <title>Dashboard Portlet</title>
<para>
The Dashboard portlet is used for hosting mini applications known as gadgets. The Dashboard uses a variety of graphical effects for displaying, opening and using gadgets. Gadgets can be moved around, rearranged, deleted and created. More than one instance of the same gadget can be opened at the same time and each instance of the same gadget can have different settings. The gadgets instances are as independent as different portlets instances.
</para>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/FCK_Portlet.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-FCK_Portlet">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>FCK Portlet</title>
+ <title>FCK Portlet</title>
<para>
&PRODUCT; provides users with a portlet for the FCK Editor; a <ulink type="http" url="http://en.wikipedia.org/wiki/WYSIWYG">WYSIWYG</ulink> text editor that can be embedded in HTML web pages. FCK Editor offers users many of the commonly used word-processor functions such as writing, formatting text, creating tables, inserting links or pictures and more.
</para>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Functional_Portlets.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,29 +1,12 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Functional_Portlets">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Functional Portlets</title>
+ <title>Functional Portlets</title>
<para>
- Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. Enterprise Portal Platform 5.0 provides the following portlets by default:
+ Portlets are pluggable user interface components that are managed and displayed within a portal. Functional Portlets support all functions of a Portal. &PRODUCT; provides the following portlets by default:
</para>
<variablelist>
@@ -79,6 +62,7 @@
</mediaobject>
</listitem>
</varlistentry>
+ <!-- Doesn't exist anymore AFAIK
<varlistentry>
<term>Administration Toolbar Portlet</term>
<listitem>
@@ -92,6 +76,7 @@
</mediaobject>
</listitem>
</varlistentry>
+ -->
<varlistentry>
<term>Star Toolbar Portlet</term>
<listitem>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Interface_Portlets">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Interface Portlets</title>
+ <title>Interface Portlets</title>
<para>
The Interface Portlets are the face of the Portal. They provide the means for users to interact with the portal. &PRODUCT; consists of the following Interface Portlets:
</para>
@@ -134,6 +117,7 @@
</mediaobject> -->
</listitem>
</varlistentry>
+ <!-- Thomas: It has been removed AFAIK
<varlistentry>
<term>Web Explorer Portlet</term>
<listitem>
@@ -147,6 +131,7 @@
</mediaobject>
</listitem>
</varlistentry>
+ -->
<varlistentry>
<term>Gadget Wrapper Portlet</term>
<listitem>
@@ -160,6 +145,7 @@
</mediaobject>
</listitem>
</varlistentry>
+ <!-- Thomas: It has been removed AFAIK
<varlistentry>
<term>FCK Editor Portlet</term>
<listitem>
@@ -173,6 +159,7 @@
</mediaobject>
</listitem>
</varlistentry>
+ -->
<varlistentry>
<term>Footer Portlet</term>
<listitem>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Gadget_concept.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Gadgets">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Gadgets</title>
+ <title>Gadgets</title>
<para>
A gadget is a mini web application that a portal user can add to their web page. Some useful gadgets that are packaged by default with &PRODUCT;:
</para>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Navigation_concept.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,29 +1,12 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Navigation">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Navigation</title>
+ <title>Navigation</title>
<para>
- Portal navigations are menus that list hyperlinks to other parts of a Portal. They can help users to visualize the structure of a site. The navigation menus in EPP 5.0 are located in a bar across the top of the 'Home' page.
+ Portal navigations are menus that list hyperlinks to other parts of a Portal. They can help users to visualize the structure of a site. The default navigation menus in &PRODUCT; are located in a bar across the top of the 'Home' page.
</para>
<para>
There are three navigation types.
Modified: portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Permission_levels.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Permissions">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Permissions</title>
+ <title>Permissions</title>
<para>
Permission settings control what users can and cannot do within the portal and are set by portal administrators.
</para>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Portal_concept.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Portal">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Portal</title>
+ <title>Portal</title>
<para>
&PRODUCT; is a web-based application that provides users with personalized User Interface (UI). This interface allows users to easily search applications or information or communicating with other users.
</para>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Portlet_concept.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Portlet">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Portlet</title>
+ <title>Portlet</title>
<para>
A portlet is a small, self-contained web application. Portlet interface components are managed and displayed within a Portal. Typically, a <emphasis>portal</emphasis> page is displayed as a collection of non-overlapping <emphasis>portlet</emphasis> windows, with each portlet window displaying a different portlet. Hence a portlet (or collection of portlets) resembles a web-based application hosted in a portal.
</para>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Public_mode_and_Private_mode.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Modes">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Modes</title>
+ <title>Modes</title>
<para>
&PRODUCT; has two <emphasis role="bold">modes</emphasis>:
</para>
Modified: portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-01-06 07:05:58 UTC (rev 1171)
+++ portal/trunk/docs/user-guide/en/modules/terms/Toolbar_concept.xml 2010-01-06 08:37:18 UTC (rev 1172)
@@ -1,27 +1,10 @@
<?xml version='1.0' encoding='utf-8' ?>
<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "../../User_Guide.ent">
+%BOOK_ENTITIES;
]>
<section id="sect-User_Guide-Toolbar-Concept">
- <!--
-
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-
- --><title>Toolbar</title>
+ <title>Toolbar</title>
<para>
This bar contains all user and administration actions. It helps users and the administrator access and perform actions easily, quickly and effectively. You can see the toolbar below as it appears in the Portal:
</para>
14 years, 11 months
- 1
- 0