gatein SVN: r2186 - portal/trunk/server/tomcat/patch/src/main/tomcat/bin.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-11 15:04:24 -0500 (Thu, 11 Mar 2010)
New Revision: 2186
Modified:
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
Log:
Default PermGen space is often too low (depends on OS/JVM)
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-03-11 19:17:46 UTC (rev 2185)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.bat 2010-03-11 20:04:24 UTC (rev 2186)
@@ -27,9 +27,9 @@
rem Sets some variables
set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf"
-set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf"
+set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein\conf"
set EXO_CONFIG_OPTS="-Dorg.exoplatform.container.configuration.debug"
-set JAVA_OPTS=-Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS%
+set JAVA_OPTS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS% %EXO_CONFIG_OPTS%
set JPDA_TRANSPORT=dt_socket
set JPDA_ADDRESS=8000
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-03-11 19:17:46 UTC (rev 2185)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-03-11 20:04:24 UTC (rev 2186)
@@ -24,8 +24,8 @@
# Sets some variables
LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir=../gatein/conf"
-EXO_CONFIG_OPTS="-Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug"
+EXO_OPTS="-Dexo.product.developing=true -Dexo.conf.dir.name=gatein/conf"
+EXO_CONFIG_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m -Dorg.exoplatform.container.configuration.debug"
JPDA_TRANSPORT=dt_socket
JPDA_ADDRESS=8000
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-03-11 19:17:46 UTC (rev 2185)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.bat 2010-03-11 20:04:24 UTC (rev 2186)
@@ -27,8 +27,8 @@
rem Sets some variables
set LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
set SECURITY_OPTS="-Djava.security.auth.login.config=..\conf\jaas.conf"
-set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=..\gatein\conf"
-set JAVA_OPTS=-Xms128m -Xmx512m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%%
+set EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein\conf"
+set JAVA_OPTS=-Xms128m -Xmx512m -XX:MaxPermSize=256m %LOG_OPTS% %SECURITY_OPTS% %EXO_OPTS%%
rem Launches the server
call catalina.bat %*
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-03-11 19:17:46 UTC (rev 2185)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-03-11 20:04:24 UTC (rev 2186)
@@ -27,9 +27,9 @@
# Sets some variables
LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir=../gatein/conf"
+EXO_OPTS="-Dexo.product.developing=false -Dexo.conf.dir.name=gatein/conf"
-JAVA_OPTS="-Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
+JAVA_OPTS="-Xms128m -Xmx512m -XX:MaxPermSize=256m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
export JAVA_OPTS
# Launches the server
14 years, 9 months
- 1
- 0
gatein SVN: r2185 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-11 14:17:46 -0500 (Thu, 11 Mar 2010)
New Revision: 2185
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
Log:
GTNPORTAL-847: Fix showing "Page Not Found" after creating new page
Remove System.out.println
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-11 18:41:39 UTC (rev 2184)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-11 19:17:46 UTC (rev 2185)
@@ -262,7 +262,6 @@
public synchronized void setSelectedNode(PageNode node)
{
- System.out.println("\n\n\nSetting the selected node : " + node);
selectedNode_ = node;
}
@@ -518,4 +517,4 @@
}
}
-}
\ No newline at end of file
+}
14 years, 9 months
- 1
- 0
gatein SVN: r2184 - in portal/trunk: component/application-registry/src/main/java/org/exoplatform/application/gadget/impl and 14 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-11 13:41:39 -0500 (Thu, 11 Mar 2010)
New Revision: 2184
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java
portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java
portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java
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/RegistrationMapping.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java
Log:
update to Chromattic 1.0.0 Reflext 1.0.0 MOP 1.0.0-GA JCR 1.12.0-GA
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/GadgetDefinition.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -56,6 +56,7 @@
public abstract void setReferenceURL(String referenceURL);
@OneToOne
+ @Owner
@MappedBy("app:data")
public abstract GadgetData getData();
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/gadget/impl/LocalGadgetData.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -55,6 +55,7 @@
public abstract void setFileName(String fileName);
@OneToOne
+ @Owner
@MappedBy("app:resources")
public abstract NTFolder getResources();
Modified: portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java
===================================================================
--- portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMCacheService.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -29,7 +29,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import java.util.LinkedList;
import java.util.List;
Modified: portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java
===================================================================
--- portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -21,7 +21,7 @@
import org.exoplatform.management.data.RestResource;
import org.exoplatform.container.ExoContainerContext;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.management.spi.ManagedResource;
import org.exoplatform.management.spi.ManagementProvider;
import org.exoplatform.portal.config.UserACL;
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/Mapper.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -34,11 +34,7 @@
import org.gatein.mop.api.Attributes;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.api.content.Customization;
-import org.gatein.mop.api.workspace.Navigation;
-import org.gatein.mop.api.workspace.ObjectType;
-import org.gatein.mop.api.workspace.Site;
-import org.gatein.mop.api.workspace.Workspace;
-import org.gatein.mop.api.workspace.WorkspaceObject;
+import org.gatein.mop.api.workspace.*;
import org.gatein.mop.api.workspace.link.Link;
import org.gatein.mop.api.workspace.link.PageLink;
import org.gatein.mop.api.workspace.ui.UIBody;
@@ -282,7 +278,8 @@
Attributes attrs = src.getAttributes();
//
- org.gatein.mop.api.workspace.Page template = src.getRootNavigation().getTemplate();
+ Templatized templarized = src.getRootNavigation().getTemplatized();
+ org.gatein.mop.api.workspace.Page template = templarized.getTemplate();
UIContainer srcLayout = template.getRootComponent();
//
@@ -355,7 +352,15 @@
saveChildren(srcContainer, dstContainer);
//
- dst.getRootNavigation().setTemplate(template);
+ Templatized templatized = dst.getRootNavigation().getTemplatized();
+ if (templatized != null)
+ {
+ templatized.setTemplate(template);
+ }
+ else
+ {
+ template.templatize(dst.getRootNavigation());
+ }
}
public PageData load(org.gatein.mop.api.workspace.Page src)
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -31,7 +31,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.resources.Orientation;
Modified: portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml
===================================================================
--- portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/portal/src/test/java/conf/exo.portal.component.portal-configuration1.xml 2010-03-11 18:41:39 UTC (rev 2184)
@@ -168,6 +168,14 @@
<value>org.gatein.mop.core.api.workspace.GroupSite</value>
<value>org.gatein.mop.core.api.workspace.UserSiteContainer</value>
<value>org.gatein.mop.core.api.workspace.UserSite</value>
+ <value>org.gatein.mop.core.api.workspace.TemplatizedImpl</value>
+ <value>org.gatein.mop.core.api.AttributesImpl</value>
+ <value>org.gatein.mop.core.api.Attribute</value>
+ <value>org.gatein.mop.core.api.PathAttribute</value>
+ <value>org.gatein.mop.core.api.StringAttribute</value>
+ <value>org.gatein.mop.core.api.BooleanAttribute</value>
+ <value>org.gatein.mop.core.api.IntegerAttribute</value>
+ <value>org.gatein.mop.core.api.DateAttribute</value>
<value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value>
<value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value>
<value>org.gatein.mop.core.api.workspace.content.ContextType</value>
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestLoadedPOM.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -216,6 +216,7 @@
// assertEquals("portal#test:/web/BannerPortlet/banner", application1.getInstanceState().getWeakReference());
}
+/*
public void testFindPageByTitle() throws Exception
{
Query<Page> query = new Query<Page>(null, null, null, "TestTitle", Page.class);
@@ -227,6 +228,7 @@
"group::/platform/test/normalized::register"));
assertEquals(expectedIds, ids);
}
+*/
public void testFindNavigation() throws Exception
{
@@ -246,6 +248,7 @@
assertEquals(expectedNames, names);
}
+/*
public void testFindPageByName() throws Exception
{
Query<Page> query = new Query<Page>("portal", "test", null, null, Page.class);
@@ -261,6 +264,7 @@
HashSet<String> expectedNames = new HashSet<String>(Arrays.asList("test1", "test2", "test3", "test4"));
assertEquals(expectedNames, names);
}
+*/
public void testAnonymousPreferencesSavePage() throws Exception
{
Modified: portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java
===================================================================
--- portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/portal/src/test/java/org/exoplatform/portal/config/TestSavedPOM.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -147,7 +147,7 @@
assertEquals("test_prop_value", attrs.getString("prop_key"));
//
- Page layout = portal.getRootNavigation().getTemplate();
+ Page layout = portal.getRootNavigation().getTemplatized().getTemplate();
assertNotNull(layout);
assertSame(portal.getRootPage().getChild("templates").getChild("default"), layout);
}
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -33,7 +33,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.resolver.ResourceResolver;
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.cache.ExoCache;
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -26,7 +26,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import java.util.ArrayList;
import java.util.Collections;
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -23,11 +23,7 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
+import org.chromattic.api.annotations.*;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
import org.gatein.wsrp.consumer.ProducerInfo;
import org.gatein.wsrp.consumer.RegistrationInfo;
@@ -42,10 +38,12 @@
public static final String NODE_NAME = "wsrp:producerinfo";
@OneToOne
+ @Owner
@MappedBy("endpoint")
public abstract EndpointInfoMapping getEndpointInfo();
@OneToOne
+ @Owner
@MappedBy("registration")
public abstract RegistrationInfoMapping getRegistrationInfo();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -23,11 +23,7 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
+import org.chromattic.api.annotations.*;
import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping;
import org.gatein.wsrp.consumer.RegistrationProperty;
import org.gatein.wsrp.registration.RegistrationPropertyDescription;
@@ -52,6 +48,7 @@
public abstract void setValue(String value);
@OneToOne
+ @Owner
@MappedBy("description")
public abstract RegistrationPropertyDescriptionMapping getDescription();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -22,10 +22,7 @@
package org.gatein.portal.wsrp.state.producer.configuration.mapping;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.Property;
+import org.chromattic.api.annotations.*;
import org.gatein.wsrp.producer.config.ProducerConfiguration;
import org.gatein.wsrp.producer.config.ProducerRegistrationRequirements;
import org.gatein.wsrp.producer.config.impl.ProducerConfigurationImpl;
@@ -45,6 +42,7 @@
public abstract void setUsingStrictMode(boolean strict);
@OneToOne
+ @Owner
@MappedBy("registrationrequirements")
public abstract RegistrationRequirementsMapping getRegistrationRequirements();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerGroupMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -23,12 +23,8 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
-import org.chromattic.api.annotations.FindById;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.RelationshipType;
+import org.chromattic.api.annotations.*;
import org.gatein.common.util.ParameterValidation;
import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
import org.gatein.registration.Consumer;
@@ -48,8 +44,8 @@
{
public static final String NODE_NAME = "wsrp:consumergroup";
- @OneToMany
- @RelatedMappedBy("group")
+ @OneToMany(type = RelationshipType.PATH)
+ @MappedBy("group")
public abstract Collection<ConsumerMapping> getConsumers();
@Property(name = "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-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/ConsumerMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -23,16 +23,7 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
import org.chromattic.api.RelationshipType;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.FindById;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.*;
import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
import org.gatein.registration.Consumer;
import org.gatein.registration.ConsumerGroup;
@@ -69,8 +60,8 @@
public abstract void setConsumerAgent(String consumerAgent);
- @OneToMany
- @RelatedMappedBy("consumer")
+ @OneToMany(type = RelationshipType.PATH)
+ @MappedBy("consumer")
public abstract List<RegistrationMapping> getRegistrations();
@Create
@@ -83,6 +74,7 @@
public abstract void setGroup(ConsumerGroupMapping group);
@OneToOne
+ @Owner
@MappedBy("capabilities")
public abstract ConsumerCapabilitiesMapping getCapabilities();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -23,13 +23,8 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
-import org.chromattic.api.annotations.Create;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.ManyToOne;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.Property;
+import org.chromattic.api.RelationshipType;
+import org.chromattic.api.annotations.*;
import org.gatein.common.util.ParameterValidation;
import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
import org.gatein.registration.Registration;
@@ -54,7 +49,7 @@
@Id
public abstract String getPersistentKey();
- @ManyToOne
+ @ManyToOne(type = RelationshipType.PATH)
@MappedBy("consumer")
public abstract ConsumerMapping getConsumer();
@@ -69,6 +64,7 @@
public abstract void setRegistrationHandle(String handle);
@OneToOne
+ @Owner
@MappedBy("properties")
public abstract RegistrationPropertiesMapping getProperties();
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/state/mapping/PortletStateContextMapping.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -23,11 +23,7 @@
package org.gatein.portal.wsrp.state.producer.state.mapping;
-import org.chromattic.api.annotations.Id;
-import org.chromattic.api.annotations.MappedBy;
-import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.OneToOne;
-import org.chromattic.api.annotations.PrimaryType;
+import org.chromattic.api.annotations.*;
import org.gatein.pc.portlet.impl.state.producer.PortletStateContextImpl;
import org.gatein.pc.portlet.state.producer.PortletStateContext;
@@ -47,6 +43,7 @@
public abstract String getPortletId();
@OneToOne
+ @Owner
@MappedBy("state")
public abstract PortletStateMapping getState();
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/pom.xml 2010-03-11 18:41:39 UTC (rev 2184)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.0-CR2</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.0-CR2</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.0-CR2</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.0-CR2</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.0-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.0-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.0-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.0-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch01</org.shindig.version>
<org.gatein.common.version>2.0.0-GA</org.gatein.common.version>
@@ -48,13 +48,13 @@
<org.gatein.pc.version>2.1.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.1.GA</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-GA</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.0-CR03</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.0</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
<org.codehaus.groovy.version>1.6.5</org.codehaus.groovy.version>
<javax.servlet.version>2.5</javax.servlet.version>
- <version.chromattic>1.0.0-cr2</version.chromattic>
- <version.reflect>1.0.0-beta5</version.reflect>
+ <version.chromattic>1.0.0</version.chromattic>
+ <version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>
<!-- ************** -->
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-03-11 18:41:39 UTC (rev 2184)
@@ -32,7 +32,7 @@
<component>
<key>org.exoplatform.services.transaction.TransactionService</key>
- <type>org.exoplatform.services.transaction.jbosscache.ArjunaTransactionService</type>
+ <type>org.exoplatform.services.transaction.jbosscache.JBossTransactionsService</type>
<init-params>
<value-param>
<name>timeout</name>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-11 18:41:39 UTC (rev 2184)
@@ -241,6 +241,14 @@
<value>org.gatein.mop.core.api.workspace.GroupSite</value>
<value>org.gatein.mop.core.api.workspace.UserSiteContainer</value>
<value>org.gatein.mop.core.api.workspace.UserSite</value>
+ <value>org.gatein.mop.core.api.workspace.TemplatizedImpl</value>
+ <value>org.gatein.mop.core.api.AttributesImpl</value>
+ <value>org.gatein.mop.core.api.Attribute</value>
+ <value>org.gatein.mop.core.api.PathAttribute</value>
+ <value>org.gatein.mop.core.api.StringAttribute</value>
+ <value>org.gatein.mop.core.api.BooleanAttribute</value>
+ <value>org.gatein.mop.core.api.IntegerAttribute</value>
+ <value>org.gatein.mop.core.api.DateAttribute</value>
<value>org.gatein.mop.core.api.workspace.content.CustomizationContainer</value>
<value>org.gatein.mop.core.api.workspace.content.ContextTypeContainer</value>
<value>org.gatein.mop.core.api.workspace.content.ContextType</value>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -26,7 +26,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.picocontainer.Startable;
import java.util.ArrayList;
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java 2010-03-11 18:15:54 UTC (rev 2183)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java 2010-03-11 18:41:39 UTC (rev 2184)
@@ -26,7 +26,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
-import org.exoplatform.management.management.annotations.RESTEndpoint;
+import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.picocontainer.Startable;
14 years, 9 months
- 1
- 0
gatein SVN: r2183 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-11 13:15:54 -0500 (Thu, 11 Mar 2010)
New Revision: 2183
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-03-11 18:15:36 UTC (rev 2182)
+++ components/mop/trunk/api/pom.xml 2010-03-11 18:15:54 UTC (rev 2183)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-03-11 18:15:36 UTC (rev 2182)
+++ components/mop/trunk/core/pom.xml 2010-03-11 18:15:54 UTC (rev 2183)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-03-11 18:15:36 UTC (rev 2182)
+++ components/mop/trunk/pom.xml 2010-03-11 18:15:54 UTC (rev 2183)
@@ -34,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-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</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0</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>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-03-11 18:15:36 UTC (rev 2182)
+++ components/mop/trunk/spi/pom.xml 2010-03-11 18:15:54 UTC (rev 2183)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0</version>
+ <version>1.1.0-SNAPSHOT</version>
</parent>
<!-- ****************** -->
14 years, 9 months
- 1
- 0
gatein SVN: r2182 - components/mop/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-11 13:15:36 -0500 (Thu, 11 Mar 2010)
New Revision: 2182
Added:
components/mop/tags/1.0.0/
Log:
[maven-scm] copy for tag 1.0.0
Copied: components/mop/tags/1.0.0 (from rev 2181, components/mop/trunk)
14 years, 9 months
- 1
- 0
gatein SVN: r2181 - in components/mop/trunk: api and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-11 13:15:14 -0500 (Thu, 11 Mar 2010)
New Revision: 2181
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
Modified: components/mop/trunk/api/pom.xml
===================================================================
--- components/mop/trunk/api/pom.xml 2010-03-11 17:19:13 UTC (rev 2180)
+++ components/mop/trunk/api/pom.xml 2010-03-11 18:15:14 UTC (rev 2181)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR04-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-03-11 17:19:13 UTC (rev 2180)
+++ components/mop/trunk/core/pom.xml 2010-03-11 18:15:14 UTC (rev 2181)
@@ -18,17 +18,14 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR04-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<!-- ****************** -->
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-03-11 17:19:13 UTC (rev 2180)
+++ components/mop/trunk/pom.xml 2010-03-11 18:15:14 UTC (rev 2181)
@@ -18,10 +18,7 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project
- xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -37,16 +34,16 @@
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR04-SNAPSHOT</version>
+ <version>1.0.0</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</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/mop/tags/1.0.0</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/mop/tags/1.0.0</url>
</scm>
<dependencyManagement>
Modified: components/mop/trunk/spi/pom.xml
===================================================================
--- components/mop/trunk/spi/pom.xml 2010-03-11 17:19:13 UTC (rev 2180)
+++ components/mop/trunk/spi/pom.xml 2010-03-11 18:15:14 UTC (rev 2181)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.mop</groupId>
<artifactId>mop-parent</artifactId>
- <version>1.0.0-CR04-SNAPSHOT</version>
+ <version>1.0.0</version>
</parent>
<!-- ****************** -->
14 years, 9 months
- 1
- 0
gatein SVN: r2180 - in components/mop/trunk: core and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-11 12:19:13 -0500 (Thu, 11 Mar 2010)
New Revision: 2180
Modified:
components/mop/trunk/core/pom.xml
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.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/PortalSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.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/UserSiteContainer.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.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/WorkspaceObjectImpl.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java
components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.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/WorkspaceSpecialization.java
components/mop/trunk/pom.xml
Log:
update to chromatic 1.0.0
Modified: components/mop/trunk/core/pom.xml
===================================================================
--- components/mop/trunk/core/pom.xml 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/pom.xml 2010-03-11 17:19:13 UTC (rev 2180)
@@ -18,7 +18,10 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -37,10 +40,6 @@
<name>MOP Core</name>
<description>Model Object for Portal Core</description>
- <properties>
- <org.chromattic.version>1.0.0-cr2</org.chromattic.version>
- </properties>
-
<dependencies>
<dependency>
@@ -60,53 +59,35 @@
<dependency>
<groupId>org.chromattic</groupId>
- <version>${org.chromattic.version}</version>
<artifactId>chromattic.api</artifactId>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
- <version>${org.chromattic.version}</version>
<artifactId>chromattic.ext</artifactId>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.apt</artifactId>
- <version>${org.chromattic.version}</version>
<scope>compile</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-common</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.gatein.common</groupId>
- <artifactId>common-logging</artifactId>
- </dependency>
- -->
-
<!-- should remove it, it's because of usage : org.chromattic.common.AbstractFilterIterator -->
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.common</artifactId>
- <version>${org.chromattic.version}</version>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.core</artifactId>
- <version>${org.chromattic.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.chromattic</groupId>
<artifactId>chromattic.exo</artifactId>
- <version>${org.chromattic.version}</version>
<scope>test</scope>
</dependency>
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/PathAttribute.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -22,6 +22,7 @@
import org.chromattic.api.RelationshipType;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
/**
@@ -34,6 +35,7 @@
@ManyToOne(type = RelationshipType.PATH)
@MappedBy("mop:value")
+ @Owner
public abstract Object getValue();
public abstract void setValue(Object value);
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/GroupSiteContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -19,7 +19,7 @@
package org.gatein.mop.core.api.workspace;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -29,7 +29,7 @@
public abstract class GroupSiteContainer extends SiteContainer<GroupSite>
{
- @RelatedMappedBy("mop:groupsites")
+ @MappedBy("mop:groupsites")
public abstract WorkspaceImpl getWorkspace();
}
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -23,7 +23,7 @@
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.chromattic.api.annotations.MappedBy;
import org.gatein.mop.core.api.MOPFormatter;
import java.util.List;
@@ -39,7 +39,7 @@
{
@OneToOne
- @RelatedMappedBy("mop:children")
+ @MappedBy("mop:children")
public abstract NavigationImpl getOwner();
@OneToMany
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/NavigationImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -23,8 +23,9 @@
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.Destroy;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.RelationshipType;
import org.gatein.mop.api.workspace.Navigation;
import org.gatein.mop.api.workspace.link.Link;
@@ -43,11 +44,12 @@
{
@OneToOne
- @RelatedMappedBy("mop:rootnavigation")
+ @MappedBy("mop:rootnavigation")
public abstract SiteImpl getParentSite();
@OneToOne
@MappedBy("mop:children")
+ @Owner
public abstract NavigationContainer getChildrenContainer();
@ManyToOne
@@ -55,6 +57,7 @@
@OneToOne
@MappedBy("mop:link")
+ @Owner
public abstract LinkImpl getLink();
public abstract LinkImpl setLink(LinkImpl target);
@@ -72,6 +75,7 @@
public abstract void destroy();
@OneToOne(type = RelationshipType.EMBEDDED)
+ @Owner
public abstract TemplatizedImpl getTemplatized();
public abstract void setTemplatized(TemplatizedImpl templatized);
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -23,7 +23,7 @@
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.chromattic.api.annotations.MappedBy;
import org.gatein.mop.core.api.MOPFormatter;
import java.util.Map;
@@ -38,7 +38,7 @@
{
@OneToOne
- @RelatedMappedBy("mop:children")
+ @MappedBy("mop:children")
public abstract PageImpl getOwner();
@OneToMany
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -21,9 +21,10 @@
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.ManyToOne;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.RelatedMappedBy;
import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Destroy;
import org.chromattic.api.RelationshipType;
import org.gatein.mop.api.workspace.Page;
@@ -43,36 +44,39 @@
{
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("mop:template")
+ @MappedBy("mop:template")
public abstract Collection<NavigationImpl> getTemplatizedNavigations();
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("mop:template")
+ @MappedBy("mop:template")
public abstract Collection<PageImpl> getTemplatizedPages();
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("mop:template")
+ @MappedBy("mop:template")
public abstract Collection<? extends WorkspaceObject> getTemplatizedObjects();
@OneToOne
@MappedBy("mop:children")
+ @Owner
public abstract PageContainer getChildrenContainer();
@ManyToOne
public abstract PageContainer getParentContainer();
@OneToOne
- @RelatedMappedBy("mop:rootpage")
+ @MappedBy("mop:rootpage")
public abstract SiteImpl getSiteParent();
@OneToOne
@MappedBy("mop:rootcomponent")
+ @Owner
public abstract UIContainerImpl getRootComponent();
@Destroy
public abstract void destroy();
@OneToOne(type = RelationshipType.EMBEDDED)
+ @Owner
public abstract WorkspaceCustomizationContextImpl getCustomizationContext();
// *******************************************************************************************************************
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PageLinkImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -20,6 +20,7 @@
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Property;
import org.chromattic.api.annotations.Path;
@@ -38,6 +39,7 @@
@ManyToOne(type = RelationshipType.PATH)
@MappedBy("mop:page")
+ @Owner
public abstract PageImpl getPage();
public abstract void setPage(PageImpl page);
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/PortalSiteContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -19,7 +19,7 @@
package org.gatein.mop.core.api.workspace;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -29,7 +29,7 @@
public abstract class PortalSiteContainer extends SiteContainer<PortalSite>
{
- @RelatedMappedBy("mop:portalsites")
+ @MappedBy("mop:portalsites")
public abstract WorkspaceImpl getWorkspace();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/SiteImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -24,6 +24,7 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Destroy;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.Site;
import org.gatein.mop.api.workspace.Page;
@@ -41,10 +42,12 @@
@OneToOne
@MappedBy("mop:rootpage")
+ @Owner
public abstract PageImpl getRoot();
@OneToOne
@MappedBy("mop:rootnavigation")
+ @Owner
public abstract NavigationImpl getRootNavigation();
@ManyToOne
@@ -54,6 +57,7 @@
public abstract void destroy();
@OneToOne(type = RelationshipType.EMBEDDED)
+ @Owner
public abstract WorkspaceCustomizationContextImpl getCustomizationContext();
public abstract ObjectType<? extends Site> getObjectType();
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/TemplatizedImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -22,6 +22,7 @@
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.MixinType;
import org.chromattic.api.annotations.OneToOne;
+import org.chromattic.api.annotations.Owner;
import org.gatein.mop.api.Scope;
import org.gatein.mop.api.workspace.Page;
import org.gatein.mop.api.workspace.Templatized;
@@ -37,6 +38,7 @@
@OneToOne
@MappedBy("mop:template")
+ @Owner
public abstract PathAttribute getRelatedTemplate();
public void setTemplate(Page template)
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UIWindowImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -21,6 +21,7 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.ui.UIWindow;
import org.gatein.mop.api.workspace.ObjectType;
@@ -49,6 +50,7 @@
@OneToOne
@MappedBy("mop:customization")
+ @Owner
public abstract WorkspaceCustomization getCustomization();
public abstract void setCustomization(WorkspaceCustomization customization);
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/UserSiteContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -19,7 +19,7 @@
package org.gatein.mop.core.api.workspace;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -29,7 +29,7 @@
public abstract class UserSiteContainer extends SiteContainer<UserSite>
{
- @RelatedMappedBy("mop:usersites")
+ @MappedBy("mop:usersites")
public abstract WorkspaceImpl getWorkspace();
}
\ No newline at end of file
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceCustomizationContextImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -22,6 +22,7 @@
import org.chromattic.api.RelationshipType;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.OneToOne;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.api.content.Customization;
@@ -36,11 +37,14 @@
@PrimaryType(name = "mop:customizationcontext")
public abstract class WorkspaceCustomizationContextImpl implements WorkspaceCustomizationContext {
+ // THIS IS A BUG IT SHOULD NOT BE HERE
+ @Owner
@OneToOne(type = RelationshipType.EMBEDDED)
public abstract WorkspaceObjectImpl getOwner();
@OneToOne
@MappedBy("mop:customizations")
+ @Owner
public abstract CustomizationContainer getCustomizations();
public String getContextType()
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -22,6 +22,7 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.FindById;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.workspace.Workspace;
import org.gatein.mop.api.workspace.Site;
@@ -50,17 +51,21 @@
@OneToOne
@MappedBy("mop:portalsites")
+ @Owner
public abstract PortalSiteContainer getPortalSites();
@OneToOne
@MappedBy("mop:groupsites")
+ @Owner
public abstract GroupSiteContainer getGroupSites();
@OneToOne
@MappedBy("mop:usersites")
+ @Owner
public abstract UserSiteContainer getUserSites();
@OneToOne(type = RelationshipType.EMBEDDED)
+ @Owner
public abstract WorkspaceCustomizationContextImpl getCustomizationContext();
// CustomizationContextResolver implementation ***********************************************************************
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/WorkspaceObjectImpl.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -48,6 +48,7 @@
@OneToOne
@MappedBy("mop:attributes")
+ @Owner
public abstract AttributesImpl getAttributes();
public <A> A adapt(Class<A> adaptedType)
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomization.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -19,6 +19,7 @@
package org.gatein.mop.core.api.workspace.content;
import org.chromattic.api.annotations.FormattedBy;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
import org.gatein.mop.api.content.Customization;
import org.gatein.mop.api.content.CustomizationContext;
@@ -76,6 +77,7 @@
@OneToOne
@MappedBy("mop:contexttypes")
+ @Owner
abstract ContextTypeContainer getContextTypes();
@Create
@@ -86,6 +88,7 @@
@OneToOne
@MappedBy("mop:state")
+ @Owner
public abstract AbstractCustomizationState getCustomizationState();
public abstract void setCustomizationState(AbstractCustomizationState customizationState);
Modified: components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.java
===================================================================
--- components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.java 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/AbstractCustomizationState.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -21,7 +21,7 @@
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.PrimaryType;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -31,7 +31,7 @@
public abstract class AbstractCustomizationState {
@OneToOne
- @RelatedMappedBy("mop:state")
+ @MappedBy("mop:state")
public abstract AbstractCustomization getCustomization();
}
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/ContextTypeContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -36,7 +36,7 @@
public abstract Map<String, ContextType> getContextTypes();
@OneToOne
- @RelatedMappedBy("mop:contexttypes")
+ @MappedBy("mop:contexttypes")
public abstract AbstractCustomization getCustomization();
}
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/CustomizationContainer.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -26,7 +26,7 @@
import org.chromattic.api.annotations.Create;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.OneToMany;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
import org.gatein.mop.core.api.MOPFormatter;
import org.gatein.mop.core.api.workspace.WorkspaceCustomizationContextImpl;
@@ -42,7 +42,7 @@
{
@OneToOne
- @RelatedMappedBy("mop:customizations")
+ @MappedBy("mop:customizations")
public abstract WorkspaceCustomizationContextImpl 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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceClone.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -20,7 +20,7 @@
import org.chromattic.api.annotations.PrimaryType;
import org.chromattic.api.annotations.Name;
-import org.chromattic.api.annotations.RelatedMappedBy;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.RelationshipType;
import org.gatein.mop.api.content.CustomizationContext;
@@ -48,7 +48,7 @@
public abstract String getFooName();
@OneToMany(type = RelationshipType.PATH)
- @RelatedMappedBy("mop:customization")
+ @MappedBy("mop:customization")
public abstract Collection<WorkspaceSpecialization> getSpecializations();
//
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-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/core/src/main/java/org/gatein/mop/core/api/workspace/content/WorkspaceSpecialization.java 2010-03-11 17:19:13 UTC (rev 2180)
@@ -21,6 +21,7 @@
import org.chromattic.api.annotations.ManyToOne;
import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.RelationshipType;
+import org.chromattic.api.annotations.Owner;
import org.chromattic.api.annotations.PrimaryType;
/**
@@ -33,6 +34,7 @@
@ManyToOne(type = RelationshipType.PATH)
@MappedBy("mop:customization")
+ @Owner
public abstract WorkspaceCustomization getCustomization();
public abstract void setCustomization(WorkspaceCustomization customization);
Modified: components/mop/trunk/pom.xml
===================================================================
--- components/mop/trunk/pom.xml 2010-03-11 16:56:37 UTC (rev 2179)
+++ components/mop/trunk/pom.xml 2010-03-11 17:19:13 UTC (rev 2180)
@@ -18,7 +18,10 @@
02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project
+ xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -45,7 +48,6 @@
<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>
-
<dependencyManagement>
<dependencies>
@@ -58,6 +60,43 @@
<scope>import</scope>
</dependency>
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <version>${org.chromattic.version}</version>
+ <artifactId>chromattic.api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <version>${org.chromattic.version}</version>
+ <artifactId>chromattic.ext</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.apt</artifactId>
+ <version>${org.chromattic.version}</version>
+ </dependency>
+
+ <!-- should remove it, it's because of usage : org.chromattic.common.AbstractFilterIterator -->
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.common</artifactId>
+ <version>${org.chromattic.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.core</artifactId>
+ <version>${org.chromattic.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.chromattic</groupId>
+ <artifactId>chromattic.exo</artifactId>
+ <version>${org.chromattic.version}</version>
+ </dependency>
+
<!-- Internal dependencies -->
<!--
<dependency>
@@ -104,6 +143,8 @@
<!-- maven-enforcer-plugin -->
<jdk.min.version>1.6</jdk.min.version>
+ <org.chromattic.version>1.0.0</org.chromattic.version>
+
</properties>
<!-- **************** -->
14 years, 9 months
- 1
- 0
gatein SVN: r2179 - portal/trunk/docs/reference-guide/en.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-11 11:56:37 -0500 (Thu, 11 Mar 2010)
New Revision: 2179
Modified:
portal/trunk/docs/reference-guide/en/master.xml
Log:
Removed empty chapter
Modified: portal/trunk/docs/reference-guide/en/master.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/master.xml 2010-03-11 16:47:44 UTC (rev 2178)
+++ portal/trunk/docs/reference-guide/en/master.xml 2010-03-11 16:56:37 UTC (rev 2179)
@@ -55,9 +55,9 @@
-->
<!-- 6_Integration -->
-
+<!--
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Integration.xml"/>
-
+-->
<!-- 7_SSO -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/SSO.xml"/>
14 years, 9 months
- 1
- 0
gatein SVN: r2178 - components/sso/trunk.
by do-not-reply＠jboss.org
Author: aheritier
Date: 2010-03-11 11:47:44 -0500 (Thu, 11 Mar 2010)
New Revision: 2178
Modified:
components/sso/trunk/pom.xml
Log:
Standardize names to follow others GateIn modules naming
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2010-03-11 16:37:57 UTC (rev 2177)
+++ components/sso/trunk/pom.xml 2010-03-11 16:47:44 UTC (rev 2178)
@@ -20,7 +20,7 @@
</parent>
- <name>GateIn SSO</name>
+ <name>Gatein - Single Sign On Integration</name>
<description>GateIn Single Sign On Integration</description>
14 years, 9 months
- 1
- 0
gatein SVN: r2177 - in portal/trunk: webui/portal/src/main/java/org/exoplatform/portal/application and 4 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2010-03-11 11:37:57 -0500 (Thu, 11 Mar 2010)
New Revision: 2177
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPagePreview.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
Log:
GTNPORTAL-847 Fix showing "Page Not Found" after creating new page
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -333,7 +333,10 @@
/**
* This method should update the PortalConfig object
- *
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#save(PortalConfig)}
+ *
* @param portal
* @throws Exception
*/
@@ -382,6 +385,10 @@
/**
* Removes a page and broadcast an event labelled as {@link org.exoplatform.portal.config.UserPortalConfigService#PAGE_REMOVED}
* when the removal is successful.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#remove(Page)}
+
*
* @param page the page to remove
* @throws Exception any exception
@@ -395,6 +402,9 @@
/**
* Creates a page and broadcast an event labelled as {@link org.exoplatform.portal.config.UserPortalConfigService#CREATE_PAGE_EVENT}
* when the creation is successful.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#create(Page)}
*
* @param page the page to create
* @throws Exception any exception
@@ -408,6 +418,10 @@
/**
* Updates a page and broadcast an event labelled as {@link org.exoplatform.portal.config.UserPortalConfigService#PAGE_UPDATED}
* when the creation is successful.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#save(Page)}
+
*
* @param page the page to update
* @return the list of model changes that occured
@@ -423,6 +437,9 @@
/**
* Creates a navigation and broadcast an event labelled as {@link org.exoplatform.portal.config.UserPortalConfigService#CREATE_NAVIGATION_EVENT}
* when the creation is successful.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#create(PageNavigation)}
*
* @param navigation the navigation to create
* @throws Exception any exception
@@ -436,6 +453,9 @@
/**
* Updates a page navigation broadcast an event labelled as {@link org.exoplatform.portal.config.UserPortalConfigService#NAVIGATION_UPDATED}
* when the creation is successful.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#save(PageNavigation)}
*
* @param navigation the navigation to update
* @throws Exception any exception
@@ -449,6 +469,9 @@
/**
* Removes a navigation and broadcast an event labelled as {@link org.exoplatform.portal.config.UserPortalConfigService#NAVIGATION_REMOVED}
* when the removal is successful.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#remove(PageNavigation)}
*
* @param navigation the navigation to remove
* @throws Exception any exception
@@ -459,6 +482,15 @@
storage_.remove(navigation);
}
+ /**
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#getPageNavigation(String, String)}
+ *
+ * @param ownerType
+ * @param id
+ * @return
+ * @throws Exception
+ */
@Deprecated
public PageNavigation getPageNavigation(String ownerType, String id) throws Exception
{
@@ -494,6 +526,9 @@
/**
* Clones a page.
+ *
+ * @deprecated This method is not useful anymore. The preferred way to do this is
+ * using directly {@link org.exoplatform.portal.config.DataStorage#clonePage(String, String, String, String)}
*
* @param pageId the id of the page to clone
* @param pageName the new page name
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalRequestContext.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.application;
+import com.sun.syndication.feed.atom.Link;
+
import org.exoplatform.Constants;
import org.exoplatform.commons.utils.PortalPrinter;
import org.exoplatform.commons.utils.WriterPrinter;
@@ -364,11 +366,26 @@
return response_;
}
+ /**
+ *
+ * @see org.exoplatform.web.application.RequestContext#getFullRender()
+ */
final public boolean getFullRender()
{
return forceFullUpdate;
}
+ /**
+ * Sets a boolean value to force whether portal will be fully rendered
+ * and it is only effective to an Ajax request.<p/>
+ *
+ * if the value is set to <code>true</code>, it means :<br/>
+ *
+ * 1) Only portal ui components are rendered <br/>
+ * 2) Portlets will be fully rendered if are inner of the portal ui components being updated
+ *
+ * @param forceFullUpdate
+ */
final public void setFullRender(boolean forceFullUpdate)
{
this.forceFullUpdate = forceFullUpdate;
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPageNodeSelector.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -65,7 +65,7 @@
loadNavigations();
}
- public void loadNavigations() throws Exception
+ private void loadNavigations() throws Exception
{
PageNavigation portalSelectedNav = Util.getUIPortal().getSelectedNavigation();
if (portalSelectedNav != null)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UIPortalNavigation.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -237,16 +237,7 @@
uiNavigation.selectedParent_ = selectNav;
else
uiNavigation.selectedParent_ = PageNavigationUtils.searchPageNodeByUri(selectNav, parentUri);
- // UIPageBody uiPageBody =
- // uiPortal.findFirstComponentOfType(UIPageBody.class);
- // if(uiPageBody != null) {
- // if(uiPageBody.getMaximizedUIComponent() != null) {
- // UIPortlet currentPortlet = (UIPortlet)
- // uiPageBody.getMaximizedUIComponent();
- // currentPortlet.setCurrentWindowState(WindowState.NORMAL);
- // uiPageBody.setMaximizedUIComponent(null);
- // }
- // }
+
PageNodeEvent<UIPortal> pnevent;
pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -161,7 +161,7 @@
newUIPortal.setSelectedNode(targetPageNode);
newUIPortal.setSelectedPath(targetedPathNodes);
uiPortalApp.setShowedUIPortal(newUIPortal);
- uiPortalApp.addCachedUIPortal(newUIPortal);
+ uiPortalApp.putCachedUIPortal(newUIPortal);
newUIPortal.refreshUIPage();
return;
}
@@ -260,7 +260,7 @@
* @param pathNodes
* @return
*/
- private static PageNode getTargetedNode(PageNavigation targetedNav, String[] pathNodes)
+ private PageNode getTargetedNode(PageNavigation targetedNav, String[] pathNodes)
{
//Case users browses to a URL of the form */portal/public/classic
if(pathNodes.length == 0)
@@ -302,7 +302,7 @@
* @param nav
* @return
*/
- private static PageNode getDefaultNode(PageNavigation nav)
+ private PageNode getDefaultNode(PageNavigation nav)
{
PageNode defaultNode;
try
@@ -323,7 +323,7 @@
}
}
- private static List<PageNode> findPath(PageNavigation nav, String[] pathNodes)
+ private List<PageNode> findPath(PageNavigation nav, String[] pathNodes)
{
List<PageNode> nodes = new ArrayList<PageNode>(4);
@@ -355,7 +355,7 @@
return nodes;
}
- private static UIPortal buildUIPortal(PageNavigation newPageNav, UIPortalApplication uiPortalApp, UserPortalConfig userPortalConfig) throws Exception
+ private UIPortal buildUIPortal(PageNavigation newPageNav, UIPortalApplication uiPortalApp, UserPortalConfig userPortalConfig) throws Exception
{
DataStorage storage = uiPortalApp.getApplicationComponent(DataStorage.class);
if(storage == null){
@@ -374,7 +374,7 @@
return uiPortal;
}
- private static void redirectToNotFoundNode(UIPortal uiPortal) throws Exception
+ private void redirectToNotFoundNode(UIPortal uiPortal) throws Exception
{
PageNodeEvent<UIPortal> changePageNodeEvent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, "/notfound");
uiPortal.broadcast(changePageNodeEvent, Event.Phase.PROCESS);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -83,24 +83,10 @@
private void saveData() throws Exception
{
- DataStorage dataService = getApplicationComponent(DataStorage.class);
UIPagePreview uiPagePreview = getChild(UIPagePreview.class);
UIPage uiPage = (UIPage)uiPagePreview.getUIComponent();
UIPortal uiPortal = Util.getUIPortal();
- /*if (PortalConfig.PORTAL_TYPE.equals(uiPage.getOwnerType()))
- {
- uiPage.setAccessPermissions(uiPortal.getAccessPermissions());
- uiPage.setEditPermission(uiPortal.getEditPermission());
- }
- else if (PortalConfig.GROUP_TYPE.equals(uiPage.getOwnerType()))
- {
- UserACL acl = getApplicationComponent(UserACL.class);
- String ownerId = uiPage.getOwnerId();
- ownerId = ownerId.startsWith("/") ? ownerId : "/" + ownerId;
- uiPage.setAccessPermissions(new String[]{"*:" + ownerId});
- uiPage.setEditPermission(acl.getMakableMT() + ":" + ownerId);
- }
- */
+
UIWizardPageSetInfo uiPageInfo = getChild(UIWizardPageSetInfo.class);
UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class);
PageNode selectedNode = uiNodeSelector.getSelectedPageNode();
@@ -127,11 +113,11 @@
}
uiNodeSelector.selectPageNodeByUri(pageNode.getUri());
+ DataStorage dataService = getApplicationComponent(DataStorage.class);
dataService.create(page);
dataService.save(pageNav);
setNavigation(uiPortal.getNavigations(), uiNodeSelector.getSelectedNavigation());
- String uri = pageNav.getId() + "::" + pageNode.getUri();
- PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, uri);
+ PageNodeEvent<UIPortal> pnevent = new PageNodeEvent<UIPortal>(uiPortal, PageNodeEvent.CHANGE_PAGE_NODE, pageNode.getUri());
uiPortal.broadcast(pnevent, Event.Phase.PROCESS);
}
@@ -147,7 +133,14 @@
}
}
- public boolean isSelectedNodeExist() throws Exception
+ /**
+ * Returns <code>true</code> if the creating node is existing already.
+ * Otherwise it returns <code>false</code>
+ *
+ * @return true if the creating node is existing, otherwise it's false
+ * @throws Exception
+ */
+ private boolean isSelectedNodeExist() throws Exception
{
UIWizardPageSetInfo uiPageSetInfo = getChild(UIWizardPageSetInfo.class);
PageNavigation navigation = uiPageSetInfo.getChild(UIPageNodeSelector.class).getSelectedNavigation();
@@ -181,7 +174,6 @@
public void execute(Event<UIPageWizard> event) throws Exception
{
UIPageWizard uiWizard = event.getSource();
- uiWizard.setDescriptionWizard(FIRST_STEP);
uiWizard.updateWizardComponent();
uiWizard.viewStep(FIRST_STEP);
@@ -207,7 +199,6 @@
if (uiWizard.getSelectedStep() < SECONDE_STEP)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.StepByStep", null));
- uiWizard.setDescriptionWizard(FIRST_STEP);
uiWizard.viewStep(FIRST_STEP);
uiWizard.updateWizardComponent();
return;
@@ -223,7 +214,6 @@
UIWizardPageSetInfo uiPageSetInfo = uiWizard.getChild(UIWizardPageSetInfo.class);
UIPageNodeSelector uiNodeSelector = uiPageSetInfo.getChild(UIPageNodeSelector.class);
- uiWizard.setDescriptionWizard(SECONDE_STEP);
uiWizard.updateWizardComponent();
PageNavigation navigation = uiNodeSelector.getSelectedNavigation();
if (navigation == null)
@@ -284,7 +274,6 @@
if (uiWizard.isSelectedNodeExist())
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null));
- uiWizard.setDescriptionWizard(FIRST_STEP);
uiWizard.viewStep(FIRST_STEP);
uiWizard.updateWizardComponent();
return;
@@ -294,7 +283,6 @@
if (uiWizard.getSelectedStep() < THIRD_STEP)
{
uiWizard.setShowActions(true);
- uiWizard.setDescriptionWizard(uiWizard.getSelectedStep());
uiWizard.updateWizardComponent();
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.StepByStep", null));
return;
@@ -318,7 +306,6 @@
if (storage.getPage(pageId) != null)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null));
- uiWizard.setDescriptionWizard(FIRST_STEP);
uiWizard.viewStep(FIRST_STEP);
uiWizard.updateWizardComponent();
}
@@ -376,14 +363,12 @@
if (uiWizard.isSelectedNodeExist())
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageCreationWizard.msg.NameNotSame", null));
- uiWizard.setDescriptionWizard(FIRST_STEP);
uiWizard.viewStep(FIRST_STEP);
uiWizard.updateWizardComponent();
return;
}
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
uiWorkingWS.setRenderedChild(UIPortalApplication.UI_VIEWING_WS_ID);
- Util.getPortalRequestContext().setFullRender(true);
uiWizard.saveData();
UIPortalToolPanel toolPanel = uiWorkingWS.findFirstComponentOfType(UIPortalToolPanel.class);
toolPanel.setUIComponent(null);
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPagePreview.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPagePreview.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPagePreview.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -37,22 +37,6 @@
)})
public class UIPagePreview extends UIComponentDecorator
{
- // private UIComponent uiBackComponent ;
- //
- // public UIComponent getBackComponent() { return uiBackComponent ; }
- // public void setBackComponent(UIComponent uiComp) { uiBackComponent = uiComp ; }
- //
- // public boolean hasBackEvent(){ return uiBackComponent != null; }
-
- // static public class BackActionListener extends EventListener<UIPagePreview> {
- // public void execute(Event<UIPagePreview> event) throws Exception {
- // UIPagePreview uiPreview = event.getSource() ;
- // UIPortalToolPanel uiToolPanel = Util.getUIPortalToolPanel();
- // UIComponent uiComp = uiPreview.getBackComponent() ;
- // uiToolPanel.setUIComponent(uiComp) ;
- // event.getRequestContext().addUIComponentToUpdateByAjax(uiToolPanel) ;
- // }
- // }
public boolean isPageHasApplication()
{
if (uicomponent_ == null)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageWizard.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -114,50 +114,6 @@
pcontext.setFullRender(true);
}
- // TODO: Need to place UIPageCreateDescription component in other component
-
- public void setDescriptionWizard() throws Exception
- {
- // UIPortalApplication uiPortalApp =
- // getAncestorOfType(UIPortalApplication.class);
- // UIExoStart uiExoStart =
- // uiPortalApp.findFirstComponentOfType(UIExoStart.class);
- // uiExoStart.setUIControlWSWorkingComponent(UIPageCreateDescription.class);
- // UIPageCreateDescription uiPageDescription =
- // uiExoStart.getUIControlWSWorkingComponent();
- // if (this.getClass() == UIPageEditWizard.class) {
- // uiPageDescription.setTitleKey("UIPageCreateDescription.title.edit");
- // uiPageDescription.addChild(UIDescription.class, null, "pageEditWizard");
- // return;
- // }
- // uiPageDescription.setTitleKey("UIPageCreateDescription.title.create");
- // uiPageDescription.addChild(UIDescription.class, null, "pageWizard");
- }
-
- // TODO: Need to place UIPageCreateDescription component in other component
-
- public void setDescriptionWizard(int step) throws Exception
- {
- // UIPortalApplication uiPortalApp =
- // getAncestorOfType(UIPortalApplication.class);
- // UIExoStart uiExoStart =
- // uiPortalApp.findFirstComponentOfType(UIExoStart.class);
- // uiExoStart.setUIControlWSWorkingComponent(UIPageCreateDescription.class);
- // UIPageCreateDescription uiPageDescription =
- // uiExoStart.getUIControlWSWorkingComponent();
- //
- // if (this.getClass() == UIPageEditWizard.class) {
- // uiPageDescription.setTitleKey("UIPageCreateDescription.title.edit");
- // uiPageDescription.addChild(UIDescription.class, null, "pageEditWizard"
- // + Integer.toString(step));
- // return;
- // }
- //
- // uiPageDescription.setTitleKey("UIPageCreateDescription.title.create");
- // uiPageDescription.addChild(UIDescription.class, null, "pageWizard" +
- // Integer.toString(step));
- }
-
static public class AbortActionListener extends EventListener<UIPageWizard>
{
public void execute(Event<UIPageWizard> event) throws Exception
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortal.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -262,6 +262,7 @@
public synchronized void setSelectedNode(PageNode node)
{
+ System.out.println("\n\n\nSetting the selected node : " + node);
selectedNode_ = node;
}
@@ -300,34 +301,6 @@
{
selectedPath = nodes;
}
-
- /*
- public PageNavigation getSelectedNavigation() throws Exception
- {
- if (selectedNavigation_ != null && selectedNavigation_.getNodes() != null
- && selectedNavigation_.getNodes().size() > 0)
- {
- return selectedNavigation_;
- }
- if (getNavigations().size() < 1)
- return null;
- // TODO dang.tung: get right selectedNavigation
- // -------------------------------------------
- List<PageNavigation> navs = getNavigations();
- PageNavigation pNav = navs.get(0);
- for (PageNavigation nav : navs)
- {
- if (nav.getNodes() != null && nav.getNodes().size() > 0)
- {
- pNav = nav;
- break;
- }
- }
- // -------------------------------------------
- setSelectedNavigation(pNav);
- return pNav;
- }
- */
public PageNavigation getSelectedNavigation() throws Exception
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -157,6 +157,11 @@
isShowControl = state;
}
+ /**
+ * Return true if the edition is in the page creation wizard
+ *
+ * @return
+ */
private boolean isUsedInWizard()
{
UIWorkingWorkspace uiWorkingWS = getAncestorOfType(UIWorkingWorkspace.class);
@@ -465,7 +470,7 @@
PortalDataMapper.toUIPortal(uiPortal, uiPortalApp.getUserPortalConfig());
//Update the cache of UIPortal from UIPortalApplication
- uiPortalApp.updateCachedUIPortal(uiPortal);
+ uiPortalApp.putCachedUIPortal(uiPortal);
uiPortalApp.setShowedUIPortal(uiPortal);
//To init the UIPage, that fixed a bug on AdminToolbarPortlet when edit the layout. Here is only a
@@ -643,6 +648,12 @@
}
}
+ /**
+ * This action listener is for the page edition
+ *
+ * @author <a href="trong.tran(a)exoplatform.com">Trong Tran</a>
+ * @version $Revision$
+ */
static public class Finish2ActionListener extends EventListener<UIPortalComposer>
{
public void execute(Event<UIPortalComposer> event) throws Exception
@@ -659,6 +670,10 @@
UserPortalConfigService portalConfigService =
uiWorkingWS.getApplicationComponent(UserPortalConfigService.class);
+
+ /*
+ * if it is a edition of the current page
+ */
if (page.getStorageId() != null && portalConfigService.getPage(pageId) == null)
{
uiPortalApp.addMessage(new ApplicationMessage("UIPageBrowser.msg.PageNotExist", new String[]{pageId}, 1));
@@ -675,6 +690,8 @@
}
UIPortalComposer composer = uiWorkingWS.findFirstComponentOfType(UIPortalComposer.class).setRendered(false);
composer.setEditted(false);
+
+ // If it is a page creation wizard
if (composer.isUsedInWizard())
{
UIWizard wizard = (UIWizard)uiToolPanel.getUIComponent();
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-03-11 15:56:20 UTC (rev 2176)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/workspace/UIPortalApplication.java 2010-03-11 16:37:57 UTC (rev 2177)
@@ -119,14 +119,15 @@
/**
* The constructor of this class is used to build the tree of UI components
- * that will be aggregated in the portal page. 1) The component is stored in
- * the current PortalRequestContext ThreadLocal 2) The configuration for the
- * portal associated with the current user request is extracted from the
- * PortalRequestContext 3) Then according to the context path, either a
- * public or private portal is initiated. Usually a public portal does not
- * contain the left column and only the private one has it. 4) The skin to
- * use is setup 5) Finally, the current component is associated with the
- * current portal owner
+ * that will be aggregated in the portal page.<br/>
+ * 1) The component is stored in the current PortalRequestContext ThreadLocal<br/>
+ * 2) The configuration for the portal associated with the current user request
+ * is extracted from the PortalRequestContext<br/>
+ * 3) Then according to the context path, either a public or private portal is initiated.
+ * Usually a public portal does not contain the left column and only the private one has it.<br/>
+ * 4) The skin to use is setup <br/>
+ * 5) Finally, the current component is associated with the
+ * current portal owner
*
* @throws Exception
*/
@@ -178,7 +179,8 @@
// -------------------------------------------------------------------------------
context.setUIApplication(this);
- setupUIPortalCache();
+ this.all_UIPortals = new HashMap<UIPortalKey, UIPortal>(5);
+
addWorkingWorkspace();
String currentSkin = userPortalConfig_.getPortalConfig().getSkin();
@@ -191,6 +193,11 @@
localizeNavigations();
}
+ /**
+ * Sets the specified portal to be showed in the normal mode currently
+ *
+ * @param uiPortal
+ */
public void setShowedUIPortal(UIPortal uiPortal)
{
this.showedUIPortal = uiPortal;
@@ -203,11 +210,23 @@
}
}
+ /**
+ * Returns current UIPortal which being showed in normal mode
+ *
+ * @return
+ */
public UIPortal getShowedUIPortal()
{
return showedUIPortal;
}
+ /**
+ * Returns a cached UIPortal matching to OwnerType and OwnerId if any
+ *
+ * @param ownerType
+ * @param ownerId
+ * @return
+ */
public UIPortal getCachedUIPortal(String ownerType, String ownerId)
{
if(ownerType == null || ownerId == null)
@@ -217,7 +236,12 @@
return this.all_UIPortals.get(new UIPortalKey(ownerType, ownerId));
}
- public void addCachedUIPortal(UIPortal uiPortal)
+ /**
+ * Associates the specified UIPortal to a cache map with specified key which bases on OwnerType and OwnerId
+ *
+ * @param uiPortal
+ */
+ public void putCachedUIPortal(UIPortal uiPortal)
{
String ownerType = uiPortal.getOwnerType();
String ownerId = uiPortal.getOwner();
@@ -228,6 +252,12 @@
}
}
+ /**
+ * Remove the UIPortal from the cache map
+ *
+ * @param ownerType
+ * @param ownerId
+ */
public void removeCachedUIPortal(String ownerType, String ownerId)
{
if(ownerType == null || ownerId == null)
@@ -237,19 +267,6 @@
this.all_UIPortals.remove(new UIPortalKey(ownerType, ownerId));
}
- /** Update the UIPortal in the cache **/
- public void updateCachedUIPortal(UIPortal uiPortal)
- {
- String ownerType = uiPortal.getOwnerType();
- String ownerId = uiPortal.getOwner();
-
- if(ownerType != null && ownerId != null)
- {
- this.all_UIPortals.put(new UIPortalKey(ownerType, ownerId), uiPortal);
- }
- }
-
-
public boolean isSessionOpen()
{
return isSessionOpen;
@@ -438,21 +455,6 @@
}
}
- private void setupUIPortalCache()
- {
- this.all_UIPortals = new HashMap<UIPortalKey, UIPortal>(5);
- }
-
- private void setupSkin()
- {
-
- }
-
- private void setupLocale()
- {
-
- }
-
/**
* The central area is called the WorkingWorkspace. It is composed of: 1) A
* UIPortal child which is filled with portal data using the PortalDataMapper
@@ -472,7 +474,7 @@
UIPortal uiPortal = createUIComponent(UIPortal.class, null, null);
PortalDataMapper.toUIPortal(uiPortal, userPortalConfig_);
- this.addCachedUIPortal(uiPortal);
+ this.putCachedUIPortal(uiPortal);
this.showedUIPortal = uiPortal;
uiWorkingWorkspace.addChild(UIEditInlineWorkspace.class, null, UI_EDITTING_WS_ID).setRendered(false);
@@ -734,13 +736,10 @@
private String ownerId;
- private final int hashCode;
-
UIPortalKey(String _ownerType, String _ownerId)
{
this.ownerType = _ownerType;
this.ownerId = _ownerId;
- this.hashCode = this.ownerType.hashCode() * 2 + this.ownerId.hashCode();
}
@Override
@@ -760,7 +759,7 @@
@Override
public int hashCode()
{
- return this.hashCode;
+ return this.ownerType.hashCode() * 2 + this.ownerId.hashCode();
}
@Override
14 years, 9 months
- 1
- 0