gatein SVN: r4795 - epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-23 06:21:38 -0400 (Sat, 23 Oct 2010)
New Revision: 4795
Modified:
epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
JBEPP-463: Upgrade eXo JCR to 1.12.5
Won't work without that change
Modified: epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-10-23 09:07:44 UTC (rev 4794)
+++ epp/portal/branches/EPP_5_1_Branch/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-10-23 10:21:38 UTC (rev 4795)
@@ -113,7 +113,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/gatein-nodetypes.xml</value>
<value>jar:/conf/mop-nodetypes.xml</value>
<value>jar:/conf/application-nodetypes.xml</value>
13 years, 8 months
gatein SVN: r4794 - portal/trunk/packaging/tomcat.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-23 05:07:44 -0400 (Sat, 23 Oct 2010)
New Revision: 4794
Added:
portal/trunk/packaging/tomcat/pom.xml
Log:
tomcat packaging didnt have a pom, providing a minimal one
Added: portal/trunk/packaging/tomcat/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pom.xml (rev 0)
+++ portal/trunk/packaging/tomcat/pom.xml 2010-10-23 09:07:44 UTC (rev 4794)
@@ -0,0 +1,13 @@
+<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.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>3.2.0-Beta01-SNAPSHOT</version>
+ </parent>
+ <artifactId>exo.portal.packaging.tomcat</artifactId>
+ <packaging>pom</packaging>
+ <name>GateIn Tomcat package</name>
+</project>
\ No newline at end of file
13 years, 8 months
gatein SVN: r4793 - exo/portal/branches/3.1.x.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-23 04:49:21 -0400 (Sat, 23 Oct 2010)
New Revision: 4793
Modified:
exo/portal/branches/3.1.x/pom.xml
Log:
EXOGTN-121 : Update JCR related dependencies
Modified: exo/portal/branches/3.1.x/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/pom.xml 2010-10-23 08:35:49 UTC (rev 4792)
+++ exo/portal/branches/3.1.x/pom.xml 2010-10-23 08:49:21 UTC (rev 4793)
@@ -49,13 +49,13 @@
<org.gatein.pc.version>2.1.1-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.5.CR01</org.picketlink.idm>
<org.gatein.wsrp.version>1.1.1-GA</org.gatein.wsrp.version>
- <org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
+ <org.gatein.mop.version>1.0.4-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<commons-pool.version>1.2</commons-pool.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.3</version.chromattic>
+ <version.chromattic>1.0.4</version.chromattic>
<version.reflect>1.0.0</version.reflect>
<jcip.version>1.0</jcip.version>
@@ -826,10 +826,10 @@
<profile>
<id>stable</id>
<properties>
- <org.exoplatform.kernel.version>2.2.4-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.4-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.4-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.4-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.5-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.5-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.5-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.5-GA</org.exoplatform.jcr.version>
</properties>
</profile>
13 years, 8 months
gatein SVN: r4792 - in exo/portal/branches/3.1.x: examples and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-23 04:35:49 -0400 (Sat, 23 Oct 2010)
New Revision: 4792
Modified:
exo/portal/branches/3.1.x/docs/pom.xml
exo/portal/branches/3.1.x/examples/pom.xml
Log:
EXOGTN-120 : Profiled build to skip documentation and samples
Modified: exo/portal/branches/3.1.x/docs/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/docs/pom.xml 2010-10-22 21:39:58 UTC (rev 4791)
+++ exo/portal/branches/3.1.x/docs/pom.xml 2010-10-23 08:35:49 UTC (rev 4792)
@@ -34,10 +34,27 @@
<name>GateIn - Portal (docs-aggregator)</name>
<modules>
- <module>user-guide</module>
- <module>reference-guide</module>
+ <!--
+ This is not the default modules declaration, instead we use the "normal" profile that is activated when
+ the development property is not set (to any value). This declaration does not build anything in development mode.
+ -->
</modules>
+ <profiles>
+ <profile>
+ <id>normal</id>
+ <activation>
+ <property>
+ <name>!development</name>
+ </property>
+ </activation>
+ <modules>
+ <module>user-guide</module>
+ <module>reference-guide</module>
+ </modules>
+ </profile>
+ </profiles>
+
<build>
<plugins>
<plugin>
Modified: exo/portal/branches/3.1.x/examples/pom.xml
===================================================================
--- exo/portal/branches/3.1.x/examples/pom.xml 2010-10-22 21:39:58 UTC (rev 4791)
+++ exo/portal/branches/3.1.x/examples/pom.xml 2010-10-23 08:35:49 UTC (rev 4792)
@@ -35,10 +35,35 @@
<name>GateIn Portal Sample</name>
<modules>
- <module>extension</module>
- <module>portal</module>
- <module>portlets</module>
- <module>skins</module>
+ <!--
+ This is not the default modules declaration, instead we use the "normal" profile that is activated when
+ the development property is not set (to any value). This declaration only keeps the necessary for building
+ in development mode, i.e it does not build the other samples.
+
+ It works only for the tomcat version as the JBoss version requires the "extension" and "portal"
+ modules to be built.
+
+ So in short by default it will build everything as usual but if you declare the development=true property
+ to the build, only the skins will be built.
+ -->
+ <module>skins</module>
</modules>
+ <profiles>
+ <profile>
+ <id>normal</id>
+ <activation>
+ <property>
+ <name>!development</name>
+ </property>
+ </activation>
+ <modules>
+ <module>extension</module>
+ <module>portal</module>
+ <module>portlets</module>
+ <module>skins</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
13 years, 8 months
gatein SVN: r4791 - in portal/trunk/component/web/resources/src/main/java/org/exoplatform: web/application/javascript and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 17:39:58 -0400 (Fri, 22 Oct 2010)
New Revision: 4791
Modified:
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java
Log:
- stream potentially not closed when an exception occurs
- use Safe.close(Closeable) when possible
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java 2010-10-22 21:21:07 UTC (rev 4790)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java 2010-10-22 21:39:58 UTC (rev 4791)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.resource;
+import org.exoplatform.commons.utils.Safe;
import org.exoplatform.commons.xml.DocumentSource;
import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.RootContainer.PortalContainerPostInitTask;
@@ -73,36 +74,34 @@
if (waEvent.getType() == WebAppLifeCycleEvent.ADDED)
{
ServletContext scontext = null;
+ InputStream is = null;
try
{
scontext = event.getWebApp().getServletContext();
- InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
- if (is == null)
- return;
- try
+ is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
+ if (is != null)
{
- is.close();
- }
- catch (Exception ex)
- {
- // ignore me
- }
- final PortalContainerPostInitTask task = new PortalContainerPostInitTask()
- {
-
- public void execute(ServletContext scontext, PortalContainer portalContainer)
+ final PortalContainerPostInitTask task = new PortalContainerPostInitTask()
{
- register(scontext, portalContainer);
- skinService.registerContext(scontext);
- }
- };
- PortalContainer.addInitTask(scontext, task, portalContainerName);
+
+ public void execute(ServletContext scontext, PortalContainer portalContainer)
+ {
+ register(scontext, portalContainer);
+ skinService.registerContext(scontext);
+ }
+ };
+ PortalContainer.addInitTask(scontext, task, portalContainerName);
+ }
}
catch (Exception ex)
{
log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '"
+ (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
}
+ finally
+ {
+ Safe.close(is);
+ }
}
}
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2010-10-22 21:21:07 UTC (rev 4790)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2010-10-22 21:39:58 UTC (rev 4791)
@@ -19,6 +19,7 @@
package org.exoplatform.web.application.javascript;
+import org.exoplatform.commons.utils.Safe;
import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.RootContainer.PortalContainerPostInitTask;
import org.exoplatform.services.log.ExoLogger;
@@ -29,7 +30,6 @@
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.picocontainer.Startable;
-import java.io.IOException;
import java.io.InputStream;
import javax.servlet.ServletContext;
@@ -80,37 +80,34 @@
WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event;
if (waEvent.getType() == WebAppLifeCycleEvent.ADDED)
{
+ InputStream is = null;
ServletContext scontext = null;
try
{
scontext = event.getWebApp().getServletContext();
-
- InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
- if (is == null)
- return;
- try
+ is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
+ if (is != null)
{
- is.close();
- }
- catch (Exception ex)
- {
- // ignore me
- }
- final PortalContainerPostInitTask task = new PortalContainerPostInitTask()
- {
-
- public void execute(ServletContext scontext, PortalContainer portalContainer)
+ final PortalContainerPostInitTask task = new PortalContainerPostInitTask()
{
- register(scontext, portalContainer);
- }
- };
- PortalContainer.addInitTask(scontext, task, portalContainerName);
+
+ public void execute(ServletContext scontext, PortalContainer portalContainer)
+ {
+ register(scontext, portalContainer);
+ }
+ };
+ PortalContainer.addInitTask(scontext, task, portalContainerName);
+ }
}
catch (Exception ex)
{
LOG.error("An error occurs while registering 'Javascript in gatein-resources.xml' from the context '"
+ (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
}
+ finally
+ {
+ Safe.close(is);
+ }
}
}
}
@@ -130,17 +127,7 @@
}
finally
{
- if (is != null)
- {
- try
- {
- is.close();
- }
- catch (IOException e)
- {
- // ignore me
- }
- }
+ Safe.close(is);
}
}
}
\ No newline at end of file
13 years, 8 months
gatein SVN: r4790 - portal/trunk/examples.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 17:21:07 -0400 (Fri, 22 Oct 2010)
New Revision: 4790
Modified:
portal/trunk/examples/pom.xml
Log:
GTNPORTAL-1590 : Bypass samples during build on demand
Modified: portal/trunk/examples/pom.xml
===================================================================
--- portal/trunk/examples/pom.xml 2010-10-22 20:46:46 UTC (rev 4789)
+++ portal/trunk/examples/pom.xml 2010-10-22 21:21:07 UTC (rev 4790)
@@ -35,10 +35,35 @@
<name>GateIn Portal Sample</name>
<modules>
- <module>extension</module>
- <module>portal</module>
- <module>portlets</module>
- <module>skins</module>
+ <!--
+ This is not the default modules declaration, instead we use the "normal" profile that is activated when
+ the development property is not set (to any value). This declaration only keeps the necessary for building
+ in development mode, i.e it does not build the other samples.
+
+ It works only for the tomcat version as the JBoss version requires the "extension" and "portal"
+ modules to be built.
+
+ So in short by default it will build everything as usual but if you declare the development=true property
+ to the build, only the skins will be built.
+ -->
+ <module>skins</module>
</modules>
+ <profiles>
+ <profile>
+ <id>normal</id>
+ <activation>
+ <property>
+ <name>!development</name>
+ </property>
+ </activation>
+ <modules>
+ <module>extension</module>
+ <module>portal</module>
+ <module>portlets</module>
+ <module>skins</module>
+ </modules>
+ </profile>
+ </profiles>
+
</project>
13 years, 8 months
gatein SVN: r4789 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 16:46:46 -0400 (Fri, 22 Oct 2010)
New Revision: 4789
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
Log:
GTNPORTAL-1589 : Populate application registry with a WSRP application
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2010-10-22 20:22:09 UTC (rev 4788)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2010-10-22 20:46:46 UTC (rev 4789)
@@ -76,6 +76,79 @@
</component-plugin>
</external-component-plugins>
+ <external-component-plugins>
+ <target-component>org.exoplatform.application.registry.ApplicationRegistryService</target-component>
+ <component-plugin>
+ <name>new.portal.portlets.registry</name>
+ <set-method>initListener</set-method>
+ <type>org.exoplatform.application.registry.ApplicationCategoriesPlugins</type>
+ <description>this listener init the portlets are registered in PortletRegister</description>
+ <init-params>
+ <object-param>
+ <name>administration</name>
+ <description>description</description>
+ <object type="org.exoplatform.application.registry.ApplicationCategory">
+ <field name="name">
+ <string>WSRP</string>
+ </field>
+ <field name="displayName">
+ <string>WSRP</string>
+ </field>
+ <field name="description">
+ <string>WSRP administration</string>
+ </field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList" item-type="java.lang.String">
+ <value>
+ <string>*:/platform/administrators</string>
+ </value>
+ <value>
+ <string>*:/organization/management/executive-board</string>
+ </value>
+ </collection>
+ </field>
+ <field name="applications">
+ <collection type="java.util.ArrayList">
+ <value>
+ <object type="org.exoplatform.application.registry.Application">
+ <field name="applicationName">
+ <string>WSRPConfigurationPortlet</string>
+ </field>
+ <field name="categoryName">
+ <string>WSRP</string>
+ </field>
+ <field name="displayName">
+ <string>WSRP Configuration</string>
+ </field>
+ <field name="description">
+ <string>WSRP Configuration</string>
+ </field>
+ <field name="type">
+ <string>portlet</string>
+ </field>
+ <field name="contentId">
+ <string>wsrp-admin-gui/WSRPConfigurationPortlet</string>
+ </field>
+ <field name="accessPermissions">
+ <collection type="java.util.ArrayList" item-type="java.lang.String">
+ <value>
+ <string>*:/platform/administrators</string>
+ </value>
+ <value>
+ <string>*:/organization/management/executive-board</string>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </value>
+ </collection>
+ </field>
+ </object>
+ </object-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
<!--<external-component-plugins>
<target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
<component-plugin>
13 years, 8 months
gatein SVN: r4788 - in portal/trunk/web/portal/src/main/webapp/WEB-INF/conf: wsrp and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 16:22:09 -0400 (Fri, 22 Oct 2010)
New Revision: 4788
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
Log:
GTNPORTAL-1588: Move WSRP nodetypes and namespaces to the wsrp profile configuration
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-10-22 20:03:48 UTC (rev 4787)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-10-22 20:22:09 UTC (rev 4788)
@@ -99,8 +99,6 @@
<property name="mop" value="http://www.gatein.org/jcr/mop/1.0/"/>
<property name="app" value="http://www.gatein.org/jcr/application-registry/1.0/"/>
<property name="tkn" value="http://www.gatein.org/jcr/token/1.0/"/>
- <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
- <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/>
</properties-param>
</init-params>
</component-plugin>
@@ -118,11 +116,6 @@
<value>jar:/conf/application-nodetypes.xml</value>
<value>jar:/conf/content-nodetypes.xml</value>
<value>jar:/conf/autologin-nodetypes.xml</value>
- <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
- <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
- <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
- <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
- <value>war:/conf/wsrp/migration-nodetypes.xml</value>
</values-param>
</init-params>
</component-plugin>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2010-10-22 20:03:48 UTC (rev 4787)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/wsrp/wsrp-configuration.xml 2010-10-22 20:22:09 UTC (rev 4788)
@@ -44,6 +44,38 @@
</init-params>
</component>
+ <external-component-plugins>
+ <target-component>org.exoplatform.services.jcr.RepositoryService</target-component>
+ <component-plugin>
+ <name>add.namespaces</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNamespacesPlugin</type>
+ <init-params>
+ <properties-param>
+ <name>namespaces</name>
+ <property name="wsrp" value="http://www.gatein.org/jcr/wsrp/1.0/"/>
+ <property name="pc" value="http://www.gatein.org/jcr/pc/1.0/"/>
+ </properties-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
+ <name>add.nodeType</name>
+ <set-method>addPlugin</set-method>
+ <type>org.exoplatform.services.jcr.impl.AddNodeTypePlugin</type>
+ <init-params>
+ <values-param>
+ <name>autoCreatedInNewRepository</name>
+ <description>Node types configuration file</description>
+ <value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
+ <value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
+ <value>war:/conf/wsrp/producer-registrations-nodetypes.xml</value>
+ <value>war:/conf/wsrp/producer-pc-nodetypes.xml</value>
+ <value>war:/conf/wsrp/migration-nodetypes.xml</value>
+ </values-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+
<!--<external-component-plugins>
<target-component>org.exoplatform.commons.chromattic.ChromatticManager</target-component>
<component-plugin>
13 years, 8 months
gatein SVN: r4787 - in portal/trunk: component/web/resources/src/main/java/org/exoplatform/portal/resource and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-10-22 16:03:48 -0400 (Fri, 22 Oct 2010)
New Revision: 4787
Modified:
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
GTNPORTAL-1586 : Remove organization nodetypes
GTNPORTAL-1580 : Revert the change of GTNPORTAL-1477 when we switch to use JCR 1.12.5
GTNPORTAL-1585 : Update JCR related dependencies
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java 2010-10-22 19:21:38 UTC (rev 4786)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/GateInSkinConfigDeployer.java 2010-10-22 20:03:48 UTC (rev 4787)
@@ -19,8 +19,9 @@
package org.exoplatform.portal.resource;
-import org.exoplatform.commons.utils.Safe;
import org.exoplatform.commons.xml.DocumentSource;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.RootContainer.PortalContainerPostInitTask;
import org.exoplatform.portal.resource.config.xml.SkinConfigParser;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
@@ -52,9 +53,15 @@
/** . */
private static final String GATEIN_CONFIG_RESOURCE = "/WEB-INF/gatein-resources.xml";
- public GateInSkinConfigDeployer(SkinService _skinService)
+ /**
+ * The name of the portal container
+ */
+ private final String portalContainerName;
+
+ public GateInSkinConfigDeployer(String portalContainerName, SkinService _skinService)
{
this.skinService = _skinService;
+ this.portalContainerName = portalContainerName;
}
@Override
@@ -65,29 +72,42 @@
WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event;
if (waEvent.getType() == WebAppLifeCycleEvent.ADDED)
{
- ServletContext scontext = event.getWebApp().getServletContext();
- InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
- if (is != null)
+ ServletContext scontext = null;
+ try
{
+ scontext = event.getWebApp().getServletContext();
+ InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
+ if (is == null)
+ return;
try
{
- register(scontext);
+ is.close();
}
catch (Exception ex)
{
- log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '"
- + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
+ // ignore me
}
- finally
+ final PortalContainerPostInitTask task = new PortalContainerPostInitTask()
{
- Safe.close(is);
- }
+
+ public void execute(ServletContext scontext, PortalContainer portalContainer)
+ {
+ register(scontext, portalContainer);
+ skinService.registerContext(scontext);
+ }
+ };
+ PortalContainer.addInitTask(scontext, task, portalContainerName);
}
+ catch (Exception ex)
+ {
+ log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '"
+ + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
+ }
}
}
}
- private void register(ServletContext scontext)
+ private void register(ServletContext scontext, PortalContainer container)
{
URL url;
try
@@ -107,8 +127,5 @@
log.error("An error occurs while registering '" + GATEIN_CONFIG_RESOURCE + "' from the context '"
+ (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
}
-
- //
- skinService.registerContext(scontext);
}
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-10-22 19:21:38 UTC (rev 4786)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-10-22 20:03:48 UTC (rev 4787)
@@ -151,7 +151,7 @@
portletThemes_ = new HashMap<String, Set<String>>();
portalContainerName = context.getPortalContainerName();
mainResolver = new MainResourceResolver(portalContainerName, skinConfigs_);
- deployer = new GateInSkinConfigDeployer(this);
+ deployer = new GateInSkinConfigDeployer(portalContainerName, this);
removal = new GateInSkinConfigRemoval(this);
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-10-22 19:21:38 UTC (rev 4786)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2010-10-22 20:03:48 UTC (rev 4787)
@@ -82,7 +82,7 @@
availableScriptsPaths_ = new ArrayList<String>();
availableScriptsKey_ = new ArrayList<Javascript>();
extendedJavascripts = new HashMap<String, String>();
- deployer = new JavascriptDeployer(this);
+ deployer = new JavascriptDeployer(context.getPortalContainerName(), this);
removal = new JavascriptRemoval(this);
object_view_of_merged_JS = new HashMap<String, List<String>>();
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2010-10-22 19:21:38 UTC (rev 4786)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptDeployer.java 2010-10-22 20:03:48 UTC (rev 4787)
@@ -19,7 +19,8 @@
package org.exoplatform.web.application.javascript;
-import org.exoplatform.commons.utils.Safe;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.RootContainer.PortalContainerPostInitTask;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.gatein.wci.WebAppEvent;
@@ -28,6 +29,7 @@
import org.gatein.wci.impl.DefaultServletContainerFactory;
import org.picocontainer.Startable;
+import java.io.IOException;
import java.io.InputStream;
import javax.servlet.ServletContext;
@@ -50,9 +52,15 @@
/** . */
private final JavascriptConfigService javascriptService;
- public JavascriptDeployer(JavascriptConfigService javascriptService)
+ /**
+ * The name of the portal container
+ */
+ private final String portalContainerName;
+
+ public JavascriptDeployer(String portalContainerName, JavascriptConfigService javascriptService)
{
this.javascriptService = javascriptService;
+ this.portalContainerName = portalContainerName;
}
public void start()
@@ -72,33 +80,47 @@
WebAppLifeCycleEvent waEvent = (WebAppLifeCycleEvent)event;
if (waEvent.getType() == WebAppLifeCycleEvent.ADDED)
{
- ServletContext scontext = event.getWebApp().getServletContext();
- InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
- if (is != null)
+ ServletContext scontext = null;
+ try
{
+ scontext = event.getWebApp().getServletContext();
+
+ InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
+ if (is == null)
+ return;
try
{
- register(scontext);
+ is.close();
}
catch (Exception ex)
{
- LOG.error("An error occurs while registering 'Javascript in gatein-resources.xml' from the context '"
- + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
+ // ignore me
}
- finally
+ final PortalContainerPostInitTask task = new PortalContainerPostInitTask()
{
- Safe.close(is);
- }
+
+ public void execute(ServletContext scontext, PortalContainer portalContainer)
+ {
+ register(scontext, portalContainer);
+ }
+ };
+ PortalContainer.addInitTask(scontext, task, portalContainerName);
}
+ catch (Exception ex)
+ {
+ LOG.error("An error occurs while registering 'Javascript in gatein-resources.xml' from the context '"
+ + (scontext == null ? "unknown" : scontext.getServletContextName()) + "'", ex);
+ }
}
}
}
- private void register(ServletContext scontext)
+ private void register(ServletContext scontext, PortalContainer container)
{
- InputStream is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
+ InputStream is = null;
try
{
+ is = scontext.getResourceAsStream(GATEIN_CONFIG_RESOURCE);
JavascriptConfigParser.processConfigResource(is, javascriptService, scontext);
}
catch (Exception ex)
@@ -108,7 +130,17 @@
}
finally
{
- Safe.close(is);
+ if (is != null)
+ {
+ try
+ {
+ is.close();
+ }
+ catch (IOException e)
+ {
+ // ignore me
+ }
+ }
}
}
}
\ No newline at end of file
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-10-22 19:21:38 UTC (rev 4786)
+++ portal/trunk/pom.xml 2010-10-22 20:03:48 UTC (rev 4787)
@@ -37,10 +37,10 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.2-GA</org.exoplatform.kernel.version>
- <org.exoplatform.core.version>2.3.2-GA</org.exoplatform.core.version>
- <org.exoplatform.ws.version>2.1.2-GA</org.exoplatform.ws.version>
- <org.exoplatform.jcr.version>1.12.2-GA</org.exoplatform.jcr.version>
+ <org.exoplatform.kernel.version>2.2.5-GA</org.exoplatform.kernel.version>
+ <org.exoplatform.core.version>2.3.5-GA</org.exoplatform.core.version>
+ <org.exoplatform.ws.version>2.1.5-GA</org.exoplatform.ws.version>
+ <org.exoplatform.jcr.version>1.12.5-GA</org.exoplatform.jcr.version>
<org.jibx.version>1.2.1</org.jibx.version>
<org.shindig.version>1.0-r790473-Patch04</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
@@ -54,7 +54,7 @@
<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.3</version.chromattic>
+ <version.chromattic>1.0.4</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/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-10-22 19:21:38 UTC (rev 4786)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-10-22 20:03:48 UTC (rev 4787)
@@ -113,7 +113,6 @@
<name>autoCreatedInNewRepository</name>
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
- <value>jar:/conf/organization-nodetypes.xml</value>
<value>jar:/conf/gatein-nodetypes.xml</value>
<value>jar:/conf/mop-nodetypes.xml</value>
<value>jar:/conf/application-nodetypes.xml</value>
13 years, 8 months
gatein SVN: r4786 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-10-22 15:21:38 -0400 (Fri, 22 Oct 2010)
New Revision: 4786
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
JBEPP-557: WSRP update
PC and WSRP upgrade
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-10-22 19:06:21 UTC (rev 4785)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2010-10-22 19:21:38 UTC (rev 4786)
@@ -46,9 +46,9 @@
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.3-GA</org.gatein.common.version>
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
- <org.gatein.pc.version>2.2.0-Beta06</org.gatein.pc.version>
+ <org.gatein.pc.version>2.2.0-CR01</org.gatein.pc.version>
<org.picketlink.idm>1.1.6.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-Beta03</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.0-Beta04</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.3-GA</org.gatein.mop.version>
<org.slf4j.version>1.5.6</org.slf4j.version>
<rhino.version>1.6R5</rhino.version>
13 years, 8 months