gatein SVN: r2226 - in portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component: UIPortalNavigationPortlet and 1 other directory.
by do-not-reply＠jboss.org
Author: wesleyhales
Date: 2010-03-12 12:39:12 -0500 (Fri, 12 Mar 2010)
New Revision: 2226
Modified:
portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultStylesheet.css
Log:
GTNPORTAL-299, GTNPORTAL-697 set navigation menu drop down to z-index of 1. Any portlet markup shoud use negative numbers for ordering in that space.
Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-03-12 15:39:24 UTC (rev 2225)
+++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UINavigationPortlet/DefaultStylesheet.css 2010-03-12 17:39:12 UTC (rev 2226)
@@ -1,23 +1,23 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+/**
* Created by The eXo Platform SARL
* Modifier : Nguyen Ngoc Thuy
* April 23, 2007
@@ -208,6 +208,7 @@
border: solid #b7b7b7 1px; /*fix for IE*/
text-align: left; /* orientation=lt */
text-align: right; /* orientation=rt */
+ z-index: 1;
}
.UINavigationPortlet .MenuItemContainer .MenuItemDecorator {
@@ -286,7 +287,7 @@
.UINavigationPortlet .ScrollLeftButton {
cursor: pointer;
background: url('DefaultSkin/background/Button.gif') no-repeat left -15px; /* orientation=lt */
- background: url('DefaultSkin/background/Button-rt.gif') no-repeat right -15px; /* orientation=rt */
+ background: url('DefaultSkin/background/Button-rt.gif') no-repeat right -15px; /* orientation=rt */
width: 10px;
height: 15px;
padding-left: 12px; /* orientation=lt */
@@ -305,7 +306,7 @@
.UINavigationPortlet .DisableScrollLeftButton {
cursor: pointer;
background: url('DefaultSkin/background/Button.gif') no-repeat left -30px; /* orientation=lt */
- background: url('DefaultSkin/background/Button-rt.gif') no-repeat right -30px; /* orientation=rt */
+ background: url('DefaultSkin/background/Button-rt.gif') no-repeat right -30px; /* orientation=rt */
width: 10px;
height: 15px;
padding-left: 12px; /* orientation=lt */
@@ -324,7 +325,7 @@
.UINavigationPortlet .HighlightScrollLeftButton {
cursor: pointer;
background: url('DefaultSkin/background/Button.gif') no-repeat left top; /* orientation=lt */
- background: url('DefaultSkin/background/Button-rt.gif') no-repeat right top; /* orientation=rt */
+ background: url('DefaultSkin/background/Button-rt.gif') no-repeat right top; /* orientation=rt */
width: 10px;
height: 15px;
padding-left: 12px; /* orientation=lt */
Modified: portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultStylesheet.css
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultStylesheet.css 2010-03-12 15:39:24 UTC (rev 2225)
+++ portal/trunk/portlet/web/src/main/webapp/skin/portal/webui/component/UIPortalNavigationPortlet/DefaultStylesheet.css 2010-03-12 17:39:12 UTC (rev 2226)
@@ -1,22 +1,22 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
.UIPortalNavigationPortlet {
!position: relative;
}
@@ -57,6 +57,7 @@
background: #f3f3f3;
text-align: left; /* orientation=lt */
text-align: right; /* orientation=rt */
+ z-index: 1;
}
.UIPortalNavigationPortlet .MenuItemContainer .MenuItemDecorator {
14 years, 9 months
gatein SVN: r2225 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-12 10:39:24 -0500 (Fri, 12 Mar 2010)
New Revision: 2225
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
Log:
minor cache change for mop session manager
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-12 15:04:33 UTC (rev 2224)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml 2010-03-12 15:39:24 UTC (rev 2225)
@@ -274,7 +274,7 @@
<external-component-plugins>
<target-component>org.exoplatform.services.cache.CacheService</target-component>
- <component-plugin>
+ <component-plugin profiles="cluster">
<name>addExoCacheConfig</name>
<set-method>addExoCacheConfig</set-method>
<type>org.exoplatform.services.cache.ExoCacheConfigPlugin</type>
@@ -287,13 +287,10 @@
<field name="name">
<string>MOPSessionManager</string>
</field>
- <field name="maxNodes">
- <int>10000</int>
+ <field name="expirationTimeout">
+ <long>600</long>
</field>
- <field name="minTimeToLive">
- <long>60000</long>
- </field>
- <field name="distributed" profiles="cluster">
+ <field name="distributed">
<boolean>true</boolean>
</field>
</object>
14 years, 9 months
gatein SVN: r2224 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-12 10:04:33 -0500 (Fri, 12 Mar 2010)
New Revision: 2224
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java
Log:
implement toString for keys
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java 2010-03-12 15:02:35 UTC (rev 2223)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/NavigationKey.java 2010-03-12 15:04:33 UTC (rev 2224)
@@ -45,4 +45,10 @@
}
return new NavigationKey(components[0], components[1]);
}
+
+ @Override
+ public String toString()
+ {
+ return "NavigationKey[type=" + getType() + ",id=" + getId() + "]";
+ }
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java 2010-03-12 15:02:35 UTC (rev 2223)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PageKey.java 2010-03-12 15:04:33 UTC (rev 2224)
@@ -83,4 +83,10 @@
}
return new PageKey(components[0], components[1], components[2]);
}
+
+ @Override
+ public String toString()
+ {
+ return "PageKey[type=" + getType() + ",id=" + getId() + ",name=" + name + "]";
+ }
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java 2010-03-12 15:02:35 UTC (rev 2223)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/pom/data/PortalKey.java 2010-03-12 15:04:33 UTC (rev 2224)
@@ -45,4 +45,10 @@
}
return new PortalKey(components[0], components[1]);
}
+
+ @Override
+ public String toString()
+ {
+ return "PortalKey[type=" + getType() + ",id=" + getId() + "]";
+ }
}
14 years, 9 months
gatein SVN: r2223 - portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-03-12 10:02:35 -0500 (Fri, 12 Mar 2010)
New Revision: 2223
Modified:
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java
Log:
GTNPORTAL-770
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationState.java 2010-03-12 14:49:09 UTC (rev 2222)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/ApplicationState.java 2010-03-12 15:02:35 UTC (rev 2223)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.config.model;
+import java.io.Serializable;
+
/**
* The state of an application which can be either transient of persistent.
*
@@ -26,6 +28,6 @@
* @version $Revision$
* @param <S> the content state type
*/
-public abstract class ApplicationState<S>
+public abstract class ApplicationState<S> implements Serializable
{
}
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java 2010-03-12 14:49:09 UTC (rev 2222)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/PersistentApplicationState.java 2010-03-12 15:02:35 UTC (rev 2223)
@@ -19,15 +19,13 @@
package org.exoplatform.portal.config.model;
-import java.io.Serializable;
-
/**
* Represents the state of the application when it is bound to the database.
*
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class PersistentApplicationState<S> extends ApplicationState<S> implements Serializable
+public class PersistentApplicationState<S> extends ApplicationState<S>
{
/** The id of the content state. */
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java 2010-03-12 14:49:09 UTC (rev 2222)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/config/model/TransientApplicationState.java 2010-03-12 15:02:35 UTC (rev 2223)
@@ -19,6 +19,8 @@
package org.exoplatform.portal.config.model;
+import java.io.Serializable;
+
/**
* The transient state of an application when it has not yet been stored in the database.
*
14 years, 9 months
gatein SVN: r2222 - in portal/trunk: server/jboss/patch-ear/src/main/jboss/server/default/conf/gatein and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-12 09:49:09 -0500 (Fri, 12 Mar 2010)
New Revision: 2222
Modified:
portal/trunk/packaging/pkg/pom.xml
portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/gatein/configuration.xml
Log:
minor
Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml 2010-03-12 14:18:20 UTC (rev 2221)
+++ portal/trunk/packaging/pkg/pom.xml 2010-03-12 14:49:09 UTC (rev 2222)
@@ -37,7 +37,7 @@
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
<type>zip</type>
- <version>1.0.0-Beta08</version>
+ <version>1.0.0-CR01</version>
</dependency>
<dependency>
Modified: portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/gatein/configuration.xml
===================================================================
--- portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/gatein/configuration.xml 2010-03-12 14:18:20 UTC (rev 2221)
+++ portal/trunk/server/jboss/patch-ear/src/main/jboss/server/default/conf/gatein/configuration.xml 2010-03-12 14:49:09 UTC (rev 2222)
@@ -54,6 +54,9 @@
<string>rest</string>
</value>
<value>
+ <string>wsrp-producer</string>
+ </value>
+ <value>
<string>web</string>
</value>
</collection>
14 years, 9 months
gatein SVN: r2221 - in portal/trunk: packaging/module/src/main/javascript and 1 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-12 09:18:20 -0500 (Fri, 12 Mar 2010)
New Revision: 2221
Modified:
portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml
portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js
Log:
- Rolling back 2011
+ the sample should be in 'deploy' not in gatein.ear, this will be taken care by the packager which is being deployed
+ the display-name needs to match the war name
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-03-12 13:57:57 UTC (rev 2220)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/WEB-INF/web.xml 2010-03-12 14:18:20 UTC (rev 2221)
@@ -24,7 +24,7 @@
<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.5">
- <display-name>simpleDeployableSkin</display-name>
+ <display-name>gatein-sample-skin</display-name>
<filter>
<filter-name>ResourceRequestFilter</filter-name>
<filter-class>org.exoplatform.portal.application.ResourceRequestFilter</filter-class>
Modified: portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js
===================================================================
--- portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-12 13:57:57 UTC (rev 2220)
+++ portal/trunk/packaging/module/src/main/javascript/portal.packaging.module.js 2010-03-12 14:18:20 UTC (rev 2221)
@@ -1,276 +1,271 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-eXo.require("eXo.projects.Module");
-eXo.require("eXo.projects.Product");
-
-function getModule(params)
-{
-
- var kernel = params.kernel;
- var core = params.core;
- var jcr = params.eXoJcr;
- var ws = params.ws;
- var module = new Module();
-
- module.version = "${project.version}";
- module.relativeMavenRepo = "org/exoplatform/portal";
- module.relativeSRCRepo = "portal";
- module.name = "portal";
-
- var mopVersion = "${org.gatein.mop.version}";
- var chromatticVersion = "${version.chromattic}";
- var reflectVersion = "${version.reflect}";
- var idmVersion = "${org.picketlink.idm}";
- var pcVersion = "${org.gatein.pc.version}";
- var wciVersion = "${org.gatein.wci.version}";
- var commonVersion = "${org.gatein.common.version}";
- var wsrpVersion = "${org.gatein.wsrp.version}";
- var shindigVersion = "${org.shindig.version}";
- var groovyVersion = "${org.codehaus.groovy.version}";
- var rhinoVersion = "${rhino.version}";
- var jcipVersion = "${jcip.version}";
-
- //TODO versions for gatein components
-
- module.component = {}
- module.component.resources =
- new Project("org.exoplatform.portal", "exo.portal.component.resources", "jar", module.version);
-
- module.component.common =
- new Project("org.exoplatform.portal", "exo.portal.component.common", "jar", module.version).
- addDependency(new Project("org.gatein.common", "common-logging", "jar", commonVersion));
-
- module.component.pc =
- new Project("org.exoplatform.portal", "exo.portal.component.pc", "jar", module.version).
- addDependency(new Project("javax.portlet", "portlet-api", "jar", "2.0")).
- addDependency(new Project("javax.ccpp", "ccpp", "jar", "1.0")).
- addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1")).
- addDependency(new Project("org.gatein.pc", "pc-api", "jar", pcVersion)).
- addDependency(new Project("org.gatein.pc", "pc-bridge", "jar", pcVersion)).
- addDependency(new Project("org.gatein.pc", "pc-portlet", "jar", pcVersion)).
- addDependency(new Project("org.gatein.pc", "pc-mc", "jar", pcVersion)).
- addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)).
- addDependency(new Project("org.gatein.pc", "pc-federation", "jar", pcVersion)).
- addDependency(new Project("org.gatein.wci", "wci-wci", "jar", wciVersion)).
- addDependency(new Project("org.gatein.wci", "wci-tomcat", "jar", wciVersion)).
- addDependency(new Project("org.gatein.wci", "wci-exo", "jar", wciVersion)).
- addDependency(new Project("org.gatein.common", "common-common", "jar", commonVersion)).
- addDependency(new Project("log4j", "log4j", "jar", "1.2.14")).
- addDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.1.GA")).
- addDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA")).
- addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")).
- addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA"));
-
-
- module.component.wsrp = new Project("org.exoplatform.portal", "gatein.portal.component.wsrp", "jar", module.version)
- .addDependency(new Project("org.gatein.wsrp", "wsrp-producer", "war", wsrpVersion))
- .addDependency(new Project("org.gatein.wsrp", "wsrp-admin-gui", "war", wsrpVersion))
- .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion))
- .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion))
- .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion))
- .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion))
- .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion));
-
- module.component.xmlParser =
- new Project("org.exoplatform.portal", "exo.portal.component.xml-parser", "jar", module.version).
- //addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0")).
- addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3"));
-
- module.component.scripting =
- new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version).
- addDependency(module.component.xmlParser).
- addDependency(new Project("rhino", "js", "jar", rhinoVersion)).
- addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", groovyVersion));
-
- module.component.management =
- new Project("org.exoplatform.portal", "exo.portal.component.management", "jar", module.version);
-
- module.component.web =
- new Project("org.exoplatform.portal", "exo.portal.component.web", "jar", module.version).
- addDependency(module.component.scripting);
-
- module.component.portal =
- new Project("org.exoplatform.portal", "exo.portal.component.portal", "jar", module.version).
- addDependency(new Project("org.gatein.mop", "mop-api", "jar", mopVersion)).
- addDependency(new Project("org.gatein.mop", "mop-spi", "jar", mopVersion)).
- addDependency(new Project("org.gatein.mop", "mop-core", "jar", mopVersion)).
- addDependency(new Project("org.chromattic", "chromattic.api", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.common", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.spi", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.metamodel", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.core", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.apt", "jar", chromatticVersion)).
- addDependency(new Project("org.chromattic", "chromattic.ext", "jar", chromatticVersion)).
- addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)).
- addDependency(new Project("org.reflext", "reflext.core", "jar", reflectVersion)).
- addDependency(new Project("org.reflext", "reflext.spi", "jar", reflectVersion)).
- addDependency(new Project("org.reflext", "reflext.jlr", "jar", reflectVersion)).
- addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)).
- addDependency(module.component.web);
-
- module.component.identity =
- new Project("org.exoplatform.portal", "exo.portal.component.identity", "jar", module.version).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-core", "jar", idmVersion)).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-common", "jar", idmVersion)).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-api", "jar", idmVersion)).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-spi", "jar", idmVersion)).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-hibernate", "jar", idmVersion)).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-ldap", "jar", idmVersion)).
- addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion));
-
- module.component.applicationRegistry =
- new Project("org.exoplatform.portal", "exo.portal.component.application-registry", "jar", module.version).
- addDependency(module.component.portal).
- addDependency(new Project("com.sun.xml.stream", "sjsxp", "jar", "1.0"));
-
- module.webui = {};
- module.webui.core =
- new Project("org.exoplatform.portal", "exo.portal.webui.core", "jar", module.version).
- addDependency(module.component.web);
-
- module.webui.eXo =
- new Project("org.exoplatform.portal", "exo.portal.webui.eXo", "jar", module.version).
- addDependency(module.component.applicationRegistry).
- addDependency(module.webui.core);
-
- module.webui.portal =
- new Project("org.exoplatform.portal", "exo.portal.webui.portal", "jar", module.version).
- addDependency(module.component.common).
- addDependency(module.component.management).
- addDependency(module.component.resources).
- addDependency(module.component.identity).
- addDependency(module.component.pc).
- addDependency(module.component.wsrp).
- addDependency(module.webui.eXo).
-
- addDependency(kernel.container).
- addDependency(kernel.component.common).
- addDependency(kernel.component.remote).
- addDependency(kernel.component.cache).
- addDependency(kernel.component.command).
- addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)).
-
- addDependency(core.component.database).
- addDependency(core.component.organization).
- addDependency(core.component.organization.ldap).
- addDependency(core.component.ldap).
- addDependency(core.component.security.core).
- addDependency(core.component.xmlProcessing).
- addDependency(core.component.documents).
-
- addDependency(jcr.services.jcr);
-
- module.portlet = {};
-
- module.portlet.exoadmin =
- new Project("org.exoplatform.portal", "exo.portal.portlet.exoadmin", "exo-portlet", module.version);
-
- module.portlet.web =
- new Project("org.exoplatform.portal", "exo.portal.portlet.web", "exo-portlet", module.version);
-
- module.portlet.dashboard =
- new Project("org.exoplatform.portal", "exo.portal.portlet.dashboard", "exo-portlet", module.version).
- addDependency(new Project("org.exoplatform.portal", "exo.portal.component.dashboard", "jar", module.version));
-
- module.sample = {};
- module.sample.framework =
- new Project("org.exoplatform.portal", "exo.portal.sample.framework", "war", module.version);
- module.sample.framework.deployName = "eXoSampleFramework";
-
- module.eXoGadgetServer =
- new Project("org.exoplatform.portal", "exo.portal.gadgets-server", "war", module.version).
- addDependency(new Project("commons-io", "commons-io", "jar", "1.4")).
- addDependency(new Project("net.oauth", "core", "jar", "20080621")).
- addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")).
- addDependency(new Project("com.google.code.guice", "guice", "jar", "2.0")).
- addDependency(new Project("com.google.code.guice", "guice-jmx", "jar", "2.0")).
- addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")).
- addDependency(new Project("rome", "rome", "jar", "0.9")).
- addDependency(new Project("joda-time", "joda-time", "jar", "1.6")).
- addDependency(new Project("org.json", "json", "jar", "20070829")).
- addDependency(new Project("org.gatein.shindig", "shindig-common", "jar", shindigVersion)).
- addDependency(new Project("org.gatein.shindig", "shindig-gadgets", "jar", shindigVersion)).
- addDependency(new Project("org.gatein.shindig", "shindig-features", "jar", shindigVersion)).
- addDependency(new Project("org.gatein.shindig", "shindig-social-api", "jar", shindigVersion)).
- addDependency(new Project("jdom", "jdom", "jar", "1.0")).
- addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.1")).
- addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")).
- addDependency(new Project("net.sf.ehcache", "ehcache", "jar", "1.6.0")).
- addDependency(new Project("xml-apis", "xml-apis", "jar", "1.3.04")).
- addDependency(new Project("com.ibm.icu", "icu4j", "jar", "3.8")).
- addDependency(new Project("net.sourceforge.nekohtml", "nekohtml", "jar", "1.9.9")).
- addDependency(new Project("xerces", "xercesImpl", "jar", "2.9.1")).
- addDependency(new Project("com.thoughtworks.xstream", "xstream", "jar", "1.3.1")).
- addDependency(new Project("caja", "caja", "jar", "r3375")).
- addDependency(new Project("caja", "json_simple", "jar", "r1")).
- addDependency(new Project("org.apache.sanselan", "sanselan", "jar", "0.97-incubator")).
- addDependency(new Project("de.odysseus.juel", "juel-api", "jar", "2.1.2")).
- addDependency(new Project("de.odysseus.juel", "juel-impl", "jar", "2.1.2")).
- addDependency(new Project("org.jsecurity", "jsecurity", "jar", "0.9.0")).
- addDependency(new Project("aopalliance", "aopalliance", "jar", "1.0")).
- addDependency(new Project("org.exoplatform.portal", "exo.portal.gadgets-core", "jar", module.version));
- module.eXoGadgetServer.deployName = "eXoGadgetServer";
-
- module.eXoGadgets = new Project("org.exoplatform.portal", "exo.portal.eXoGadgets", "war", module.version);
- module.eXoGadgets.deployName = "eXoGadgets";
-
- module.web = {}
- module.web.eXoResources =
- new Project("org.exoplatform.portal", "exo.portal.web.eXoResources", "war", module.version);
- module.web.rest =
- new Project("org.exoplatform.portal", "exo.portal.web.rest", "war", module.version).
- addDependency(ws.frameworks.servlet);
-
- module.examples = {}
- module.examples.skins = {}
- module.examples.skins.simpleSkin = new Project("org.gatein.portal.examples.skins", "gatein-sample-skin", "war", module.version);
- //module.examples.skins.simpleSkin.deployName = "gatein-sample-skin";
-
- module.web.portal =
- new Project("org.exoplatform.portal", "exo.portal.web.portal", "exo-portal", module.version).
- addDependency(jcr.frameworks.web).
- addDependency(jcr.frameworks.command);
-
- module.server = {}
-
- module.server.tomcat = {}
- module.server.tomcat.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version);
-
- module.server.jboss = {}
- module.server.jboss.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version);
-
- module.server.jbossear = {}
- module.server.jbossear.patch =
- new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version);
-
- module.sample.extension =
- new Project("org.exoplatform.portal", "gatein-sample-extension", "ear", module.version).
- addDependency(new Project("org.exoplatform.portal", "gatein-sample-portal", "ear", module.version)).
- addDependency(new Project("org.exoplatform.portal", "starter-gatein", "ear", module.version));
-
- <!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack -->
- module.ibm = {};
- module.ibm.jdk = {};
- module.ibm.jdk.support =new Project("net.jcip", "jcip-annotations", "jar", jcipVersion);
-
- return module;
-}
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+eXo.require("eXo.projects.Module");
+eXo.require("eXo.projects.Product");
+
+function getModule(params)
+{
+
+ var kernel = params.kernel;
+ var core = params.core;
+ var jcr = params.eXoJcr;
+ var ws = params.ws;
+ var module = new Module();
+
+ module.version = "${project.version}";
+ module.relativeMavenRepo = "org/exoplatform/portal";
+ module.relativeSRCRepo = "portal";
+ module.name = "portal";
+
+ var mopVersion = "${org.gatein.mop.version}";
+ var chromatticVersion = "${version.chromattic}";
+ var reflectVersion = "${version.reflect}";
+ var idmVersion = "${org.picketlink.idm}";
+ var pcVersion = "${org.gatein.pc.version}";
+ var wciVersion = "${org.gatein.wci.version}";
+ var commonVersion = "${org.gatein.common.version}";
+ var wsrpVersion = "${org.gatein.wsrp.version}";
+ var shindigVersion = "${org.shindig.version}";
+ var groovyVersion = "${org.codehaus.groovy.version}";
+ var rhinoVersion = "${rhino.version}";
+ var jcipVersion = "${jcip.version}";
+
+ //TODO versions for gatein components
+
+ module.component = {}
+ module.component.resources =
+ new Project("org.exoplatform.portal", "exo.portal.component.resources", "jar", module.version);
+
+ module.component.common =
+ new Project("org.exoplatform.portal", "exo.portal.component.common", "jar", module.version).
+ addDependency(new Project("org.gatein.common", "common-logging", "jar", commonVersion));
+
+ module.component.pc =
+ new Project("org.exoplatform.portal", "exo.portal.component.pc", "jar", module.version).
+ addDependency(new Project("javax.portlet", "portlet-api", "jar", "2.0")).
+ addDependency(new Project("javax.ccpp", "ccpp", "jar", "1.0")).
+ addDependency(new Project("javax.xml.bind", "jaxb-api", "jar", "2.1")).
+ addDependency(new Project("org.gatein.pc", "pc-api", "jar", pcVersion)).
+ addDependency(new Project("org.gatein.pc", "pc-bridge", "jar", pcVersion)).
+ addDependency(new Project("org.gatein.pc", "pc-portlet", "jar", pcVersion)).
+ addDependency(new Project("org.gatein.pc", "pc-mc", "jar", pcVersion)).
+ addDependency(new Project("org.gatein.pc", "pc-controller", "jar", pcVersion)).
+ addDependency(new Project("org.gatein.pc", "pc-federation", "jar", pcVersion)).
+ addDependency(new Project("org.gatein.wci", "wci-wci", "jar", wciVersion)).
+ addDependency(new Project("org.gatein.wci", "wci-tomcat", "jar", wciVersion)).
+ addDependency(new Project("org.gatein.wci", "wci-exo", "jar", wciVersion)).
+ addDependency(new Project("org.gatein.common", "common-common", "jar", commonVersion)).
+ addDependency(new Project("log4j", "log4j", "jar", "1.2.14")).
+ addDependency(new Project("org.jboss", "jbossxb", "jar", "2.0.1.GA")).
+ addDependency(new Project("org.jboss.logging", "jboss-logging-spi", "jar", "2.0.5.GA")).
+ addDependency(new Project("org.apache.portals.bridges", "portals-bridges-common", "jar", "1.0.4")).
+ addDependency(new Project("org.jboss", "jboss-common-core", "jar", "2.2.9.GA"));
+
+
+ module.component.wsrp = new Project("org.exoplatform.portal", "gatein.portal.component.wsrp", "jar", module.version)
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-producer", "war", wsrpVersion))
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-admin-gui", "war", wsrpVersion))
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-producer-lib", "jar",wsrpVersion))
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-common", "jar", wsrpVersion))
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-wsrp1-ws", "jar", wsrpVersion))
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-consumer", "jar", wsrpVersion))
+ .addDependency(new Project("org.gatein.wsrp", "wsrp-integration-api", "jar", wsrpVersion));
+
+ module.component.xmlParser =
+ new Project("org.exoplatform.portal", "exo.portal.component.xml-parser", "jar", module.version).
+ //addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0")).
+ addDependency(new Project("commons-codec", "commons-codec", "jar", "1.3"));
+
+ module.component.scripting =
+ new Project("org.exoplatform.portal", "exo.portal.component.scripting", "jar", module.version).
+ addDependency(module.component.xmlParser).
+ addDependency(new Project("rhino", "js", "jar", rhinoVersion)).
+ addDependency(new Project("org.codehaus.groovy", "groovy-all", "jar", groovyVersion));
+
+ module.component.management =
+ new Project("org.exoplatform.portal", "exo.portal.component.management", "jar", module.version);
+
+ module.component.web =
+ new Project("org.exoplatform.portal", "exo.portal.component.web", "jar", module.version).
+ addDependency(module.component.scripting);
+
+ module.component.portal =
+ new Project("org.exoplatform.portal", "exo.portal.component.portal", "jar", module.version).
+ addDependency(new Project("org.gatein.mop", "mop-api", "jar", mopVersion)).
+ addDependency(new Project("org.gatein.mop", "mop-spi", "jar", mopVersion)).
+ addDependency(new Project("org.gatein.mop", "mop-core", "jar", mopVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.api", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.common", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.spi", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.metamodel", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.core", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.apt", "jar", chromatticVersion)).
+ addDependency(new Project("org.chromattic", "chromattic.ext", "jar", chromatticVersion)).
+ addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)).
+ addDependency(new Project("org.reflext", "reflext.core", "jar", reflectVersion)).
+ addDependency(new Project("org.reflext", "reflext.spi", "jar", reflectVersion)).
+ addDependency(new Project("org.reflext", "reflext.jlr", "jar", reflectVersion)).
+ addDependency(new Project("org.reflext", "reflext.api", "jar", reflectVersion)).
+ addDependency(module.component.web);
+
+ module.component.identity =
+ new Project("org.exoplatform.portal", "exo.portal.component.identity", "jar", module.version).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-core", "jar", idmVersion)).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-common", "jar", idmVersion)).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-api", "jar", idmVersion)).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-spi", "jar", idmVersion)).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-hibernate", "jar", idmVersion)).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-ldap", "jar", idmVersion)).
+ addDependency(new Project("org.picketlink.idm", "picketlink-idm-cache", "jar", idmVersion));
+
+ module.component.applicationRegistry =
+ new Project("org.exoplatform.portal", "exo.portal.component.application-registry", "jar", module.version).
+ addDependency(module.component.portal).
+ addDependency(new Project("com.sun.xml.stream", "sjsxp", "jar", "1.0"));
+
+ module.webui = {};
+ module.webui.core =
+ new Project("org.exoplatform.portal", "exo.portal.webui.core", "jar", module.version).
+ addDependency(module.component.web);
+
+ module.webui.eXo =
+ new Project("org.exoplatform.portal", "exo.portal.webui.eXo", "jar", module.version).
+ addDependency(module.component.applicationRegistry).
+ addDependency(module.webui.core);
+
+ module.webui.portal =
+ new Project("org.exoplatform.portal", "exo.portal.webui.portal", "jar", module.version).
+ addDependency(module.component.common).
+ addDependency(module.component.management).
+ addDependency(module.component.resources).
+ addDependency(module.component.identity).
+ addDependency(module.component.pc).
+ addDependency(module.component.wsrp).
+ addDependency(module.webui.eXo).
+
+ addDependency(kernel.container).
+ addDependency(kernel.component.common).
+ addDependency(kernel.component.remote).
+ addDependency(kernel.component.cache).
+ addDependency(kernel.component.command).
+ addDependency(new Project("org.exoplatform.kernel", "exo.kernel.component.ext.cache.impl.jboss.v3", "jar", kernel.version)).
+
+ addDependency(core.component.database).
+ addDependency(core.component.organization).
+ addDependency(core.component.organization.ldap).
+ addDependency(core.component.ldap).
+ addDependency(core.component.security.core).
+ addDependency(core.component.xmlProcessing).
+ addDependency(core.component.documents).
+
+ addDependency(jcr.services.jcr);
+
+ module.portlet = {};
+
+ module.portlet.exoadmin =
+ new Project("org.exoplatform.portal", "exo.portal.portlet.exoadmin", "exo-portlet", module.version);
+
+ module.portlet.web =
+ new Project("org.exoplatform.portal", "exo.portal.portlet.web", "exo-portlet", module.version);
+
+ module.portlet.dashboard =
+ new Project("org.exoplatform.portal", "exo.portal.portlet.dashboard", "exo-portlet", module.version).
+ addDependency(new Project("org.exoplatform.portal", "exo.portal.component.dashboard", "jar", module.version));
+
+ module.sample = {};
+ module.sample.framework =
+ new Project("org.exoplatform.portal", "exo.portal.sample.framework", "war", module.version);
+ module.sample.framework.deployName = "eXoSampleFramework";
+
+ module.eXoGadgetServer =
+ new Project("org.exoplatform.portal", "exo.portal.gadgets-server", "war", module.version).
+ addDependency(new Project("commons-io", "commons-io", "jar", "1.4")).
+ addDependency(new Project("net.oauth", "core", "jar", "20080621")).
+ addDependency(new Project("com.google.collections", "google-collections", "jar", "1.0-rc2")).
+ addDependency(new Project("com.google.code.guice", "guice", "jar", "2.0")).
+ addDependency(new Project("com.google.code.guice", "guice-jmx", "jar", "2.0")).
+ addDependency(new Project("commons-lang", "commons-lang", "jar", "2.4")).
+ addDependency(new Project("rome", "rome", "jar", "0.9")).
+ addDependency(new Project("joda-time", "joda-time", "jar", "1.6")).
+ addDependency(new Project("org.json", "json", "jar", "20070829")).
+ addDependency(new Project("org.gatein.shindig", "shindig-common", "jar", shindigVersion)).
+ addDependency(new Project("org.gatein.shindig", "shindig-gadgets", "jar", shindigVersion)).
+ addDependency(new Project("org.gatein.shindig", "shindig-features", "jar", shindigVersion)).
+ addDependency(new Project("org.gatein.shindig", "shindig-social-api", "jar", shindigVersion)).
+ addDependency(new Project("jdom", "jdom", "jar", "1.0")).
+ addDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.1")).
+ addDependency(new Project("commons-collections", "commons-collections", "jar", "3.2.1")).
+ addDependency(new Project("net.sf.ehcache", "ehcache", "jar", "1.6.0")).
+ addDependency(new Project("xml-apis", "xml-apis", "jar", "1.3.04")).
+ addDependency(new Project("com.ibm.icu", "icu4j", "jar", "3.8")).
+ addDependency(new Project("net.sourceforge.nekohtml", "nekohtml", "jar", "1.9.9")).
+ addDependency(new Project("xerces", "xercesImpl", "jar", "2.9.1")).
+ addDependency(new Project("com.thoughtworks.xstream", "xstream", "jar", "1.3.1")).
+ addDependency(new Project("caja", "caja", "jar", "r3375")).
+ addDependency(new Project("caja", "json_simple", "jar", "r1")).
+ addDependency(new Project("org.apache.sanselan", "sanselan", "jar", "0.97-incubator")).
+ addDependency(new Project("de.odysseus.juel", "juel-api", "jar", "2.1.2")).
+ addDependency(new Project("de.odysseus.juel", "juel-impl", "jar", "2.1.2")).
+ addDependency(new Project("org.jsecurity", "jsecurity", "jar", "0.9.0")).
+ addDependency(new Project("aopalliance", "aopalliance", "jar", "1.0")).
+ addDependency(new Project("org.exoplatform.portal", "exo.portal.gadgets-core", "jar", module.version));
+ module.eXoGadgetServer.deployName = "eXoGadgetServer";
+
+ module.eXoGadgets = new Project("org.exoplatform.portal", "exo.portal.eXoGadgets", "war", module.version);
+ module.eXoGadgets.deployName = "eXoGadgets";
+
+ module.web = {}
+ module.web.eXoResources =
+ new Project("org.exoplatform.portal", "exo.portal.web.eXoResources", "war", module.version);
+ module.web.rest =
+ new Project("org.exoplatform.portal", "exo.portal.web.rest", "war", module.version).
+ addDependency(ws.frameworks.servlet);
+
+ module.web.portal =
+ new Project("org.exoplatform.portal", "exo.portal.web.portal", "exo-portal", module.version).
+ addDependency(jcr.frameworks.web).
+ addDependency(jcr.frameworks.command);
+
+ module.server = {}
+
+ module.server.tomcat = {}
+ module.server.tomcat.patch =
+ new Project("org.exoplatform.portal", "exo.portal.server.tomcat.patch", "jar", module.version);
+
+ module.server.jboss = {}
+ module.server.jboss.patch =
+ new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch", "jar", module.version);
+
+ module.server.jbossear = {}
+ module.server.jbossear.patch =
+ new Project("org.exoplatform.portal", "exo.portal.server.jboss.patch-ear", "jar", module.version);
+
+ module.sample.extension =
+ new Project("org.exoplatform.portal", "gatein-sample-extension", "ear", module.version).
+ addDependency(new Project("org.exoplatform.portal", "gatein-sample-portal", "ear", module.version)).
+ addDependency(new Project("org.exoplatform.portal", "starter-gatein", "ear", module.version));
+
+ <!-- needed so that GTN can be run on the IBM jdk, to be removed when the IBM jdk no longer needs this hack -->
+ module.ibm = {};
+ module.ibm.jdk = {};
+ module.ibm.jdk.support =new Project("net.jcip", "jcip-annotations", "jar", jcipVersion);
+
+ return module;
+}
Modified: portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js
===================================================================
--- portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-12 13:57:57 UTC (rev 2220)
+++ portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-03-12 14:18:20 UTC (rev 2221)
@@ -1,67 +1,66 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-eXo.require("eXo.projects.Module") ;
-eXo.require("eXo.projects.Product") ;
-
-function getProduct(version) {
- var product = new Product();
-
- product.name = "eXoPortal" ;
- product.portalwar = "portal.war" ;
- product.codeRepo = "portal" ;//module in modules/portal/module.js
- product.serverPluginVersion = "${project.version}";
-
- var kernel = Module.GetModule("kernel") ;
- var core = Module.GetModule("core") ;
- var ws = Module.GetModule("ws", {kernel : kernel, core : core});
- var eXoJcr = Module.GetModule("jcr", {kernel : kernel, core : core, ws : ws}) ;
- var portal = Module.GetModule("portal", {kernel : kernel, ws:ws, core : core, eXoJcr : eXoJcr});
-
- product.addDependencies(portal.web.rest) ;
- product.addDependencies(portal.portlet.exoadmin) ;
- product.addDependencies(portal.portlet.web) ;
- product.addDependencies(portal.portlet.dashboard) ;
- product.addDependencies(portal.eXoGadgetServer) ;
- product.addDependencies(portal.eXoGadgets) ;
- product.addDependencies(portal.webui.portal);
-
- product.addDependencies(portal.web.eXoResources);
- product.addDependencies(portal.examples.skins.simpleSkin);
-
- product.addDependencies(portal.web.portal) ;
- product.addDependencies(portal.sample.extension) ;
-
- product.addDependencies(portal.ibm.jdk.support);
-
- product.addServerPatch("tomcat", portal.server.tomcat.patch) ;
- product.addServerPatch("jboss", portal.server.jboss.patch) ;
- product.addServerPatch("jbossear", portal.server.jbossear.patch) ;
-
- /* cleanup duplicated lib */
- product.removeDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0"));
- product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1"));
- product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1"));
- product.removeDependency(new Project("c3p0", "c3p0", "jar", "0.9.1.2"));
-
- product.module = portal ;
- product.dependencyModule = [ kernel, core, ws, eXoJcr];
-
- return product ;
-}
+/**
+ * Copyright (C) 2009 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+eXo.require("eXo.projects.Module") ;
+eXo.require("eXo.projects.Product") ;
+
+function getProduct(version) {
+ var product = new Product();
+
+ product.name = "eXoPortal" ;
+ product.portalwar = "portal.war" ;
+ product.codeRepo = "portal" ;//module in modules/portal/module.js
+ product.serverPluginVersion = "${project.version}";
+
+ var kernel = Module.GetModule("kernel") ;
+ var core = Module.GetModule("core") ;
+ var ws = Module.GetModule("ws", {kernel : kernel, core : core});
+ var eXoJcr = Module.GetModule("jcr", {kernel : kernel, core : core, ws : ws}) ;
+ var portal = Module.GetModule("portal", {kernel : kernel, ws:ws, core : core, eXoJcr : eXoJcr});
+
+ product.addDependencies(portal.web.rest) ;
+ product.addDependencies(portal.portlet.exoadmin) ;
+ product.addDependencies(portal.portlet.web) ;
+ product.addDependencies(portal.portlet.dashboard) ;
+ product.addDependencies(portal.eXoGadgetServer) ;
+ product.addDependencies(portal.eXoGadgets) ;
+ product.addDependencies(portal.webui.portal);
+
+ product.addDependencies(portal.web.eXoResources);
+
+ product.addDependencies(portal.web.portal) ;
+ product.addDependencies(portal.sample.extension) ;
+
+ product.addDependencies(portal.ibm.jdk.support);
+
+ product.addServerPatch("tomcat", portal.server.tomcat.patch) ;
+ product.addServerPatch("jboss", portal.server.jboss.patch) ;
+ product.addServerPatch("jbossear", portal.server.jbossear.patch) ;
+
+ /* cleanup duplicated lib */
+ product.removeDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0"));
+ product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1"));
+ product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.2"));
+ product.removeDependency(new Project("c3p0", "c3p0", "jar", "0.9.1.2"));
+
+ product.module = portal ;
+ product.dependencyModule = [ kernel, core, ws, eXoJcr];
+
+ return product ;
+}
14 years, 9 months
gatein SVN: r2220 - portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-12 08:57:57 -0500 (Fri, 12 Mar 2010)
New Revision: 2220
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java
Log:
- Removed unused getConsumer method. If needed, JCR getParent could be used as we have a hierarchical relationship between Consumer and Registrations.
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-12 13:56:32 UTC (rev 2219)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationMapping.java 2010-03-12 13:57:57 UTC (rev 2220)
@@ -23,7 +23,13 @@
package org.gatein.portal.wsrp.state.producer.registrations.mapping;
-import org.chromattic.api.annotations.*;
+import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.Id;
+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.chromattic.api.annotations.Property;
import org.gatein.common.util.ParameterValidation;
import org.gatein.portal.wsrp.state.producer.registrations.JCRRegistrationPersistenceManager;
import org.gatein.registration.Registration;
@@ -48,9 +54,6 @@
@Id
public abstract String getPersistentKey();
- @ManyToOne
- public abstract ConsumerMapping getConsumer();
-
@Property(name = "status")
public abstract RegistrationStatus getStatus();
14 years, 9 months
gatein SVN: r2219 - portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-12 08:56:32 -0500 (Fri, 12 Mar 2010)
New Revision: 2219
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java
Log:
- Added cause exception for better error reporting.
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-03-12 13:41:02 UTC (rev 2218)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-03-12 13:56:32 UTC (rev 2219)
@@ -35,7 +35,6 @@
import org.gatein.pc.portlet.container.ContainerPortletInvoker;
import org.gatein.pc.portlet.impl.state.StateConverterV0;
import org.gatein.pc.portlet.impl.state.StateManagementPolicyService;
-import org.gatein.pc.portlet.impl.state.producer.PortletStatePersistenceManagerService;
import org.gatein.pc.portlet.state.StateConverter;
import org.gatein.pc.portlet.state.producer.PortletStatePersistenceManager;
import org.gatein.pc.portlet.state.producer.ProducerPortletInvoker;
@@ -264,7 +263,7 @@
}
catch (Exception e)
{
- throw new RuntimeException("Couldn't stop WSRP consumers registry.");
+ throw new RuntimeException("Couldn't stop WSRP consumers registry.", e);
}
consumerRegistry = null;
14 years, 9 months
gatein SVN: r2218 - portal/trunk/docs.
by do-not-reply＠jboss.org
Author: luc.texier(a)jboss.com
Date: 2010-03-12 08:41:02 -0500 (Fri, 12 Mar 2010)
New Revision: 2218
Modified:
portal/trunk/docs/pom.xml
Log:
Fixed mistake in pom file
Modified: portal/trunk/docs/pom.xml
===================================================================
--- portal/trunk/docs/pom.xml 2010-03-12 13:35:18 UTC (rev 2217)
+++ portal/trunk/docs/pom.xml 2010-03-12 13:41:02 UTC (rev 2218)
@@ -27,7 +27,7 @@
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>GateIn - Portal (docs-aggregator)</name>
- <version>3.0.0-GA</version>
+ <version>3.0.0-CR02-SNAPSHOT</version>
<modules>
<module>user-guide</module>
14 years, 9 months
gatein SVN: r2217 - in portal/trunk/docs: reference-guide/en and 4 other directories.
by do-not-reply＠jboss.org
Author: luc.texier(a)jboss.com
Date: 2010-03-12 08:35:18 -0500 (Fri, 12 Mar 2010)
New Revision: 2217
Added:
portal/trunk/docs/reference-guide/en/images/gatein_logo.png
portal/trunk/docs/user-guide/en/images/gatein_logo.png
Modified:
portal/trunk/docs/pom.xml
portal/trunk/docs/reference-guide/en/master.xml
portal/trunk/docs/user-guide/en/master.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
Log:
Fixing front pages + some screenshots
Modified: portal/trunk/docs/pom.xml
===================================================================
--- portal/trunk/docs/pom.xml 2010-03-12 13:20:21 UTC (rev 2216)
+++ portal/trunk/docs/pom.xml 2010-03-12 13:35:18 UTC (rev 2217)
@@ -27,7 +27,7 @@
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>GateIn - Portal (docs-aggregator)</name>
- <version>3.0.0-Beta03-SNAPSHOT</version>
+ <version>3.0.0-GA</version>
<modules>
<module>user-guide</module>
Added: portal/trunk/docs/reference-guide/en/images/gatein_logo.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/reference-guide/en/images/gatein_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/docs/reference-guide/en/master.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/master.xml 2010-03-12 13:20:21 UTC (rev 2216)
+++ portal/trunk/docs/reference-guide/en/master.xml 2010-03-12 13:35:18 UTC (rev 2217)
@@ -1,39 +1,82 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+<!ENTITY % BOOK_ENTITIES SYSTEM "Reference_Guide.ent">
+%BOOK_ENTITIES;
+]>
+
+<book lang="en">
+ <bookinfo>
+ <title>GateIn Reference Guide</title>
+ <subtitle>
<!--
+LT 20010312: could not find a way to configure image scaling properly (tried width, scale, etc...). Feel free to investigate.
+-->
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/>
+ </imageobject>
+ </mediaobject>
- Copyright (C) 2009 eXo Platform SAS.
-
- This is free software; you can redistribute it and/or modify it
- under the terms of the GNU Lesser General Public License as
- published by the Free Software Foundation; either version 2.1 of
- the License, or (at your option) any later version.
-
- This software is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this software; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ </subtitle>
--->
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
-<book lang="en">
- <bookinfo>
- <title>GateIn Documentation</title>
- <subtitle>GateIn</subtitle>
- <releaseinfo>This is a very rough documentation issued from the merge,
- content still has to be validated, we still hope that it can help the
- beta testers. Thanks !
- </releaseinfo>
+ <authorgroup>
+ <author>
+ <firstname>the GateIn community</firstname>
+ <surname></surname>
+ </author>
+ <author>
+ <firstname>JBoss by Red Hat</firstname>
+ <surname></surname>
+ </author>
+ <author>
+ <firstname>eXo Platform</firstname>
+ <surname></surname>
+ </author>
+
+ <editor>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>Engineering Content Services</orgdiv>
+ </affiliation>
+ <email>smumford(a)redhat.com</email>
+ </editor>
+ <editor>
+ <firstname>Thomas</firstname>
+ <surname>Heute</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>JBoss Engineering</orgdiv>
+ </affiliation>
+ <email>theute(a)redhat.com</email>
+ </editor>
+ <editor>
+ <firstname>Luc</firstname>
+ <surname>Texier</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>JBoss Engineering, Management</orgdiv>
+ </affiliation>
+ <email>ltexier(a)redhat.com</email>
+ </editor>
+<!--
+ <othercredit>
+ <affiliation>
+ <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname>
+ </affiliation>
+ <contrib>Original product documentation by:</contrib>
+ </othercredit>
+-->
+ </authorgroup>
- </bookinfo>
- <toc/>
+ </bookinfo>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml"/>
<!--
Added: portal/trunk/docs/user-guide/en/images/gatein_logo.png
===================================================================
(Binary files differ)
Property changes on: portal/trunk/docs/user-guide/en/images/gatein_logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/docs/user-guide/en/master.xml
===================================================================
--- portal/trunk/docs/user-guide/en/master.xml 2010-03-12 13:20:21 UTC (rev 2216)
+++ portal/trunk/docs/user-guide/en/master.xml 2010-03-12 13:35:18 UTC (rev 2217)
@@ -5,17 +5,81 @@
%BOOK_ENTITIES;
]>
-<book lang="en">
- <bookinfo>
- <title>GateIn Documentation</title>
- <subtitle>GateIn</subtitle>
- <releaseinfo>This document provides an easy to follow guide to the functions and
-options available in &PRODUCT;. It is intended to
-be accessible and useful to both experienced and novice portal
-users.</releaseinfo>
- </bookinfo>
- <toc />
+<book lang="en">
+ <bookinfo>
+ <title>GateIn User Guide</title>
+ <subtitle>
+<!--
+LT 20010312: could not find a way to configure image scaling properly (tried width, scale, etc...). Feel free to investigate.
+-->
+ <mediaobject>
+ <imageobject role="html">
+ <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/>
+ </imageobject>
+ <imageobject role="fo">
+ <imagedata fileref="images/gatein_logo.png" format="PNG" align="center"/>
+ </imageobject>
+ </mediaobject>
+ </subtitle>
+
+
+ <authorgroup>
+ <author>
+ <firstname>the GateIn community</firstname>
+ <surname></surname>
+ </author>
+ <author>
+ <firstname>JBoss by Red Hat</firstname>
+ <surname></surname>
+ </author>
+ <author>
+ <firstname>eXo Platform</firstname>
+ <surname></surname>
+ </author>
+
+ <editor>
+ <firstname>Scott</firstname>
+ <surname>Mumford</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>Engineering Content Services</orgdiv>
+ </affiliation>
+ <email>smumford(a)redhat.com</email>
+ </editor>
+ <editor>
+ <firstname>Thomas</firstname>
+ <surname>Heute</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>JBoss Engineering</orgdiv>
+ </affiliation>
+ <email>theute(a)redhat.com</email>
+ </editor>
+ <editor>
+ <firstname>Luc</firstname>
+ <surname>Texier</surname>
+ <affiliation>
+ <shortaffil>Red Hat</shortaffil>
+ <orgdiv>JBoss Engineering, Management</orgdiv>
+ </affiliation>
+ <email>ltexier(a)redhat.com</email>
+ </editor>
+<!--
+ <othercredit>
+ <affiliation>
+ <orgname><emphasis role="bold"><ulink type="http" url="http://www.jboss.org/gatein/">GateIn Portal</ulink></emphasis> and <emphasis role="bold"><ulink type="http" url="http://www.exoplatform.com/portal/public/website/">Exo Platform</ulink></emphasis> teams</orgname>
+ </affiliation>
+ <contrib>Original product documentation by:</contrib>
+ </othercredit>
+-->
+ </authorgroup>
+
+
+ </bookinfo>
+
+
+
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/Introduction.xml" />
<!--
Table of content in Wiki Format <xi:include
@@ -50,22 +114,5 @@
<!-- GadgetsAdmin -->
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="modules/GadgetsAdmin.xml" />
- <!--
- 11_Support
- http://www.exoplatform.com/portal/public/en/forum?portal:componentId=foru...
- http://faq.exoplatform.com/ http://jira.exoplatform.org/browse/Portal
- -->
-
- <!--
- Deprecated <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="modules/Advanced_User_Guide.xml" /> <xi:include
- xmlns:xi="http://www.w3.org/2001/XInclude"
- href="modules/Create_a_predefined_Portal_Navigation.xml" />
- <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
- href="modules/RTL.xml" /> Was in HowTo <xi:include
- xmlns:xi="http://www.w3.org/2001/XInclude"
- href="modules/Skin_Config.xml" />
- -->
-
</book>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-03-12 13:20:21 UTC (rev 2216)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Dashboard_Portlet.xml 2010-03-12 13:35:18 UTC (rev 2217)
@@ -188,8 +188,9 @@
</step>
<step>
<para>
- Return to your portal and click the Dashboard link in the toolbar.
+ Return to your portal and click <emphasis role="bold">Dashboard</emphasis> in the toolbar.
</para>
+<!--
<mediaobject>
<imageobject role="html">
<imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scale="110"/>
@@ -198,7 +199,7 @@
<imagedata fileref="images/DashboardLink.png" format="PNG" align="center" scalefit="1" contentwidth="150mm"/>
</imageobject>
</mediaobject>
-
+-->
</step>
<step>
<para>
Modified: portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml
===================================================================
--- portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-03-12 13:20:21 UTC (rev 2216)
+++ portal/trunk/docs/user-guide/en/modules/portletsUser/Interface_Portlets.xml 2010-03-12 13:35:18 UTC (rev 2217)
@@ -34,10 +34,10 @@
</para>
<mediaobject>
<imageobject role="html">
- <imagedata fileref="images/PortalHome.png" format="PNG" align="center" scale="110"/>
+ <imagedata fileref="images/Frontpage.png" format="PNG" align="center" scale="110"/>
</imageobject>
<imageobject role="fo">
- <imagedata fileref="images/PortalHome.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" />
+ <imagedata fileref="images/Frontpage.png" format="PNG" align="center" scalefit="1" contentwidth="150mm" />
</imageobject>
</mediaobject>
</listitem>
14 years, 9 months