gatein SVN: r6388 - in portal/trunk: component/web/resources and 3 other directories.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-04-28 04:57:38 -0400 (Thu, 28 Apr 2011)
New Revision: 6388
Added:
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java
Modified:
portal/trunk/component/web/resources/pom.xml
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java
portal/trunk/pom.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml
Log:
GTNPORTAL-198: Use Closure compiler in Javascript serving engine
Modified: portal/trunk/component/web/resources/pom.xml
===================================================================
--- portal/trunk/component/web/resources/pom.xml 2011-04-28 08:38:44 UTC (rev 6387)
+++ portal/trunk/component/web/resources/pom.xml 2011-04-28 08:57:38 UTC (rev 6388)
@@ -49,6 +49,10 @@
<artifactId>commons-io</artifactId>
</dependency>
<dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
<scope>test</scope>
Added: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java (rev 0)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ClosureCompressorPlugin.java 2011-04-28 08:57:38 UTC (rev 6388)
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2011 eXo Platform SAS.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.exoplatform.portal.resource.compressor.impl;
+
+import com.google.javascript.jscomp.CheckLevel;
+import com.google.javascript.jscomp.CompilationLevel;
+import com.google.javascript.jscomp.Compiler;
+import com.google.javascript.jscomp.CompilerOptions;
+import com.google.javascript.jscomp.JSSourceFile;
+import com.google.javascript.jscomp.WarningLevel;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.portal.resource.compressor.BaseResourceCompressorPlugin;
+import org.exoplatform.portal.resource.compressor.ResourceCompressorException;
+import org.exoplatform.portal.resource.compressor.ResourceType;
+import java.io.Reader;
+import java.io.Writer;
+
+public class ClosureCompressorPlugin extends BaseResourceCompressorPlugin
+{
+
+ public ClosureCompressorPlugin(InitParams params) throws Exception
+ {
+ super(params);
+ }
+
+ public ResourceType getResourceType()
+ {
+ return ResourceType.JAVASCRIPT;
+ }
+
+ public void compress(Reader input, Writer output) throws ResourceCompressorException
+ {
+ Compiler compiler = new Compiler();
+ CompilerOptions options = new CompilerOptions();
+ CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
+ WarningLevel.QUIET.setOptionsForWarningLevel(options);
+ JSSourceFile extern = JSSourceFile.fromCode("extern", "");
+
+ JSSourceFile jsInput;
+ try
+ {
+ String code = JSSourceFile.fromReader("code", input).getCode();
+ jsInput = JSSourceFile.fromCode("jsInput", code);
+ compiler.compile(extern, jsInput, options);
+ output.write(compiler.toSource());
+ }
+ catch (Exception ex)
+ {
+ throw new ResourceCompressorException(ex);
+ }
+ }
+}
Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-04-28 08:38:44 UTC (rev 6387)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/compressor/TestResourceCompressorService.java 2011-04-28 08:57:38 UTC (rev 6388)
@@ -18,19 +18,32 @@
*/
package org.exoplatform.portal.resource.compressor;
+import com.google.javascript.jscomp.*;
+import com.google.javascript.jscomp.Compiler;
+import org.apache.commons.io.IOUtils;
+import org.exoplatform.commons.utils.IOUtil;
import org.exoplatform.component.test.AbstractKernelTest;
import org.exoplatform.component.test.ConfigurationUnit;
import org.exoplatform.component.test.ConfiguredBy;
import org.exoplatform.component.test.ContainerScope;
+import org.exoplatform.container.xml.InitParams;
+import org.exoplatform.container.xml.Parameter;
+import org.exoplatform.container.xml.ValueParam;
+import org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin;
import org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin;
import org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayInputStream;
import java.io.File;
+import java.io.FileInputStream;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
+import java.util.Scanner;
/**
* @author <a href="trong.tran(a)exoplatform.com">Trong Tran</a>
@@ -85,6 +98,66 @@
+ jsCompressedFile.getAbsolutePath() + " (" + getFileSize(jsCompressedFile) + ")");
}
+ public void testClosureCompressing() throws Exception
+ {
+ File jsFile = new File("src/test/resources/javascript.js");
+ File jsCompressedFile = new File("target/closure-compressed-file.js");
+ Reader reader = new FileReader(jsFile);
+ Writer writer = new FileWriter(jsCompressedFile);
+
+ ResourceCompressorService compressor =
+ (ResourceCompressorService)getContainer().getComponentInstanceOfType(ResourceCompressor.class);
+
+ InitParams priorityParam = new InitParams();
+ ValueParam param = new ValueParam();
+ param.setName("plugin.priority");
+ param.setValue("10");
+ priorityParam.addParameter(param);
+ compressor.registerCompressorPlugin(new ClosureCompressorPlugin(priorityParam));
+ try
+ {
+ compressor.compress(reader, writer, ResourceType.JAVASCRIPT);
+ }
+ catch (Exception e)
+ {
+ fail(e.getLocalizedMessage());
+ }
+ finally
+ {
+ reader.close();
+ writer.close();
+ }
+
+ assertTrue(jsCompressedFile.length() > 0);
+ assertTrue(jsFile.length() > jsCompressedFile.length());
+ log.info("The original javascript (" + getFileSize(jsFile) + ") is compressed by CLOSURE COMPILER into "
+ + jsCompressedFile.getAbsolutePath() + " (" + getFileSize(jsCompressedFile) + ")");
+
+ String expectedJS = closureCompress(jsFile);
+ assertEquals(expectedJS.length(), jsCompressedFile.length());
+ }
+
+ private String closureCompress(File input) throws Exception
+ {
+ Compiler compiler = new Compiler();
+ CompilerOptions options = new CompilerOptions();
+ CompilationLevel.SIMPLE_OPTIMIZATIONS.setOptionsForCompilationLevel(options);
+ JSSourceFile extern = JSSourceFile.fromCode("", "");
+
+ JSSourceFile jsInput;
+ try
+ {
+ jsInput = JSSourceFile.fromFile(input);
+ }
+ catch (Exception ex)
+ {
+ throw new ResourceCompressorException(ex);
+ }
+
+ compiler.compile(extern, jsInput, options);
+ return compiler.toSource();
+ }
+
public void testYUICSSCompressing() throws IOException
{
File cssFile = new File("src/test/resources/Stylesheet.css");
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-28 08:38:44 UTC (rev 6387)
+++ portal/trunk/pom.xml 2011-04-28 08:57:38 UTC (rev 6388)
@@ -686,6 +686,12 @@
</dependency>
<dependency>
+ <groupId>com.google.javascript</groupId>
+ <artifactId>closure-compiler</artifactId>
+ <version>r706</version>
+ </dependency>
+
+ <dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
<version>${org.shindig.version}</version>
@@ -746,7 +752,7 @@
<scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<resources>
<resource>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-04-28 08:38:44 UTC (rev 6387)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/resource-compressor-configuration.xml 2011-04-28 08:57:38 UTC (rev 6388)
@@ -27,6 +27,7 @@
<key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key>
<type>org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService</type>
<component-plugins>
+ <!--
<component-plugin>
<name>JSMinCompressorPlugin</name>
<set-method>registerCompressorPlugin</set-method>
@@ -38,7 +39,19 @@
</value-param>
</init-params>
</component-plugin>
+ -->
<component-plugin>
+ <name>ClosureCompressorPlugin</name>
+ <set-method>registerCompressorPlugin</set-method>
+ <type>org.exoplatform.portal.resource.compressor.impl.ClosureCompressorPlugin</type>
+ <init-params>
+ <value-param>
+ <name>plugin.priority</name>
+ <value>2</value>
+ </value-param>
+ </init-params>
+ </component-plugin>
+ <component-plugin>
<name>YUICSSCompressorPlugin</name>
<set-method>registerCompressorPlugin</set-method>
<type>org.exoplatform.portal.resource.compressor.css.YUICSSCompressorPlugin</type>
13 years
gatein SVN: r6387 - epp/portal/branches/EPP_5_1_Branch.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-04-28 04:38:44 -0400 (Thu, 28 Apr 2011)
New Revision: 6387
Modified:
epp/portal/branches/EPP_5_1_Branch/pom.xml
Log:
WSRP to 2.0.1-Beta01
Modified: epp/portal/branches/EPP_5_1_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-28 08:12:43 UTC (rev 6386)
+++ epp/portal/branches/EPP_5_1_Branch/pom.xml 2011-04-28 08:38:44 UTC (rev 6387)
@@ -48,7 +48,7 @@
<org.gatein.wci.version>2.0.2-GA</org.gatein.wci.version>
<org.gatein.pc.version>2.2.0-GA</org.gatein.pc.version>
<org.picketlink.idm>1.1.8.GA</org.picketlink.idm>
- <org.gatein.wsrp.version>2.0.0-EPP51-GA</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.0.1-Beta01</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
gatein SVN: r6386 - epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-04-28 04:12:43 -0400 (Thu, 28 Apr 2011)
New Revision: 6386
Modified:
epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
Log:
JBEPP-902: OOM Issue when starting up with many pages
Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-04-28 07:07:48 UTC (rev 6385)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/NewPortalConfigListener.java 2011-04-28 08:12:43 UTC (rev 6386)
@@ -20,7 +20,9 @@
package org.exoplatform.portal.config;
import org.exoplatform.commons.utils.IOUtil;
+import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.component.BaseComponentPlugin;
+import org.exoplatform.container.component.RequestLifeCycle;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.container.xml.ValueParam;
@@ -129,33 +131,48 @@
public void run() throws Exception
{
- if (dataStorage_.getPortalConfig(defaultPortal) != null)
- return;
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
+ {
+ if (dataStorage_.getPortalConfig(defaultPortal) != null)
+ return;
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
if (isUseTryCatch)
{
-
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- try
+ for (NewPortalConfig ele : configs)
{
- initPortletPreferencesDB(ele);
+ try
+ {
+ initPortletPreferencesDB(ele);
+ }
+ catch (Exception e)
+ {
+ log.error("NewPortalConfig error: " + e.getMessage(), e);
+ }
}
- catch (Exception e)
+ for (NewPortalConfig ele : configs)
{
- log.error("NewPortalConfig error: " + e.getMessage(), e);
+ try
+ {
+ initPortalConfigDB(ele);
+ }
+ catch (Exception e)
+ {
+ log.error("NewPortalConfig error: " + e.getMessage(), e);
+ }
}
}
- for (NewPortalConfig ele : configs)
+ finally
{
- try
- {
- initPortalConfigDB(ele);
- }
- catch (Exception e)
- {
- log.error("NewPortalConfig error: " + e.getMessage(), e);
- }
+ RequestLifeCycle.end();
}
for (NewPortalConfig ele : configs)
{
@@ -168,17 +185,25 @@
log.error("NewPortalConfig error: " + e.getMessage(), e);
}
}
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- try
+ for (NewPortalConfig ele : configs)
{
- initPageNavigationDB(ele);
+ try
+ {
+ initPageNavigationDB(ele);
+ }
+ catch (Exception e)
+ {
+ log.error("NewPortalConfig error: " + e.getMessage(), e);
+ }
}
- catch (Exception e)
- {
- log.error("NewPortalConfig error: " + e.getMessage(), e);
- }
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
for (NewPortalConfig ele : configs)
{
try
@@ -194,22 +219,38 @@
}
else
{
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- initPortletPreferencesDB(ele);
+ for (NewPortalConfig ele : configs)
+ {
+ initPortletPreferencesDB(ele);
+ }
+ for (NewPortalConfig ele : configs)
+ {
+ initPortalConfigDB(ele);
+ }
}
- for (NewPortalConfig ele : configs)
+ finally
{
- initPortalConfigDB(ele);
+ RequestLifeCycle.end();
}
for (NewPortalConfig ele : configs)
{
initPageDB(ele);
}
- for (NewPortalConfig ele : configs)
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
{
- initPageNavigationDB(ele);
+ for (NewPortalConfig ele : configs)
+ {
+ initPageNavigationDB(ele);
+ }
}
+ finally
+ {
+ RequestLifeCycle.end();
+ }
for (NewPortalConfig ele : configs)
{
ele.getPredefinedOwner().clear();
@@ -369,7 +410,15 @@
ArrayList<Page> list = pageSet.getPages();
for (Page page : list)
{
- dataStorage_.create(page);
+ RequestLifeCycle.begin(PortalContainer.getInstance());
+ try
+ {
+ dataStorage_.create(page);
+ }
+ finally
+ {
+ RequestLifeCycle.end();
+ }
}
}
Modified: epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java
===================================================================
--- epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2011-04-28 07:07:48 UTC (rev 6385)
+++ epp/portal/branches/EPP_5_1_Branch/component/portal/src/main/java/org/exoplatform/portal/config/UserPortalConfigService.java 2011-04-28 08:12:43 UTC (rev 6386)
@@ -691,19 +691,12 @@
}
//
- RequestLifeCycle.begin(PortalContainer.getInstance());
-
newPortalConfigListener_.run();
}
catch (Exception e)
{
log.error("Could not import initial data", e);
-
}
- finally
- {
- RequestLifeCycle.end();
- }
}
public void stop()
13 years
gatein SVN: r6385 - portal/branches/branch-GTNPORTAL-1872/examples/portal/war/src/main/webapp/WEB-INF.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2011-04-28 03:07:48 -0400 (Thu, 28 Apr 2011)
New Revision: 6385
Modified:
portal/branches/branch-GTNPORTAL-1872/examples/portal/war/src/main/webapp/WEB-INF/web.xml
Log:
GTNPORTAL-1855: The GenericFilter should be called after the request context has been properly set
Modified: portal/branches/branch-GTNPORTAL-1872/examples/portal/war/src/main/webapp/WEB-INF/web.xml
===================================================================
--- portal/branches/branch-GTNPORTAL-1872/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-04-27 21:23:28 UTC (rev 6384)
+++ portal/branches/branch-GTNPORTAL-1872/examples/portal/war/src/main/webapp/WEB-INF/web.xml 2011-04-28 07:07:48 UTC (rev 6385)
@@ -85,11 +85,6 @@
</filter-mapping>
<filter-mapping>
- <filter-name>GenericFilter</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <filter-mapping>
<filter-name>ResourceRequestFilter</filter-name>
<url-pattern>*.css</url-pattern>
</filter-mapping>
@@ -134,6 +129,12 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>GenericFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+
<!-- ================================================================== -->
<!-- LISTENER -->
<!-- ================================================================== -->
13 years
gatein SVN: r6384 - in portal/branches/global-portlet-metadata: packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein and 2 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-27 17:23:28 -0400 (Wed, 27 Apr 2011)
New Revision: 6384
Added:
portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java
Removed:
portal/branches/global-portlet-metadata/component/pc/src/main/java/org/exoplatform/portal/pc/filter/
Modified:
portal/branches/global-portlet-metadata/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml
portal/branches/global-portlet-metadata/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml
Log:
wire portlet application monitoring with ApplicationStatisticService
Modified: portal/branches/global-portlet-metadata/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml
===================================================================
--- portal/branches/global-portlet-metadata/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml 2011-04-27 19:37:42 UTC (rev 6383)
+++ portal/branches/global-portlet-metadata/packaging/jboss-as5/pkg/src/main/resources/jboss/server/default/conf/gatein/portlet.xml 2011-04-27 21:23:28 UTC (rev 6384)
@@ -23,10 +23,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+ <!-- This filter collects runtime request statistics -->
<filter>
- <filter-name>RenderPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.RenderPerformanceFilter</filter-class>
+ <filter-name>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-name>
+ <filter-class>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
<lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
<init-params>
<init-param>
<name>org.gatein.portlet.global.exclude</name>
@@ -35,22 +39,4 @@
</init-params>
</filter>
- <filter>
- <filter-name>ActionProcessingPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.ActionProcessingPerformanceFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- </filter>
-
- <filter>
- <filter-name>EventHandlingPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.EventHandlingPerformanceFilter</filter-class>
- <lifecycle>EVENT_PHASE</lifecycle>
- </filter>
-
- <filter>
- <filter-name>ResourceServingPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.ResourceServingPerformanceFilter</filter-class>
- <lifecycle>RESOURCE_PHASE</lifecycle>
- </filter>
-
</portlet-app>
Modified: portal/branches/global-portlet-metadata/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml
===================================================================
--- portal/branches/global-portlet-metadata/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml 2011-04-27 19:37:42 UTC (rev 6383)
+++ portal/branches/global-portlet-metadata/packaging/tomcat/pkg/src/main/resources/tomcat/gatein/conf/portlet.xml 2011-04-27 21:23:28 UTC (rev 6384)
@@ -23,10 +23,14 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd">
+ <!-- This filter collects runtime request statistics -->
<filter>
- <filter-name>RenderPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.RenderPerformanceFilter</filter-class>
+ <filter-name>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-name>
+ <filter-class>org.exoplatform.portal.application.ApplicationMonitoringFilter</filter-class>
+ <lifecycle>ACTION_PHASE</lifecycle>
<lifecycle>RENDER_PHASE</lifecycle>
+ <lifecycle>EVENT_PHASE</lifecycle>
+ <lifecycle>RESOURCE_PHASE</lifecycle>
<init-params>
<init-param>
<name>org.gatein.portlet.global.exclude</name>
@@ -35,22 +39,4 @@
</init-params>
</filter>
- <filter>
- <filter-name>ActionProcessingPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.ActionProcessingPerformanceFilter</filter-class>
- <lifecycle>ACTION_PHASE</lifecycle>
- </filter>
-
- <filter>
- <filter-name>EventHandlingPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.EventHandlingPerformanceFilter</filter-class>
- <lifecycle>EVENT_PHASE</lifecycle>
- </filter>
-
- <filter>
- <filter-name>ResourceServingPerformanceFilter</filter-name>
- <filter-class>org.exoplatform.portal.pc.filter.ResourceServingPerformanceFilter</filter-class>
- <lifecycle>RESOURCE_PHASE</lifecycle>
- </filter>
-
</portlet-app>
Added: portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java
===================================================================
--- portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java (rev 0)
+++ portal/branches/global-portlet-metadata/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationMonitoringFilter.java 2011-04-27 21:23:28 UTC (rev 6384)
@@ -0,0 +1,120 @@
+package org.exoplatform.portal.application;
+
+import org.exoplatform.container.PortalContainer;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.EventRequest;
+import javax.portlet.EventResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceRequest;
+import javax.portlet.ResourceResponse;
+import javax.portlet.filter.ActionFilter;
+import javax.portlet.filter.EventFilter;
+import javax.portlet.filter.FilterChain;
+import javax.portlet.filter.FilterConfig;
+import javax.portlet.filter.RenderFilter;
+import javax.portlet.filter.ResourceFilter;
+import java.io.IOException;
+
+/**
+ * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a>
+ * @date 4/5/11
+ */
+public class ApplicationMonitoringFilter implements ActionFilter, RenderFilter, EventFilter, ResourceFilter
+{
+
+ public void init(FilterConfig cfg) throws PortletException
+ {
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ActionRequest req, ActionResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ public void doFilter(EventRequest req, EventResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ public void doFilter(RenderRequest req, RenderResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ public void doFilter(ResourceRequest req, ResourceResponse resp, FilterChain chain) throws IOException, PortletException
+ {
+ ApplicationStatistic stat = get(req);
+ if (stat != null)
+ {
+ long t = -System.currentTimeMillis();
+ chain.doFilter(req, resp);
+ t += System.currentTimeMillis();
+ stat.logTime(t);
+ }
+ else
+ {
+ chain.doFilter(req, resp);
+ }
+ }
+
+ private ApplicationStatistic get(PortletRequest req) throws IOException, PortletException
+ {
+ PortalContainer container = PortalContainer.getInstance();
+ ApplicationStatisticService service = (ApplicationStatisticService)container.getComponentInstance(ApplicationStatisticService.class);
+ if (service != null)
+ {
+ PortletConfig portletConfig = (PortletConfig)req.getAttribute("javax.portlet.config");
+ String portletName = portletConfig.getPortletName();
+ String phase = (String)req.getAttribute(PortletRequest.LIFECYCLE_PHASE);
+ String applicationId = portletName + "/" + phase;
+ return service.getApplicationStatistic(applicationId);
+ }
+ else
+ {
+ return null;
+ }
+ }
+}
13 years
gatein SVN: r6383 - portal/trunk.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-04-27 15:37:42 -0400 (Wed, 27 Apr 2011)
New Revision: 6383
Modified:
portal/trunk/README.txt
Log:
GTNPORTAL-1812 Packaging that supports JBossAS6 and does away with javascript packager
- updated the README.txt to reflect changes in the build
Modified: portal/trunk/README.txt
===================================================================
--- portal/trunk/README.txt 2011-04-27 19:29:38 UTC (rev 6382)
+++ portal/trunk/README.txt 2011-04-27 19:37:42 UTC (rev 6383)
@@ -1,50 +1,242 @@
-Welcome to GateIn:
-===========================
-This will explain you how to build a package of GateIn with Tomcat or JBoss.
+Welcome to GateIn
+==================
-*****************
-* COMPILATION
-*****************
+This document explains how to build and package GateIn with Tomcat or JBoss.
-* mvn install
-For example: mvn install
-Note: If you run "mvn install" twice in a row without cleaning, one test will
-fail. To workaround this issue you will need to delete the test data located
-here: component/portal/target/temp/
+Prerequisites
+=============
-**********************
-* MAVEN CONFIGURATION:
-**********************
+- Java Development Kit 1.6
+- Recent Subversion client
+- Recent Maven 3 (might work with Maven 2.2.1 as well)
-* edit packaging/profiles.xml and replace the values mentioned so that:
- * ${exo.projects.directory.dependencies} directory contains :
- ** ${exo.projects.app.tomcat.version}/ a clean Tomcat installation, to be used as packaging template
- ** ${exo.projects.app.jboss.version}/ a clean JBoss installation, to be used as packaging template
-* See http://maven.apache.org/guides/introduction/introduction-to-profiles.html for more informations
-
-Alternatively you can edit your local settings.xml to add the information
-provided in profiles.xml. It will override what's in the provided file.
+Build instructions
+==================
-*****************
-* PACKAGING:
-*****************
-* mvn install -Ppkg-tomcat
-** Creates a Tomcat delivery in packaging/pkg/target/tomcat/
+1) Check out GateIn Portal
+--------------------------
-* mvn install -Ppkg-jbossas
-** Creates a JBossAS delivery in packaging/pkg/target/jboss/
+svn co http://anonsvn.jboss.org/repos/gatein/portal/trunk gatein-portal
+cd gatein-portal
-*****************
-* STARTING:
-*****************
-* On Tomcat: go to the tomcat directory (or unzip the archive in your favorite location) and execute 'bin/gatein.sh start' ('bin/gatein.bat start' on Windows)
-* Alternatively you can use the run command to execute GateIn in the current window 'bin/gatein.sh run' ('bin/gaete.bar run' on Windows)
-* The gatein.sh script can be passed additional arguments between the gatein.sh script and the tomcat command 'bin/gatein.sh -Dfoo=bar run'
-* On JBoss: go to the jboss directory (or unzip the archive in your favorite location) and execute 'bin/run.sh start' ('bin/run.bat start' on Windows)
-* Go to http://localhost:8080/portal to see the homepage of the portal. That's it.
+2) Prepare containers to use for packaging
+------------------------------------------
+
+Create a directory on your disk that will contain specific released versions of JBoss AS, Tomcat, Jetty, or some other container, used as a template for GateIn packaging.
+
+Let’s refer to this directory as CONTAINERS_DIR.
+
+
+3) Build and package gatein-portal
+----------------------------------
+
+GateIn can be packaged with different web / application servers. The specific container to use is selected by using an appropriate profile.
+
+
+ Packaging with JBoss-AS-5.1.0.GA
+ --------------------------------
+
+If you don’t have an existing JBoss AS distribution, tell the build to automatically download it for you.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-jbossas5,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
+
+
+If you have an existing JBoss-AS-5.1.0.GA distribution from jboss.org, unpack it into CONTAINERS_DIR directory so that you get CONTAINERS_DIR/jboss-5.1.0.GA directory.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-jbossas5 -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
+
+The packaged GateIn is available in packaging/jboss-as5/pkg/target/jboss.
+
+To start, go to jboss directory, and run 'bin/run.sh' ('bin\run.bat' on Windows).
+
+Access the portal at: http://localhost:8080/portal
+
+
+ Packaging with JBoss-AS-6.0.0.Final
+ -----------------------------------
+
+If you don’t have an existing JBoss-AS distribution, tell the build to automatically download it for you.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-jbossas6,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
+
+
+If you have an existing JBoss-AS-6.0.0.Final distribution from jboss.org, unpack it into CONTAINERS_DIR directory so that you get CONTAINERS_DIR/jboss-6.0.0.Final directory.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-jbossas6 -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
+
+The packaged GateIn is available in packaging/jboss-as6/pkg/target/jboss.
+
+To start, go to jboss directory, and run 'bin/run.sh' ('bin\run.bat' on Windows)
+
+Access the portal at: http://localhost:8080/portal
+
+
+ Packaging with Tomcat 6.x.x
+ ---------------------------
+
+If you don’t have an existing Tomcat 6.x.x distribution from tomcat.apache.org, tell the build to automatically download it for you.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-tomcat,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
+
+
+If you have an existing Tomcat 6.x.x distribution from tomcat.apache.org, unpack it into CONTAINERS_DIR directory so that you get CONTAINERS_DIR/apache-tomcat-6.x.x directory.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-tomcat -Dexo.projects.directory.dependencies=$CONTAINERS_DIR -Dexo.projects.app.tomcat.version=apache-tomcat-6.x.x
+
+(where apache-tomcat-6.x.x refers to a directory under $CONTAINERS_DIR directory - adjust appropriately to match your version)
+
+The packaged GateIn is available in packaging/tomcat/pkg/tc6/target/tomcat6.
+
+To start, go to tomcat6 directory, and run 'bin/gatein.sh start' ('bin\gatein.bat start' on Windows).
+Alternatively you can use 'bin/gatein.sh run' ('bin\gatein.bat run' on Windows).
+
+Access the portal at: http://localhost:8080/portal
+
+
+ Packaging with Tomcat 7.x.x
+ ---------------------------
+
+If you don’t have an existing Tomcat 7.x.x distribution from tomcat.apache.org, tell the build to automatically download it for you.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-tomcat7,download -Dexo.projects.directory.dependencies=$CONTAINERS_DIR
+
+If you have an existing Tomcat 7.x.x distribution from tomcat.apache.org, unpack it into CONTAINERS_DIR directory so that you get CONTAINERS_DIR/apache-tomcat-7.x.x directory.
+Issue the following command:
+
+mvn clean install -DskipTests -Ppkg-tomcat7 -Dexo.projects.directory.dependencies=$CONTAINERS_DIR -Dexo.projects.app.tomcat7.version=apache-tomcat-7.x.x
+
+(where apache-tomcat-7.x.x refers to a directory under $CONTAINERS_DIR directory - adjust appropriately to match your version)
+
+The packaged GateIn is available in packaging/tomcat/pkg/tc7/target/tomcat7.
+
+To start, go to tomcat7 directory, and run 'bin/gatein.sh start' ('bin\gatein.bat start' on Windows).
+Alternatively you can use 'bin/gatein.sh run' ('bin\gatein.bat run' on Windows).
+
+Access the portal at: http://localhost:8080/portal
+
+
+Troubleshooting
+===============
+
+
+Maven dependencies issues
+-------------------------
+
+While GateIn should build without any extra maven repository configuration it may happen that the build complains about missing artifacts.
+
+If you encounter this situation, please let us know via our forums (http://community.jboss.org/en/gatein?view=discussions).
+
+As a quick workaround you may try setting up maven repositories as follows.
+
+Create file settings.xml in $HOME/.m2 (%HOMEPATH%\.m2 on Windows) with the following content:
+
+<settings>
+ <profiles>
+ <profile>
+ <id>jboss-public-repository</id>
+ <repositories>
+ <repository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>jboss-public-repository-group</id>
+ <name>JBoss Public Maven Repository Group</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public-jboss/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+
+ <profile>
+ <id>exo-public-repository</id>
+ <repositories>
+ <repository>
+ <id>exo-public-repository-group</id>
+ <name>eXo Public Maven Repository Group</name>
+ <url>http://repository.exoplatform.org/content/groups/public</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>exo-public-repository-group</id>
+ <name>eXo Public Maven Repository Group</name>
+ <url>http://repository.exoplatform.org/content/groups/public</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ </pluginRepository>
+ </pluginRepositories>
+ </profile>
+ </profiles>
+
+ <activeProfiles>
+ <activeProfile>jboss-public-repository</activeProfile>
+ <activeProfile>exo-public-repository</activeProfile>
+ </activeProfiles>
+</settings>
+
+
+Normally you should not need to configure this to build GateIn.
+
+
+Stuck?
+------
+
+Check user forums: http://community.jboss.org/en/gatein?view=discussions
+
+
+Have some ideas, suggestions, want to contribute?
+-------------------------------------------------
+
+Join the discussions on forums at www.gatein.org or at #gatein-contrib IRC channel on freenode.net
+
+
13 years
gatein SVN: r6382 - in portal/trunk: gadgets/server and 4 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-27 15:29:38 -0400 (Wed, 27 Apr 2011)
New Revision: 6382
Modified:
portal/trunk/gadgets/server/pom.xml
portal/trunk/packaging/jboss-as5/pkg/pom.xml
portal/trunk/packaging/jboss-as6/pkg/pom.xml
portal/trunk/packaging/jetty/pkg/pom.xml
portal/trunk/packaging/tomcat/pkg/pom.xml
portal/trunk/pom.xml
Log:
GTNPORTAL-1885 : Update gatein-dep to 1.1.0-Beta02 and Shindig 1.0-r790473-Patch06
Modified: portal/trunk/gadgets/server/pom.xml
===================================================================
--- portal/trunk/gadgets/server/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/gadgets/server/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -102,8 +102,8 @@
</dependency>
-->
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -622,8 +622,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/packaging/jboss-as6/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/jboss-as6/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -613,8 +613,8 @@
<version>2.0.235</version>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/packaging/jetty/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/jetty/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/jetty/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -582,8 +582,8 @@
<artifactId>filters</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/packaging/tomcat/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/tomcat/pkg/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/packaging/tomcat/pkg/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -580,8 +580,8 @@
<artifactId>filters</artifactId>
</dependency>
<dependency>
- <groupId>com.google.collections</groupId>
- <artifactId>google-collections</artifactId>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>org.codehaus.groovy</groupId>
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
+++ portal/trunk/pom.xml 2011-04-27 19:29:38 UTC (rev 6382)
@@ -42,7 +42,7 @@
<org.exoplatform.core.version>2.4.0-CR1</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.2.0-CR1</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.14.0-CR1</org.exoplatform.jcr.version>
- <org.shindig.version>1.0-r790473-Patch05</org.shindig.version>
+ <org.shindig.version>1.0-r790473-Patch06</org.shindig.version>
<nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>
<org.gatein.common.version>2.0.4-Beta02</org.gatein.common.version>
<org.gatein.wci.version>2.1.0-Beta02</org.gatein.wci.version>
@@ -89,7 +89,7 @@
<dependency>
<groupId>org.gatein</groupId>
<artifactId>gatein-dep</artifactId>
- <version>1.1.0-Beta01</version>
+ <version>1.1.0-Beta02</version>
<type>pom</type>
<scope>import</scope>
</dependency>
13 years
gatein SVN: r6381 - in components/shindig/trunk: features and 6 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-27 13:27:38 -0400 (Wed, 27 Apr 2011)
New Revision: 6381
Modified:
components/shindig/trunk/features/pom.xml
components/shindig/trunk/java/common/pom.xml
components/shindig/trunk/java/gadgets/pom.xml
components/shindig/trunk/java/pom.xml
components/shindig/trunk/java/samples/pom.xml
components/shindig/trunk/java/server/pom.xml
components/shindig/trunk/java/social-api/pom.xml
components/shindig/trunk/pom.xml
Log:
finishing release by hand : updating pom to SNAPSHOT
Modified: components/shindig/trunk/features/pom.xml
===================================================================
--- components/shindig/trunk/features/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/features/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -23,12 +23,12 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shindig-features</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Apache Shindig Features</name>
Modified: components/shindig/trunk/java/common/pom.xml
===================================================================
--- components/shindig/trunk/java/common/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/java/common/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/java/gadgets/pom.xml
===================================================================
--- components/shindig/trunk/java/gadgets/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/java/gadgets/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/java/pom.xml
===================================================================
--- components/shindig/trunk/java/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/java/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -22,11 +22,11 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
</parent>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Shindig Project Parent</name>
Modified: components/shindig/trunk/java/samples/pom.xml
===================================================================
--- components/shindig/trunk/java/samples/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/java/samples/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT-SNAPSHOT</version>
</parent>
<artifactId>shindig-samples</artifactId>
Modified: components/shindig/trunk/java/server/pom.xml
===================================================================
--- components/shindig/trunk/java/server/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/java/server/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/java/social-api/pom.xml
===================================================================
--- components/shindig/trunk/java/social-api/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/java/social-api/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/pom.xml
===================================================================
--- components/shindig/trunk/pom.xml 2011-04-27 17:21:33 UTC (rev 6380)
+++ components/shindig/trunk/pom.xml 2011-04-27 17:27:38 UTC (rev 6381)
@@ -28,7 +28,7 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Shindig Project</name>
@@ -48,9 +48,9 @@
<!-- S C M -->
<!-- ====================================================================== -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk</url>
</scm>
<!-- ====================================================================== -->
@@ -1244,32 +1244,32 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-features</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-server</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <version>1.0-r790473-Patch06</version>
+ <version>1.0-r790473-Patch07-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
13 years
gatein SVN: r6380 - components/shindig/tags.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-27 13:21:33 -0400 (Wed, 27 Apr 2011)
New Revision: 6380
Added:
components/shindig/tags/1.0-r790473-Patch06/
Log:
tagging by hand, somehow maven release plugin failed but update the trunk version to the tag
13 years
gatein SVN: r6379 - in components/shindig/trunk: features and 5 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-04-27 13:16:57 -0400 (Wed, 27 Apr 2011)
New Revision: 6379
Modified:
components/shindig/trunk/features/pom.xml
components/shindig/trunk/java/common/pom.xml
components/shindig/trunk/java/gadgets/pom.xml
components/shindig/trunk/java/pom.xml
components/shindig/trunk/java/server/pom.xml
components/shindig/trunk/java/social-api/pom.xml
components/shindig/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0-r790473-Patch06
Modified: components/shindig/trunk/features/pom.xml
===================================================================
--- components/shindig/trunk/features/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/features/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -23,12 +23,12 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<relativePath>../pom.xml</relativePath>
</parent>
<artifactId>shindig-features</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<packaging>jar</packaging>
<name>Apache Shindig Features</name>
Modified: components/shindig/trunk/java/common/pom.xml
===================================================================
--- components/shindig/trunk/java/common/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/java/common/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/java/gadgets/pom.xml
===================================================================
--- components/shindig/trunk/java/gadgets/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/java/gadgets/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/java/pom.xml
===================================================================
--- components/shindig/trunk/java/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/java/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -22,11 +22,11 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
</parent>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<packaging>pom</packaging>
<name>Apache Shindig Project Parent</name>
Modified: components/shindig/trunk/java/server/pom.xml
===================================================================
--- components/shindig/trunk/java/server/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/java/server/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/java/social-api/pom.xml
===================================================================
--- components/shindig/trunk/java/social-api/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/java/social-api/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: components/shindig/trunk/pom.xml
===================================================================
--- components/shindig/trunk/pom.xml 2011-04-27 17:12:56 UTC (rev 6378)
+++ components/shindig/trunk/pom.xml 2011-04-27 17:16:57 UTC (rev 6379)
@@ -28,7 +28,7 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<packaging>pom</packaging>
<name>Apache Shindig Project</name>
@@ -48,9 +48,9 @@
<!-- S C M -->
<!-- ====================================================================== -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
</scm>
<!-- ====================================================================== -->
@@ -1244,32 +1244,32 @@
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-features</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-gadgets</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-server</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-social-api</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
</dependency>
<dependency>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-common</artifactId>
- <version>1.0-r790473-Patch06-SNAPSHOT</version>
+ <version>1.0-r790473-Patch06</version>
<type>test-jar</type>
</dependency>
13 years