gatein SVN: r7703 - in epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090: component/identity/src/main/java/org/exoplatform/services/organization/idm and 1 other directories.
by do-not-reply＠jboss.org
Author: ghjboss
Date: 2011-10-10 12:00:54 -0400 (Mon, 10 Oct 2011)
New Revision: 7703
Modified:
epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java
epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/pom.xml
epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
fix for JBEPP-1090
Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java
===================================================================
--- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java 2011-10-10 15:38:44 UTC (rev 7702)
+++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java 2011-10-10 16:00:54 UTC (rev 7703)
@@ -6,6 +6,9 @@
import org.jboss.cache.DefaultCacheFactory;
import org.jboss.cache.Fqn;
import org.jboss.cache.Node;
+import org.jboss.cache.eviction.ExpirationAlgorithmConfig;
+import org.jboss.cache.eviction.ExpirationConfiguration;
+
import org.picketlink.idm.api.Group;
import org.picketlink.idm.api.User;
@@ -55,6 +58,8 @@
public static final String NODE_OBJECT_KEY = "object";
+ private int expiration = -1;
+
private Fqn getRootNode()
{
return Fqn.fromString("/" + MAIN_ROOT);
@@ -152,7 +157,8 @@
if (ioNode != null)
{
ioNode.put(NODE_OBJECT_KEY, id);
-
+ setExpiration(ioNode);
+
if (log.isLoggable(Level.FINER))
{
@@ -205,8 +211,9 @@
if (ioNode != null)
{
- ioNode.put(NODE_OBJECT_KEY, rootGroup);
-
+ setExpiration(ioNode);
+ ioNode.put(NODE_OBJECT_KEY, rootGroup);
+
if (log.isLoggable(Level.FINER))
{
@@ -241,5 +248,24 @@
return null;
}
+
+ public void setExpiration(Node node)
+ {
+ if (expiration != -1 && expiration > 0)
+ {
+ Long future = new Long(System.currentTimeMillis() + expiration);
+ node.put(ExpirationAlgorithmConfig.EXPIRATION_KEY, future);
+ }
+ }
+ public int getExpiration()
+ {
+ return expiration;
+ }
+
+ public void setExpiration(int expiration)
+ {
+ this.expiration = expiration;
+ }
+
}
Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java
===================================================================
--- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-10-10 15:38:44 UTC (rev 7702)
+++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/component/identity/src/main/java/org/exoplatform/services/organization/idm/PicketLinkIDMServiceImpl.java 2011-10-10 16:00:54 UTC (rev 7703)
@@ -70,6 +70,8 @@
public static final String CACHE_CONFIG_STORE_OPTION = "storeCacheConfig";
+ public static final String CACHE_EXPIRATION = "cacheExpiration";
+
private IdentitySessionFactory identitySessionFactory;
private String config;
@@ -96,6 +98,7 @@
ValueParam realmName = initParams.getValueParam(REALM_NAME_OPTION);
ValueParam apiCacheConfig = initParams.getValueParam(CACHE_CONFIG_API_OPTION);
ValueParam storeCacheConfig = initParams.getValueParam(CACHE_CONFIG_STORE_OPTION);
+ ValueParam cacheExpirationParam = initParams.getValueParam(CACHE_EXPIRATION);
if (config == null && jndiName == null)
{
@@ -125,7 +128,16 @@
identityConfiguration = new IdentityConfigurationImpl().configure(configMD);
identityConfiguration.getIdentityConfigurationRegistry().register(hibernateService.getSessionFactory(), "hibernateSessionFactory");
+
+ int expiration = -1;
+ if (cacheExpirationParam != null &&
+ cacheExpirationParam.getValue() != null &&
+ cacheExpirationParam.getValue().length() > 0)
+ {
+ expiration = Integer.decode(cacheExpirationParam.getValue());
+ }
+
if (apiCacheConfig != null)
{
InputStream configStream = confManager.getInputStream(apiCacheConfig.getValue());
@@ -147,12 +159,14 @@
// PLIDM API cache
JBossCacheAPICacheProviderImpl apiCacheProvider = new JBossCacheAPICacheProviderImpl();
+ apiCacheProvider.setExpiration(expiration);
apiCacheProvider.initialize(cache);
picketLinkIDMCache.register(apiCacheProvider);
identityConfiguration.getIdentityConfigurationRegistry().register(apiCacheProvider, "apiCacheProvider");
//Integration cache
integrationCache = new IntegrationCache();
+ integrationCache.setExpiration(expiration);
integrationCache.initialize(cache);
picketLinkIDMCache.register(apiCacheProvider);
@@ -162,6 +176,7 @@
InputStream configStream = confManager.getInputStream(storeCacheConfig.getValue());
JBossCacheIdentityStoreCacheProviderImpl storeCacheProvider = new JBossCacheIdentityStoreCacheProviderImpl();
+ storeCacheProvider.setExpiration(expiration);
storeCacheProvider.initialize(configStream);
picketLinkIDMCache.register(storeCacheProvider);
identityConfiguration.getIdentityConfigurationRegistry().register(storeCacheProvider, "storeCacheProvider");
Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/pom.xml 2011-10-10 15:38:44 UTC (rev 7702)
+++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/pom.xml 2011-10-10 16:00:54 UTC (rev 7703)
@@ -47,7 +47,7 @@
<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-GA</org.gatein.pc.version>
- <org.picketlink.idm>1.1.7.GA</org.picketlink.idm>
+ <org.picketlink.idm>1.1.9.GA</org.picketlink.idm>
<org.gatein.wsrp.version>2.0.0-epp51-GA</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>
Modified: epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-10 15:38:44 UTC (rev 7702)
+++ epp/portal/branches/EPP_5_1_0_GA_JBEPP-1090/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2011-10-10 16:00:54 UTC (rev 7703)
@@ -109,6 +109,11 @@
<name>storeCacheConfig</name>
<value>war:/conf/organization/picketlink-idm/jboss-cache-cluster.xml</value>
</value-param>
+
+ <value-param>
+ <name>cacheExpiration</name>
+ <value>2000</value>
+ </value-param>
</init-params>
</component>
13 years, 3 months
- 1
- 0
gatein SVN: r7702 - portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-10-10 11:38:44 -0400 (Mon, 10 Oct 2011)
New Revision: 7702
Modified:
portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java
Log:
GTNPORTAL-2161: Inconsistency in Export/Import Gadget UI after attempting to import invalid file.
Modified: portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java
===================================================================
--- portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java 2011-10-10 15:05:02 UTC (rev 7701)
+++ portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java 2011-10-10 15:38:44 UTC (rev 7702)
@@ -58,6 +58,7 @@
import com.google.gwt.user.client.ui.ScrollPanel;
import com.google.gwt.user.client.ui.Tree;
import com.google.gwt.user.client.ui.TreeItem;
+import gwtupload.client.IUploadStatus;
import gwtupload.client.IUploader;
import gwtupload.client.MultiUploader;
@@ -302,37 +303,40 @@
public void onStart(IUploader uploader)
{
- statusLabel.setText("Process in progress...");
- statusLabel.setStyleName("progress-style");
- statusImg.setStyleName("progress-style-icon");
- importModeListBox.setEnabled(false);
- importButton.setEnabled(false);
- if (!isShwon)
+ if (uploader.getStatus() == IUploadStatus.Status.INPROGRESS)
{
- statusPanel.setStyleName("status-panel");
- statusPanel.setSize("380px", "0px");
- absolutePanel.add(statusPanel, 10, 120);
-
- Timer t = new Timer()
+ statusLabel.setText("Process in progress...");
+ statusLabel.setStyleName("progress-style");
+ statusImg.setStyleName("progress-style-icon");
+ importModeListBox.setEnabled(false);
+ importButton.setEnabled(false);
+ if (!isShwon)
{
+ statusPanel.setStyleName("status-panel");
+ statusPanel.setSize("380px", "0px");
+ absolutePanel.add(statusPanel, 10, 120);
- int dx = 5;
- int height = 0;
+ Timer t = new Timer()
+ {
- public void run()
- {
- height += dx;
- statusPanel.setHeight(height + "px");
- if (height >= 45)
+ int dx = 5;
+ int height = 0;
+
+ public void run()
{
- cancel(); // Stop the timer
+ height += dx;
+ statusPanel.setHeight(height + "px");
+ if (height >= 45)
+ {
+ cancel(); // Stop the timer
+ }
}
- }
- };
+ };
- // Schedule the timer to run once in 100 milliseconds.
- t.scheduleRepeating(100);
- isShwon = true;
+ // Schedule the timer to run once in 100 milliseconds.
+ t.scheduleRepeating(100);
+ isShwon = true;
+ }
}
}
});
13 years, 3 months
- 1
- 0
gatein SVN: r7701 - in portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport: server and 1 other directory.
by do-not-reply＠jboss.org
Author: nscavell
Date: 2011-10-10 11:05:02 -0400 (Mon, 10 Oct 2011)
New Revision: 7701
Modified:
portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java
portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/server/FileUploadServlet.java
Log:
GTNPORTAL-2159: Export/Import Gadget uses incorrect importMode attribute.
GTNPORTAL-2160: Allow use of all import modes in MOP Export/Import Gadget.
Modified: portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java
===================================================================
--- portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java 2011-10-10 14:31:16 UTC (rev 7700)
+++ portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/client/Application.java 2011-10-10 15:05:02 UTC (rev 7701)
@@ -23,6 +23,8 @@
package org.gatein.management.gadget.mop.exportimport.client;
import com.google.gwt.core.client.GWT;
+import com.google.gwt.event.dom.client.ChangeEvent;
+import com.google.gwt.event.dom.client.ChangeHandler;
import com.google.gwt.event.dom.client.ClickEvent;
import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.event.logical.shared.OpenEvent;
@@ -50,6 +52,7 @@
import com.google.gwt.user.client.ui.HorizontalPanel;
import com.google.gwt.user.client.ui.Image;
import com.google.gwt.user.client.ui.Label;
+import com.google.gwt.user.client.ui.ListBox;
import com.google.gwt.user.client.ui.NamedFrame;
import com.google.gwt.user.client.ui.RootPanel;
import com.google.gwt.user.client.ui.ScrollPanel;
@@ -222,7 +225,14 @@
absolutePanel.setSize("400px", "220px");
final Button importButton = new Button("Import");
- final CheckBox overwriteBox = new CheckBox("Overwrite the existing site");
+ final Label importModeLabel = new Label("Import Mode:");
+ final ListBox importModeListBox = new ListBox(false);
+ importModeListBox.addItem("Conserve", "conserve");
+ importModeListBox.addItem("Insert", "insert");
+ importModeListBox.addItem("Merge", "merge");
+ importModeListBox.addItem("Overwrite", "overwrite");
+ importModeListBox.setSelectedIndex(2); // set default to 'merge'
+
final HTML statusImg = new HTML(" ", true);
final Label statusLabel = new Label("status label");
final Label headerLabel = new Label("Select file to import :");
@@ -280,7 +290,7 @@
break;
}
- overwriteBox.setEnabled(true);
+ importModeListBox.setEnabled(true);
importButton.setEnabled(true);
}
});
@@ -295,7 +305,7 @@
statusLabel.setText("Process in progress...");
statusLabel.setStyleName("progress-style");
statusImg.setStyleName("progress-style-icon");
- overwriteBox.setEnabled(false);
+ importModeListBox.setEnabled(false);
importButton.setEnabled(false);
if (!isShwon)
{
@@ -331,18 +341,19 @@
// You can add customized parameters to servlet call
uploader.setServletPath(UPLOAD_ACTION_URL + "?pc=" + getPortalContainerName());
- overwriteBox.setTitle("If you want to force overwriting an existing site, check this checkbox");
- overwriteBox.addClickHandler(new ClickHandler()
+ importModeListBox.setTitle("The import mode to use during import.");
+ importModeListBox.addChangeHandler(new ChangeHandler()
{
-
- public void onClick(ClickEvent event)
+ @Override
+ public void onChange(ChangeEvent changeEvent)
{
- String url = UPLOAD_ACTION_URL + "?pc=" + getPortalContainerName() + "&overwrite=" + overwriteBox.getValue();
+ String url = UPLOAD_ACTION_URL + "?pc=" + getPortalContainerName() + "&importMode=" + importModeListBox.getValue(importModeListBox.getSelectedIndex());
uploader.setServletPath(url);
}
});
- absolutePanel.add(overwriteBox, 10, 84);
+ absolutePanel.add(importModeLabel, 10, 88);
+ absolutePanel.add(importModeListBox, 95, 84);
Button closeButton = new Button("Close", new ClickHandler()
{
Modified: portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/server/FileUploadServlet.java
===================================================================
--- portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/server/FileUploadServlet.java 2011-10-10 14:31:16 UTC (rev 7700)
+++ portal/trunk/gadgets/gwtGadgets/src/main/java/org/gatein/management/gadget/mop/exportimport/server/FileUploadServlet.java 2011-10-10 15:05:02 UTC (rev 7701)
@@ -97,11 +97,10 @@
receivedFiles.put(item.getFieldName(), file);
receivedContentTypes.put(item.getFieldName(), item.getContentType());
- String overwriteVal = request.getParameter("overwrite");
- boolean overwrite = Boolean.parseBoolean(overwriteVal);
+ String importMode = request.getParameter("importMode");
// process the uploaded file
- processImport(request.getParameter("pc"), new FileInputStream(file), overwrite);
+ processImport(request.getParameter("pc"), new FileInputStream(file), importMode);
// Compose a xml message with the full file information which can be parsed in client side
response.append("<file-").append(count).append("-field>").append(item.getFieldName()).append("</file-").append(count).append("-field>\n");
@@ -159,7 +158,7 @@
}
}
- private void processImport(final String containerName, final InputStream in, final boolean overwrite) throws Exception
+ private void processImport(final String containerName, final InputStream in, final String importMode) throws Exception
{
doInRequest(containerName, new ContainerCallback<Void>()
@@ -170,12 +169,9 @@
{
ManagementController controller = getComponent(container, ManagementController.class);
- Map<String, List<String>> attributes = Collections.emptyMap();
- if (overwrite)
- {
- attributes = new HashMap<String, List<String>>(1);
- attributes.put("import-strategy", Collections.singletonList("overwrite"));
- }
+ Map<String, List<String>> attributes = new HashMap<String, List<String>>(1);
+ attributes.put("importMode", Collections.singletonList(importMode));
+
ManagedRequest request = ManagedRequest.Factory.create(
OperationNames.IMPORT_RESOURCE, PathAddress.pathAddress("mop"),
attributes, in, ContentType.ZIP);
13 years, 3 months
- 1
- 0
gatein SVN: r7700 - in epp/portal/branches/EPP_5_2_Branch: component and 107 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-10 10:31:16 -0400 (Mon, 10 Oct 2011)
New Revision: 7700
Modified:
epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml
epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml
epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml
epp/portal/branches/EPP_5_2_Branch/server/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/pom.xml
epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml
epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml
epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml
Log:
Next development version
Modified: epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.component</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>distribution</artifactId>
@@ -60,7 +60,7 @@
<build>
- <finalName>jboss-epp-${project.version}</finalName>
+ <finalName>jboss-epp-${version.majorVersion}.${version.minorVersion}.${version.incrementalVersion}.${maven.build.timestamp}-${version.qualifier}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<artifactId>mead-tools</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<groupId>org.exoplatform.portal.mead</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>distribution.parent</artifactId>
@@ -17,6 +17,7 @@
<eap.groupId>org.jboss.jbossas</eap.groupId>
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.2</epp.dir>
+ <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
<sso.version>1.1.0-Beta02</sso.version>
<portletbridge.version>2.2.0.CR01.EPP52</portletbridge.version>
@@ -41,5 +42,14 @@
<module>jboss-epp</module>
</modules>
</profile>
- </profiles>
+ <profile>
+ <id>mead-tools</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>mead-tools</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,23 +38,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,29 +38,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>skins-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gwtGadgets</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<packaging>pom</packaging>
<name>EPP GateIn - Portal - ${project.version}</name>
@@ -465,74 +465,74 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -542,85 +542,85 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
<!-- Chromattic -->
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</dependency>
</dependencies>
</project>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<groupId>org.jboss.gatein</groupId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>extension-config</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -28,7 +28,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>extension-ear</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.integration</groupId>
<artifactId>gatein-wsrp-integration-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>extension-ear-as5</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -27,7 +27,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<artifactId>extension-war</artifactId>
Modified: epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
+++ epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-10 14:31:16 UTC (rev 7700)
@@ -34,7 +34,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER04-SNAPSHOT</version>
</parent>
<description>GateIn WSRP Integration extension parent</description>
13 years, 3 months
- 1
- 0
gatein SVN: r7699 - in epp/portal/tags: EPP_5_2_0_ER03 and 110 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-10 09:41:22 -0400 (Mon, 10 Oct 2011)
New Revision: 7699
Added:
epp/portal/tags/EPP_5_2_0_ER03/
epp/portal/tags/EPP_5_2_0_ER03/component/
epp/portal/tags/EPP_5_2_0_ER03/component/application-registry/
epp/portal/tags/EPP_5_2_0_ER03/component/common/
epp/portal/tags/EPP_5_2_0_ER03/component/identity/
epp/portal/tags/EPP_5_2_0_ER03/component/management/
epp/portal/tags/EPP_5_2_0_ER03/component/pc/
epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/portal/
epp/portal/tags/EPP_5_2_0_ER03/component/portal/src/
epp/portal/tags/EPP_5_2_0_ER03/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java
epp/portal/tags/EPP_5_2_0_ER03/component/resources/
epp/portal/tags/EPP_5_2_0_ER03/component/scripting/
epp/portal/tags/EPP_5_2_0_ER03/component/test/
epp/portal/tags/EPP_5_2_0_ER03/component/web/
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import
epp/portal/tags/EPP_5_2_0_ER03/settings-nomead.xml
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-component/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-config/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear-as5/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-war/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml
Removed:
epp/portal/tags/EPP_5_2_0_ER03/component/
epp/portal/tags/EPP_5_2_0_ER03/component/application-registry/
epp/portal/tags/EPP_5_2_0_ER03/component/common/
epp/portal/tags/EPP_5_2_0_ER03/component/identity/
epp/portal/tags/EPP_5_2_0_ER03/component/management/
epp/portal/tags/EPP_5_2_0_ER03/component/pc/
epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/portal/
epp/portal/tags/EPP_5_2_0_ER03/component/portal/src/
epp/portal/tags/EPP_5_2_0_ER03/component/resources/
epp/portal/tags/EPP_5_2_0_ER03/component/scripting/
epp/portal/tags/EPP_5_2_0_ER03/component/test/
epp/portal/tags/EPP_5_2_0_ER03/component/web/
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-component/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-config/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear-as5/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-war/
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml
Modified:
epp/portal/tags/EPP_5_2_0_ER03/component/application-registry/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/common/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/identity/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/management/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/pc/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/resources/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/scripting/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/test/core/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/test/jcr/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/test/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/web/api/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/web/controller/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/web/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/web/resources/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/web/security/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/component/web/server/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/examples/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/portletbridge/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/integration.war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-doc/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-junit/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-parent/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-common/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-dep/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-management/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-mop/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-packager/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-parent/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-shindig/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-simplecaptcha/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-sso/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-wci/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-wsrp/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/jboss-picketlink-idm/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/jboss-portletbridge/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/mead.parent/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/distribution/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/extension/config/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/extension/ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/extension/jar/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/extension/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/extension/war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portal/config/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portal/ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portal/jar/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portal/rest-war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portal/war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/api/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/jsfhellouser/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/jsphellouser/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/simplesthelloworld/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/struts-jpetstore/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/skins/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/examples/skins/simpleskin/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/gadgets/core/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/gadgets/eXoGadgets/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/gadgets/gwtGadgets/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/gadgets/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/gadgets/server/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/portlet/dashboard/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/portlet/exoadmin/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/portlet/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/portlet/web/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/server/jboss/patch-ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/server/jboss/plugin/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/server/jboss/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/server/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/starter/ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/starter/jar/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/starter/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/starter/war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/testsuite/htmlunit-tests/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/testsuite/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/testsuite/selenium-snifftests/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/testsuite/webuibasedsamples/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/web/eXoResources/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/web/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/web/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/web/rest/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/core/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/dashboard/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/eXo/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/framework/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/portal/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/webui/portlet/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-component/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-config/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear-as5/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-war/pom.xml
Log:
EPP 5.2.0.ER03 release
Property changes on: epp/portal/tags/EPP_5_2_0_ER03
___________________________________________________________________
Added: svn:ignore
+ *.iml
.idea
Added: svn:mergeinfo
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478,7497,7552,7554-7555
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/application-registry/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/application-registry/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/application-registry/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/common/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/common/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>exo.portal.component.common</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/identity/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/identity/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/identity/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/management/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/management/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pc/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/pc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/pom.xml 2011-10-02 22:49:59 UTC (rev 7590)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,50 +0,0 @@
-<!--
-
- 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.
-
--->
-
-<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>5.2.0-epp-DEV04-SNAPSHOT</version>
- </parent>
-
- <artifactId>exo.portal.component</artifactId>
- <packaging>pom</packaging>
-
- <name>GateIn Portal Component</name>
-
- <modules>
- <module>test</module>
- <module>common</module>
- <module>pc</module>
- <module>resources</module>
- <module>application-registry</module>
- <module>portal</module>
- <module>web</module>
- <module>scripting</module>
- <module>management</module>
- <module>identity</module>
- </modules>
-
-</project>
Copied: epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml (from rev 7588, epp/portal/branches/EPP_5_2_Branch/component/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,50 @@
+<!--
+
+ 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.
+
+-->
+
+<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>5.2.0.ER03</version>
+ </parent>
+
+ <artifactId>exo.portal.component</artifactId>
+ <packaging>pom</packaging>
+
+ <name>GateIn Portal Component</name>
+
+ <modules>
+ <module>test</module>
+ <module>common</module>
+ <module>pc</module>
+ <module>resources</module>
+ <module>application-registry</module>
+ <module>portal</module>
+ <module>web</module>
+ <module>scripting</module>
+ <module>management</module>
+ <module>identity</module>
+ </modules>
+
+</project>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Copied: epp/portal/tags/EPP_5_2_0_ER03/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java (from rev 7588, epp/portal/branches/EPP_5_2_Branch/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/portal/src/test/java/org/exoplatform/portal/config/TestImport.java 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,102 @@
+/*
+ * 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.config;
+
+import org.exoplatform.component.test.AbstractGateInTest;
+import org.exoplatform.component.test.ContainerScope;
+import org.exoplatform.component.test.KernelBootstrap;
+import org.exoplatform.container.PortalContainer;
+import org.exoplatform.container.component.RequestLifeCycle;
+import org.exoplatform.portal.mop.SiteKey;
+import org.exoplatform.portal.mop.importer.Imported;
+import org.exoplatform.portal.mop.navigation.NavigationContext;
+import org.exoplatform.portal.mop.navigation.NavigationService;
+import org.exoplatform.portal.mop.navigation.Node;
+import org.exoplatform.portal.mop.navigation.NodeContext;
+import org.exoplatform.portal.mop.navigation.Scope;
+import org.exoplatform.portal.pom.config.POMSessionManager;
+import org.gatein.mop.api.workspace.Workspace;
+
+import java.io.File;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ */
+public class TestImport extends AbstractGateInTest
+{
+
+ public void testMixin() throws Exception
+ {
+ KernelBootstrap bootstrap = new KernelBootstrap();
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.test.jcr-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.identity-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.portal-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "org/exoplatform/portal/config/TestImport1-configuration.xml");
+
+ //
+ System.setProperty("override.1", "false");
+ System.setProperty("import.mode.1", "conserve");
+ System.setProperty("import.portal.1", "navigation1");
+
+ //
+ bootstrap.boot();
+ PortalContainer container = bootstrap.getContainer();
+ POMSessionManager mgr = (POMSessionManager)container.getComponentInstanceOfType(POMSessionManager.class);
+
+ //
+ RequestLifeCycle.begin(container);
+ Workspace workspace = mgr.getSession().getWorkspace();
+ assertTrue(workspace.isAdapted(Imported.class));
+ RequestLifeCycle.end();
+ bootstrap.dispose();
+ }
+
+ public void testDefaultMode() throws Exception
+ {
+ KernelBootstrap bootstrap = new KernelBootstrap();
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.test.jcr-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.identity-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "conf/exo.portal.component.portal-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "org/exoplatform/portal/config/TestImport0-configuration.xml");
+ bootstrap.addConfiguration(ContainerScope.PORTAL, "org/exoplatform/portal/config/TestImport1-configuration.xml");
+ System.setProperty("import.portal.0", "navigation2");
+ System.setProperty("override.1", "false");
+ System.setProperty("import.mode.1", "merge");
+ System.setProperty("import.portal.1", "navigation1");
+
+ //
+ bootstrap.boot();
+
+ //
+ PortalContainer container = bootstrap.getContainer();
+ NavigationService service = (NavigationService)container.getComponentInstanceOfType(NavigationService.class);
+ RequestLifeCycle.begin(container);
+ NavigationContext nav = service.loadNavigation(SiteKey.portal("classic"));
+ NodeContext<Node> root = service.loadNode(Node.MODEL, nav, Scope.ALL, null);
+ Collection<Node> c = root.getNodes();
+ assertEquals(3, c.size());
+ assertNotNull(root.get("foo"));
+ assertNotNull(root.get("daa"));
+ assertNotNull(root.get("bar"));
+ RequestLifeCycle.end();
+ bootstrap.dispose();
+ }
+}
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/resources/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/resources/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/scripting/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/scripting/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/scripting/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/test/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/core/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/test/core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/test/jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/jcr/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/test/jcr/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/test/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/test/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/test/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/web/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/api/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/web/api/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/web/controller/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/controller/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/web/controller/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/web/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/web/resources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/resources/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/web/resources/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/web/security/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/security/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/web/security/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/component/web/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/web/server/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/component/web/server/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -21,7 +21,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/examples/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>distribution</artifactId>
@@ -60,7 +60,7 @@
<build>
- <finalName>jboss-epp-${project.version}</finalName>
+ <finalName>jboss-epp-${version.majorVersion}.${version.minorVersion}.${version.incrementalVersion}.${maven.build.timestamp}-${version.qualifier}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/portletbridge/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/jboss-epp/serverAddon/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.exoplatform.portal.mead</groupId>
- <artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
- <relativePath>../mead.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>mead-exo-core</artifactId>
- <packaging>pom</packaging>
-
- <properties>
-
- <mead.svn.base>${svn.base}</mead.svn.base>
- <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
- <mead.svn.path>${exo-core.svnpath}</mead.svn.path>
-
- <mead.build.profiles></mead.build.profiles>
- <mead.build.properties></mead.build.properties>
- <mead.patch.path></mead.patch.path>
-
- </properties>
-</project>
\ No newline at end of file
Copied: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml (from rev 7589, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-core/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.exoplatform.portal.mead</groupId>
+ <artifactId>mead.parent</artifactId>
+ <version>5.2.0-ER03</version>
+ <relativePath>../mead.parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mead-exo-core</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- TODO: upgrade to maven 3 -->
+ <mead.target>jboss-epp-5-maven2</mead.target>
+
+ <mead.svn.base>${svn.base}</mead.svn.base>
+ <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
+ <mead.svn.path>${exo-core.svnpath}</mead.svn.path>
+
+ <mead.build.profiles></mead.build.profiles>
+ <mead.build.properties></mead.build.properties>
+ <mead.patch.path></mead.patch.path>
+
+ </properties>
+</project>
\ No newline at end of file
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-doc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-doc/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-doc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.exoplatform.portal.mead</groupId>
- <artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
- <relativePath>../mead.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>mead-eco-jcr</artifactId>
- <packaging>pom</packaging>
-
- <properties>
-
- <mead.svn.base>${svn.base}</mead.svn.base>
- <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
- <mead.svn.path>${exo-jcr.svnpath}</mead.svn.path>
-
- <mead.build.profiles></mead.build.profiles>
- <mead.build.properties></mead.build.properties>
- <mead.patch.path>patches/org.exoplatform.portal-exo.portal.parent/branches/EPP_5_1</mead.patch.path>
-
- </properties>
-</project>
\ No newline at end of file
Copied: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml (from rev 7589, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-jcr/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-jcr/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.exoplatform.portal.mead</groupId>
+ <artifactId>mead.parent</artifactId>
+ <version>5.2.0-ER03</version>
+ <relativePath>../mead.parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mead-eco-jcr</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- TODO: upgrade to maven 3 -->
+ <mead.target>jboss-epp-5-maven2</mead.target>
+
+ <mead.svn.base>${svn.base}</mead.svn.base>
+ <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
+ <mead.svn.path>${exo-jcr.svnpath}</mead.svn.path>
+
+ <mead.build.profiles></mead.build.profiles>
+ <mead.build.properties></mead.build.properties>
+ <mead.patch.path>patches/org.exoplatform.portal-exo.portal.parent/branches/EPP_5_1</mead.patch.path>
+
+ </properties>
+</project>
\ No newline at end of file
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-junit/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-junit/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-junit/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.exoplatform.portal.mead</groupId>
- <artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
- <relativePath>../mead.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>mead-exo-kernel</artifactId>
- <packaging>pom</packaging>
-
- <properties>
-
- <mead.svn.base>${svn.base}</mead.svn.base>
- <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
- <mead.svn.path>${exo-kernel.svnpath}</mead.svn.path>
-
- <mead.build.profiles></mead.build.profiles>
- <mead.build.properties></mead.build.properties>
- <mead.patch.path></mead.patch.path>
-
- </properties>
-</project>
\ No newline at end of file
Copied: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml (from rev 7589, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-kernel/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-kernel/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.exoplatform.portal.mead</groupId>
+ <artifactId>mead.parent</artifactId>
+ <version>5.2.0-ER03</version>
+ <relativePath>../mead.parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mead-exo-kernel</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- TODO: upgrade to maven 3 -->
+ <mead.target>jboss-epp-5-maven2</mead.target>
+
+ <mead.svn.base>${svn.base}</mead.svn.base>
+ <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
+ <mead.svn.path>${exo-kernel.svnpath}</mead.svn.path>
+
+ <mead.build.profiles></mead.build.profiles>
+ <mead.build.properties></mead.build.properties>
+ <mead.patch.path></mead.patch.path>
+
+ </properties>
+</project>
\ No newline at end of file
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-parent/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-parent/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.exoplatform.portal.mead</groupId>
- <artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
- <relativePath>../mead.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>mead-exo-ws</artifactId>
- <packaging>pom</packaging>
-
- <properties>
-
- <mead.svn.base>${svn.base}</mead.svn.base>
- <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
- <mead.svn.path>${exo-ws.svnpath}</mead.svn.path>
-
- <mead.build.profiles></mead.build.profiles>
- <mead.build.properties></mead.build.properties>
- <mead.patch.path></mead.patch.path>
-
- </properties>
-</project>
\ No newline at end of file
Copied: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml (from rev 7589, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/exo-ws/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/exo-ws/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.exoplatform.portal.mead</groupId>
+ <artifactId>mead.parent</artifactId>
+ <version>5.2.0-ER03</version>
+ <relativePath>../mead.parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mead-exo-ws</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- TODO: upgrade to maven 3 -->
+ <mead.target>jboss-epp-5-maven2</mead.target>
+
+ <mead.svn.base>${svn.base}</mead.svn.base>
+ <mead.svn.repo>${svn.exo.repo}</mead.svn.repo>
+ <mead.svn.path>${exo-ws.svnpath}</mead.svn.path>
+
+ <mead.build.profiles></mead.build.profiles>
+ <mead.build.properties></mead.build.properties>
+ <mead.patch.path></mead.patch.path>
+
+ </properties>
+</project>
\ No newline at end of file
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-common/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-common/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-common/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-dep/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-dep/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-dep/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-management/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-management/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-management/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-mop/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-mop/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-mop/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-packager/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-packager/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-packager/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-parent/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-parent/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.exoplatform.portal.mead</groupId>
- <artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
- <relativePath>../mead.parent/pom.xml</relativePath>
- </parent>
-
- <artifactId>mead-gatein-pc</artifactId>
- <packaging>pom</packaging>
-
- <properties>
-
- <mead.svn.base>${svn.base}</mead.svn.base>
- <mead.svn.repo>${svn.gatein.repo}</mead.svn.repo>
- <mead.svn.path>${gatein-pc.svnpath}</mead.svn.path>
-
- <mead.build.profiles></mead.build.profiles>
- <mead.build.properties>tests=local container.unpack.dir=/maven/build/test-containers JBOSS_5_1_HOME=/maven/build/test-containers/jboss-5.1.0.GA tests.failOnError=true</mead.build.properties>
- <mead.patch.path>patches/org.gatein.pc-pc-parent/tags/2.2.0-CR02</mead.patch.path>
-
- </properties>
-</project>
\ No newline at end of file
Copied: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml (from rev 7589, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-pc/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-pc/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.exoplatform.portal.mead</groupId>
+ <artifactId>mead.parent</artifactId>
+ <version>5.2.0-ER03</version>
+ <relativePath>../mead.parent/pom.xml</relativePath>
+ </parent>
+
+ <artifactId>mead-gatein-pc</artifactId>
+ <packaging>pom</packaging>
+
+ <properties>
+ <!-- TODO: upgrade to maven 3 -->
+ <mead.target>jboss-epp-5-maven2</mead.target>
+
+ <mead.svn.base>${svn.base}</mead.svn.base>
+ <mead.svn.repo>${svn.gatein.repo}</mead.svn.repo>
+ <mead.svn.path>${gatein-pc.svnpath}</mead.svn.path>
+
+ <mead.build.profiles></mead.build.profiles>
+ <mead.build.properties>tests=local container.unpack.dir=/maven/build/test-containers JBOSS_5_1_HOME=/maven/build/test-containers/jboss-5.1.0.GA tests.failOnError=true</mead.build.properties>
+ <mead.patch.path>patches/org.gatein.pc-pc-parent/tags/2.2.0-CR02</mead.patch.path>
+
+ </properties>
+</project>
\ No newline at end of file
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-portal/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-shindig/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-shindig/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-shindig/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-simplecaptcha/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-simplecaptcha/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-sso/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-sso/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-sso/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-wci/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wci/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-wci/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-wsrp/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/gatein-wsrp/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/gatein-wsrp/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/jboss-picketlink-idm/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/jboss-picketlink-idm/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/jboss-portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/jboss-portletbridge/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
<artifactId>mead.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<relativePath>../mead.parent/pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/mead.parent/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/mead.parent/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/mead.parent/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -6,7 +6,7 @@
<parent>
<groupId>org.exoplatform.portal.mead</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<artifactId>mead-tools</artifactId>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<groupId>org.exoplatform.portal.mead</groupId>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/import 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,14 +0,0 @@
-#!/bin/sh
-WORKDIR=`pwd`
-TMPDIR=../../target/import-tmp
-for i in $*
-do
- #will import all deps passed as parameters
- echo "Importing $i"
- mkdir $TMPDIR
- cd $TMPDIR
- $WORKDIR/get-maven-artifacts $i
- $WORKDIR/import-maven *
- cd $WORKDIR
- rm -Rf $TMPDIR
-done
Copied: epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import (from rev 7589, epp/portal/branches/EPP_5_2_Branch/distribution/mead-tools/src/brewscripts/import)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/mead-tools/src/brewscripts/import 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,14 @@
+#!/bin/sh
+WORKDIR=`pwd`
+TMPDIR=../../target/import-tmp
+for i in $*
+do
+ #will import all deps passed as parameters
+ echo "Importing $i"
+ mkdir $TMPDIR
+ cd $TMPDIR
+ $WORKDIR/get-maven-artifacts $i
+ $WORKDIR/import-maven --owner hfnukal *
+ cd $WORKDIR
+ rm -Rf $TMPDIR
+done
Modified: epp/portal/tags/EPP_5_2_0_ER03/distribution/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>distribution.parent</artifactId>
@@ -17,6 +17,7 @@
<eap.groupId>org.jboss.jbossas</eap.groupId>
<eap.dir>jboss-eap-5.1</eap.dir>
<epp.dir>jboss-epp-5.2</epp.dir>
+ <maven.build.timestamp.format>yyyyMMdd</maven.build.timestamp.format>
<sso.version>1.0.2-epp-DEV01</sso.version>
<portletbridge.version>2.1.1.GA.EPP51</portletbridge.version>
@@ -41,5 +42,14 @@
<module>jboss-epp</module>
</modules>
</profile>
- </profiles>
+ <profile>
+ <id>mead-tools</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <modules>
+ <module>mead-tools</module>
+ </modules>
+ </profile>
+ </profiles>
</project>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/extension/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/config/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/extension/config/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/extension/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/extension/ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,23 +38,23 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.config</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.extension.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/extension/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/jar/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/extension/jar/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/extension/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/extension/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/extension/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/extension/war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/extension/war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.sample</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portal/config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/config/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portal/config/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portal/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portal/ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
@@ -38,29 +38,29 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.config</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>war</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.sample.portal.rest-war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portal/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/jar/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portal/jar/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portal/rest-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/rest-war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portal/rest-war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portal/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portal/war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portal/war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/api/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/api/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/api/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>gatein-api</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/jsfhellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsfhellouser/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/jsfhellouser/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>gatein-jsf-hellouser</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/jsphellouser/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/jsphellouser/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/jsphellouser/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>gatein-jsp-hellouser</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/simplesthelloworld/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/simplesthelloworld/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/simplesthelloworld/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -9,7 +9,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>gatein-simplest-helloworld</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/struts-jpetstore/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/portlets/struts-jpetstore/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/portlets/struts-jpetstore/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.gatein.portal.examples.portlets</groupId>
<artifactId>portlets-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>struts-jpetstore</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/skins/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/skins/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/skins/simpleskin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/examples/skins/simpleskin/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/skins/simpleskin/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.portal.examples.skins</groupId>
<artifactId>skins-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>gatein-sample-skin</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/gadgets/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/core/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/gadgets/core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -14,7 +14,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.gadgets-core</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/gadgets/eXoGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/eXoGadgets/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/gadgets/eXoGadgets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/gadgets/gwtGadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/gwtGadgets/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/gadgets/gwtGadgets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.gwtGadgets</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/gadgets/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/gadgets/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.gadgets</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/gadgets/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/gadgets/server/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/gadgets/server/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.gadgets-server</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -31,7 +31,7 @@
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<packaging>pom</packaging>
<name>EPP GateIn - Portal - ${project.version}</name>
@@ -469,74 +469,74 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.common</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.controller</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.security</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.server</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.api</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.web.resources</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.pc</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.identity</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.resources</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.application-registry</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
@@ -546,85 +546,85 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.scripting</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.management</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.framework</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.portal</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.eXo</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui.dashboard</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.gadgets-core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.core</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.jcr</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.component.test.organization</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
<type>test-jar</type>
</dependency>
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss.plugin</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
<!-- Chromattic -->
Modified: epp/portal/tags/EPP_5_2_0_ER03/portlet/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/dashboard/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/portlet/dashboard/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/portlet/exoadmin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/exoadmin/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/portlet/exoadmin/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/portlet/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.portlet</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/portlet/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/portlet/web/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/portlet/web/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.portlet</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/server/jboss/patch-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/server/jboss/patch-ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/server/jboss/patch-ear/src/main/jboss/server/default/deploy/gatein.ear/integration.war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
</parent>
<artifactId>exo.portal.packaging.jboss-as.integration</artifactId>
<packaging>war</packaging>
Modified: epp/portal/tags/EPP_5_2_0_ER03/server/jboss/plugin/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/plugin/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/server/jboss/plugin/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server.jboss</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/server/jboss/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/jboss/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/server/jboss/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.server</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.server.jboss</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/server/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/server/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/server/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.server</artifactId>
Copied: epp/portal/tags/EPP_5_2_0_ER03/settings-nomead.xml (from rev 7590, epp/portal/branches/EPP_5_2_Branch/settings-nomead.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/settings-nomead.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/settings-nomead.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ User-specific configuration for maven. Includes things that should not
+ be distributed with the pom.xml file, such as developer identity, along with
+ local settings, like proxy information. The default location for the
+ settings file is ~/.m2/settings.xml
+-->
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
+ <!--proxies>
+ <proxy>
+ <host>my.proxy.host</host>
+ </proxy>
+ </proxies-->
+
+ <!--pluginGroups>
+ <pluginGroup>org.codehaus.mojo</pluginGroup>
+ </pluginGroups-->
+<!--
+<localRepository>${env.HOME}/.m2_EPP</localRepository>
+-->
+ <profiles>
+ <profile>
+ <id>my-jboss-maven2</id>
+ <repositories>
+<!--
+ <repository>
+ <id>jboss-maven2-brew</id>
+ <name>JBoss Maven 2 Brew Repository</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+-->
+ <repository>
+ <id>jboss-maven2-nexus</id>
+ <name>JBoss Maven 2 nexus Repository</name>
+ <url>https://repository.jboss.org/nexus/content/groups/public</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>exo-maven</id>
+ <name>Exo Maven 2 Repository</name>
+ <url>http://maven2.exoplatform.org/content/repositories/public/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ <repository>
+ <id>jboss-maven2-deprecated</id>
+ <name>JBoss Maven 2 deprecated Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/deprecated/</url>
+ <layout>default</layout>
+ <releases>
+ <enabled>true</enabled>
+ <updatePolicy>never</updatePolicy>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+ </profile>
+
+ </profiles>
+ <activeProfiles>
+ <activeProfile>my-jboss-maven2</activeProfile>
+ </activeProfiles>
+<!-- <mirrors>
+ <mirror>
+ <id>internal-repository</id>
+ <name>Maven Repository Manager running on repo.mycompany.com</name>
+ <url>http://download.devel.redhat.com/brewroot/repos/jboss-epp-5-build/latest/...</url>
+ <url>http://repository.jboss.org/nexus/content/groups/public</url>
+ <mirrorOf>*</mirrorOf>
+ </mirror>
+ </mirrors>-->
+</settings>
Modified: epp/portal/tags/EPP_5_2_0_ER03/starter/ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/starter/ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -38,7 +38,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.war</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<type>war</type>
</dependency>
</dependencies>
Modified: epp/portal/tags/EPP_5_2_0_ER03/starter/jar/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/jar/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/starter/jar/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/starter/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/starter/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -24,7 +24,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.starter.root</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/starter/war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/starter/war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/starter/war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
@@ -51,7 +51,7 @@
<dependency>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.starter.jar</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</dependency>
</dependencies>
</project>
Modified: epp/portal/tags/EPP_5_2_0_ER03/testsuite/htmlunit-tests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/htmlunit-tests/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/testsuite/htmlunit-tests/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0-ER03</version>
</parent>
<groupId>org.jboss.gatein</groupId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/testsuite/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/testsuite/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.testsuite</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/testsuite/selenium-snifftests/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/selenium-snifftests/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/testsuite/selenium-snifftests/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.selenium.snifftests</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/testsuite/webuibasedsamples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/testsuite/webuibasedsamples/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/testsuite/webuibasedsamples/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.testsuite</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.webui.based.samples</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/web/eXoResources/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/eXoResources/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/web/eXoResources/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/web/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/web/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.web</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/web/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/portal/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/web/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/web/rest/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/web/rest/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/web/rest/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.web</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/core/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/core/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/core/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/dashboard/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/dashboard/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/dashboard/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/eXo/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/eXo/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/eXo/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/framework/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/framework/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/framework/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>exo.portal.webui</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/portal/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portal/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/portal/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/webui/portlet/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/webui/portlet/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/webui/portlet/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>exo.portal.webui</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-component/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-component/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-component/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-config/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-config/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-config/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -26,7 +26,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>extension-config</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -28,7 +28,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>extension-ear</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear-as5/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-ear-as5/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-ear-as5/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.integration</groupId>
<artifactId>gatein-wsrp-integration-parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>extension-ear-as5</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/extension-war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/extension-war/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -27,7 +27,7 @@
<parent>
<artifactId>gatein-wsrp-integration-parent</artifactId>
<groupId>org.gatein.integration</groupId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>extension-war</artifactId>
Deleted: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml 2011-10-02 22:49:59 UTC (rev 7590)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -1,48 +0,0 @@
-<!--
- ~ JBoss, a division of Red Hat
- ~ Copyright 2011, Red Hat Middleware, LLC, and individual
- ~ contributors as indicated by the @authors tag. See the
- ~ copyright.txt in the distribution for a full listing of
- ~ individual contributors.
- ~
- ~ 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.
- -->
-
-<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>
-
- <name>GateIn WSRP Integration</name>
-
- <groupId>org.gatein.integration</groupId>
- <artifactId>gatein-wsrp-integration-parent</artifactId>
-
- <packaging>pom</packaging>
-
- <parent>
- <groupId>org.exoplatform.portal</groupId>
- <artifactId>exo.portal.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
- </parent>
-
- <description>GateIn WSRP Integration extension parent</description>
- <modules>
- <module>extension-config</module>
- <module>extension-component</module>
- <module>extension-war</module>
- <module>extension-ear</module>
- <module>extension-ear-as5</module>
- </modules>
-</project>
Copied: epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml (from rev 7588, epp/portal/branches/EPP_5_2_Branch/wsrp-integration/pom.xml)
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/wsrp-integration/pom.xml 2011-10-10 13:41:22 UTC (rev 7699)
@@ -0,0 +1,48 @@
+<!--
+ ~ JBoss, a division of Red Hat
+ ~ Copyright 2011, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ 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.
+ -->
+
+<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>
+
+ <name>GateIn WSRP Integration</name>
+
+ <groupId>org.gatein.integration</groupId>
+ <artifactId>gatein-wsrp-integration-parent</artifactId>
+
+ <packaging>pom</packaging>
+
+ <parent>
+ <groupId>org.exoplatform.portal</groupId>
+ <artifactId>exo.portal.parent</artifactId>
+ <version>5.2.0.ER03</version>
+ </parent>
+
+ <description>GateIn WSRP Integration extension parent</description>
+ <modules>
+ <module>extension-config</module>
+ <module>extension-component</module>
+ <module>extension-war</module>
+ <module>extension-ear</module>
+ <module>extension-ear-as5</module>
+ </modules>
+</project>
13 years, 3 months
- 1
- 0
gatein SVN: r7698 - epp/portal/tags.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-10 09:17:00 -0400 (Mon, 10 Oct 2011)
New Revision: 7698
Removed:
epp/portal/tags/EPP_5_2_0_ER03/
Log:
Remove
13 years, 3 months
- 1
- 0
gatein SVN: r7697 - in epp/portal/tags: EPP_5_2_0_ER03 and 5 other directories.
by do-not-reply＠jboss.org
Author: hfnukal
Date: 2011-10-10 09:08:09 -0400 (Mon, 10 Oct 2011)
New Revision: 7697
Added:
epp/portal/tags/EPP_5_2_0_ER03/
epp/portal/tags/EPP_5_2_0_ER03/distribution.iml
epp/portal/tags/EPP_5_2_0_ER03/examples/examples.iml
epp/portal/tags/EPP_5_2_0_ER03/portletbridge/portletbridge.iml
epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/gatein.iml
epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/integration.iml
epp/portal/tags/EPP_5_2_0_ER03/serverAddon/serverAddon.iml
Modified:
epp/portal/tags/EPP_5_2_0_ER03/examples/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/portletbridge/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/pom.xml
epp/portal/tags/EPP_5_2_0_ER03/serverAddon/pom.xml
Log:
EPP 5.2.0.ER03 release
Added: epp/portal/tags/EPP_5_2_0_ER03/distribution.iml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/distribution.iml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/distribution.iml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.jboss.portletbridge:portletbridge-impl:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portletbridge:portletbridge-api:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portletbridge.examples.seam.booking:seamBooking-ear:ear:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portal.examples:JSFRIPortlet:war:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portal.examples:richFacesPortlet:war:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.sso:sso-agent:1.0.2-epp-DEV01" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.sso:sso-auth-callback:1.0.2-epp-DEV01" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.rest.core:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.commons:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.container:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.tool:exo.tool.framework.junit:1.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.portlet:portlet-api:2.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.faces:jsf-api:1.2_13" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+ <orderEntry type="library" name="Maven: picocontainer:picocontainer:1.1" level="project" />
+ <orderEntry type="library" name="Maven: jmock:jmock:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: xstream:xstream:1.0.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+ <orderEntry type="library" name="Maven: org.jibx:jibx-run:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.jibx:jibx-bind:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: bcel:bcel:5.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jibx:jibx-extras:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.frameworks.json:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.mail:mail:1.4.4" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.jtidy:jtidy:r938" level="project" />
+ <orderEntry type="library" name="Maven: javax.xml.bind:jaxb-api:2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.xml.stream:stax-api:1.0-2" level="project" />
+ <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.security.core:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.common:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.jotm:jotm-core:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.spec.ee:ow2-jta-1.1-spec:1.0-M1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.carol:carol:3.0.6" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.carol:carol-interceptors:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.carol.irmi:irmi:1.1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.jacorb:jacorb:2.2.3-jonas-patch-20071018" level="project" />
+ <orderEntry type="library" name="Maven: avalon-framework:avalon-framework:4.1.5" level="project" />
+ <orderEntry type="library" name="Maven: org.jacorb:jacorb-idl:2.2.3-jonas-patch-20071018" level="project" />
+ <orderEntry type="library" name="Maven: logkit:logkit:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.0.4" level="project" />
+ <orderEntry type="library" name="Maven: org.objectweb.howl:howl:1.0.1-1" level="project" />
+ <orderEntry type="library" name="Maven: quartz:quartz:1.5.2" level="project" />
+ <orderEntry type="library" name="Maven: javax.transaction:jta:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jgroups:jgroups:2.11.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.web.security" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.organization.api:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.cache:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: xdoclet:xdoclet-hibernate-module:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: xdoclet:xdoclet:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: xdoclet:xdoclet-xdoclet-module:1.2.3" level="project" />
+ <orderEntry type="library" name="Maven: xdoclet:xjavadoc:1.2.3" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.common" />
+ <orderEntry type="library" name="Maven: org.gatein.common:common-logging:2.0.4-Beta03" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.common:common-common:2.0.4-Beta03" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.ext.cache.impl.jboss.v3:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.cache:jbosscache-core:3.2.6.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.javaee:jboss-transaction-api:1.0.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss:jboss-common-core:2.2.9.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.logging:jboss-logging-spi:2.0.5.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.database:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: com.experlog:xapool:1.5.0" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-core:3.3.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: antlr:antlr:2.7.6rc1" level="project" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-annotations:3.4.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:ejb3-persistence:1.0.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-commons-annotations:3.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.component.core:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.jcr:jcr:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.command:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.2" level="project" />
+ <orderEntry type="library" name="Maven: myfaces:myfaces-api:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.7" level="project" />
+ <orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.1.4" level="project" />
+ <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.document:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: stax:stax-api:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:1.4.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.pdfbox:fontbox:1.4.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.pdfbox:jempbox:1.4.0" level="project" />
+ <orderEntry type="library" name="Maven: org.htmlparser:htmlparser:1.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tika:tika-core:0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tika:tika-parsers:0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk15:1.45" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.45" level="project" />
+ <orderEntry type="library" name="Maven: org.ccil.cowan.tagsoup:tagsoup:1.2" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:1.5.3" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+ <orderEntry type="library" name="Maven: com.drewnoakes:metadata-extractor:2.4.0-beta-1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:2.9.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spellchecker:2.9.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:2.9.4" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.xml.stream:sjsxp:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: concurrent:concurrent:1.3.4" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossjts:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.jbossts:jbossts-common:4.6.1.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ws.commons:ws-commons-util:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.component.ext:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.script.groovy:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:1.7.6" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.rest.ext:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.xml-processing:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.commons:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.api:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.spi:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.staxnav:staxnav.core:0.9.6" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.web.controller" />
+ <orderEntry type="module" module-name="exo.portal.component.web.resources" />
+ <orderEntry type="module" module-name="exo.portal.component.resources" />
+ <orderEntry type="library" name="Maven: org.gatein.wci:wci-wci:2.1.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.javascript:closure-compiler:r706" level="project" />
+ <orderEntry type="library" name="Maven: args4j:args4j:2.0.12" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:r09" level="project" />
+ <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20070829" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.portal" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.organization.jdbc:2.4.1-GA" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.pc" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-api:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-portlet:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet.jsp:jsp-api:2.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.ccpp:ccpp:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-federation:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-bridge:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.portals.bridges:portals-bridges-common:1.0.4" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.identity" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-core:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-common:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-api:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-spi:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.xml.bind:jaxb-impl:2.1.8" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-hibernate:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: javassist:javassist:3.8.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-cglib-repack:2.1_3" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-ldap:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-cache:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.mop:mop-api:1.1.0-Beta05" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.mop:mop-spi:1.1.0-Beta05" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.mop:mop-core:1.1.0-Beta05" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.ext:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.common:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.apt:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.metamodel:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.api:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.spi:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.core:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.jlr:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.apt:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.management:gatein-management-spi:1.0.0-Beta04" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.management:gatein-management-api:1.0.0-Beta04" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.captcha:simplecaptcha:1.1.1-GA-Patch01" level="project" />
+ <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+ <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.jasig.cas:cas-client-core:3.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-agent:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-common:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-modeler:commons-modeler:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-core:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-context:2.5.5" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-beans:2.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.springframework:spring-core:2.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xbean:xbean-spring:3.4.3" level="project" />
+ <orderEntry type="library" scope="RUNTIME" name="Maven: org.springframework:spring-aop:2.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-servlet-agent:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-agent-shared:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-protocol-client:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.josso:josso-ws:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.axis:axis:1.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.axis:axis-jaxrpc:1.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.axis:axis-ant:1.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.axis:axis-saaj:1.4" level="project" />
+ <orderEntry type="library" name="Maven: axis:axis-wsdl4j:1.5.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-negotiation-spnego:2.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.security:jboss-negotiation-common:2.0.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: apache-log4j:log4j:1.2.14" level="project" />
+ <orderEntry type="library" name="Maven: jboss:jboss-common:4.2.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.web:jbossweb:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss.web:servlet-api:2.1.0.GA" level="project" />
+ <orderEntry type="library" name="Maven: jboss:jbosssx:4.2.3.GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.security:jacc:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.sso:spnego:1.0.2-epp-DEV01" level="project" />
+ <orderEntry type="module" module-name="starter-gatein" />
+ <orderEntry type="module" module-name="extension-ear-as5" />
+ <orderEntry type="module" module-name="gatein-sample-extension" />
+ <orderEntry type="module" module-name="gatein-sample-portal" />
+ <orderEntry type="module" module-name="gatein-sample-skin" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.0.0" level="project" />
+ </component>
+</module>
+
Added: epp/portal/tags/EPP_5_2_0_ER03/examples/examples.iml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/examples/examples.iml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/examples.iml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="gatein-sample-extension" />
+ <orderEntry type="module" module-name="gatein-sample-portal" />
+ <orderEntry type="module" module-name="gatein-sample-skin" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.0.0" level="project" />
+ </component>
+</module>
+
Modified: epp/portal/tags/EPP_5_2_0_ER03/examples/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/examples/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/examples/pom.xml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: epp/portal/tags/EPP_5_2_0_ER03/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/pom.xml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -7,7 +7,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
</parent>
<artifactId>distribution</artifactId>
@@ -60,7 +60,7 @@
<build>
- <finalName>jboss-epp-${project.version}</finalName>
+ <finalName>jboss-epp-${version.majorVersion}.${version.minorVersion}.${version.incrementalVersion}.${maven.build.timestamp}-${version.qualifier}</finalName>
<plugins>
<plugin>
<groupId>org.codehaus.mojo</groupId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/portletbridge/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/portletbridge/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/portletbridge/pom.xml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Added: epp/portal/tags/EPP_5_2_0_ER03/portletbridge/portletbridge.iml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/portletbridge/portletbridge.iml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/portletbridge/portletbridge.iml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.jboss.portletbridge:portletbridge-impl:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portletbridge:portletbridge-api:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portletbridge.examples.seam.booking:seamBooking-ear:ear:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portal.examples:JSFRIPortlet:war:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.portal.examples:richFacesPortlet:war:2.1.1.GA.EPP51" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.0.0" level="project" />
+ </component>
+</module>
+
Added: epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/gatein.iml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/gatein.iml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/gatein.iml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="exo.portal.web.portal" />
+ <orderEntry type="module" module-name="exo.portal.web.eXoResources" />
+ <orderEntry type="module" module-name="exo.portal.portlet.dashboard" />
+ <orderEntry type="module" module-name="exo.portal.portlet.exoadmin" />
+ <orderEntry type="module" module-name="exo.portal.web.rest" />
+ <orderEntry type="module" module-name="exo.portal.eXoGadgets" />
+ <orderEntry type="module" module-name="exo.portal.gwtGadgets" />
+ <orderEntry type="module" module-name="exo.portal.gadgets-server" />
+ <orderEntry type="module" module-name="exo.portal.portlet.web" />
+ <orderEntry type="library" name="Maven: org.exoplatform.portal:integration:war:5.2.0-epp-ER03" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.common" />
+ <orderEntry type="library" name="Maven: org.gatein.common:common-logging:2.0.4-Beta03" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.common:common-common:2.0.4-Beta03" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.commons:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: eu.medsea.mimeutil:mime-util:2.1.3" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.ext.cache.impl.jboss.v3:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: junit:junit:3.8.1" level="project" />
+ <orderEntry type="library" name="Maven: javax.portlet:portlet-api:2.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:servlet-api:2.5" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.container:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: picocontainer:picocontainer:1.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils:1.8.3" level="project" />
+ <orderEntry type="library" name="Maven: org.jibx:jibx-run:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.jibx:jibx-bind:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.cache:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.cache:jbosscache-core:3.2.7.GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jgroups:jgroups:2.11.1.Final" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.database:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.common:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.activation:activation:1.1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.jotm:jotm-core:2.1.9" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.spec.ee:ow2-jta-1.1-spec:1.0-M1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.carol:carol:3.0.6" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.carol:carol-interceptors:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.ow2.carol.irmi:irmi:1.1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-collections:commons-collections:3.2.1" level="project" />
+ <orderEntry type="library" name="Maven: org.jacorb:jacorb:2.2.3-jonas-patch-20071018" level="project" />
+ <orderEntry type="library" name="Maven: avalon-framework:avalon-framework:4.1.5" level="project" />
+ <orderEntry type="library" name="Maven: org.jacorb:jacorb-idl:2.2.3-jonas-patch-20071018" level="project" />
+ <orderEntry type="library" name="Maven: logkit:logkit:1.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-logging:commons-logging-api:1.1" level="project" />
+ <orderEntry type="library" name="Maven: org.objectweb.howl:howl:1.0.1-1" level="project" />
+ <orderEntry type="library" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+ <orderEntry type="library" name="Maven: xml-apis:xml-apis:1.3.04" level="project" />
+ <orderEntry type="library" name="Maven: commons-dbcp:commons-dbcp:1.2.2" level="project" />
+ <orderEntry type="library" name="Maven: commons-pool:commons-pool:1.5.5" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.component.core:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.jcr:jcr:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.component.command:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: commons-chain:commons-chain:1.2" level="project" />
+ <orderEntry type="library" name="Maven: myfaces:myfaces-api:1.1.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-codec:commons-codec:1.4" level="project" />
+ <orderEntry type="library" name="Maven: commons-digester:commons-digester:1.8.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-el:commons-el:1.0" level="project" />
+ <orderEntry type="library" name="Maven: commons-fileupload:commons-fileupload:1.2.1" level="project" />
+ <orderEntry type="library" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+ <orderEntry type="library" name="Maven: commons-validator:commons-validator:1.1.4" level="project" />
+ <orderEntry type="library" name="Maven: oro:oro:2.0.8" level="project" />
+ <orderEntry type="library" name="Maven: javax.servlet:jstl:1.2" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.organization.api:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.security.core:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.document:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.xmlbeans:xmlbeans:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.pdfbox:pdfbox:1.4.0" level="project" />
+ <orderEntry type="library" name="Maven: org.htmlparser:htmlparser:1.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-scratchpad:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.poi:poi-ooxml-schemas:3.6" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.geronimo.specs:geronimo-stax-api_1.0_spec:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tika:tika-core:0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tika:tika-parsers:0.7" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.commons:commons-compress:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcmail-jdk15:1.45" level="project" />
+ <orderEntry type="library" name="Maven: org.bouncycastle:bcprov-jdk15:1.45" level="project" />
+ <orderEntry type="library" name="Maven: org.ccil.cowan.tagsoup:tagsoup:1.2" level="project" />
+ <orderEntry type="library" name="Maven: asm:asm:1.5.3" level="project" />
+ <orderEntry type="library" name="Maven: log4j:log4j:1.2.16" level="project" />
+ <orderEntry type="library" name="Maven: com.drewnoakes:metadata-extractor:2.4.0-beta-1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-core:2.9.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-spellchecker:2.9.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.lucene:lucene-memory:2.9.4" level="project" />
+ <orderEntry type="library" name="Maven: com.sun.xml.stream:sjsxp:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: concurrent:concurrent:1.3.4" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ws.commons:ws-commons-util:1.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.component.ext:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.codehaus.groovy:groovy-all:1.7.6" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.rest.core:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.frameworks.json:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.jtidy:jtidy:r938" level="project" />
+ <orderEntry type="library" name="Maven: javax.ws.rs:jsr311-api:1.0" level="project" />
+ <orderEntry type="library" name="Maven: javax.inject:javax.inject:1" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.rest.ext:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.xml-processing:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.commons:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: javax.annotation:jsr250-api:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.api:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.spi:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.staxnav:staxnav.core:0.9.6" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.web.security" />
+ <orderEntry type="module" module-name="exo.portal.component.web.controller" />
+ <orderEntry type="module" module-name="exo.portal.component.web.resources" />
+ <orderEntry type="module" module-name="exo.portal.component.resources" />
+ <orderEntry type="library" name="Maven: org.gatein.wci:wci-wci:2.1.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: commons-io:commons-io:1.4" level="project" />
+ <orderEntry type="library" name="Maven: com.google.javascript:closure-compiler:r706" level="project" />
+ <orderEntry type="library" name="Maven: args4j:args4j:2.0.12" level="project" />
+ <orderEntry type="library" name="Maven: com.google.guava:guava:r09" level="project" />
+ <orderEntry type="library" name="Maven: com.google.protobuf:protobuf-java:2.3.0" level="project" />
+ <orderEntry type="library" name="Maven: org.json:json:20070829" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.portal" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.organization.jdbc:2.4.1-GA" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.pc" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-api:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-portlet:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: javax.ccpp:ccpp:1.0" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-federation:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-bridge:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.portals.bridges:portals-bridges-common:1.0.4" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.identity" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-core:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-common:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-api:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-spi:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-hibernate:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-ldap:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.picketlink.idm:picketlink-idm-cache:1.3.0.Alpha06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.mop:mop-api:1.1.0-Beta05" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.mop:mop-spi:1.1.0-Beta05" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.mop:mop-core:1.1.0-Beta05" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.ext:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.common:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.apt:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.metamodel:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.api:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.spi:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.core:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.reflext:reflext.jlr:1.1.0-beta12" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.management:gatein-management-spi:1.0.0-Beta04" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.management:gatein-management-api:1.0.0-Beta04" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.captcha:simplecaptcha:1.1.1-GA-Patch01" level="project" />
+ <orderEntry type="library" name="Maven: com.jhlabs:filters:2.0.235" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.web.server" />
+ <orderEntry type="module" module-name="exo.portal.component.web.api" />
+ <orderEntry type="module" module-name="exo.portal.component.application-registry" />
+ <orderEntry type="library" name="Maven: org.gatein.shindig:shindig-gadgets:2.0.2-Beta02" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.shindig:shindig-common:2.0.2-Beta02" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject:guice:2.0" level="project" />
+ <orderEntry type="library" name="Maven: aopalliance:aopalliance:1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-jmx:2.0" level="project" />
+ <orderEntry type="library" name="Maven: joda-time:joda-time:1.6" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth:20100527" level="project" />
+ <orderEntry type="library" name="Maven: commons-betwixt:commons-betwixt:0.8" level="project" />
+ <orderEntry type="library" name="Maven: commons-beanutils:commons-beanutils-core:1.7.0" level="project" />
+ <orderEntry type="library" name="Maven: com.thoughtworks.xstream:xstream:1.3.1" level="project" />
+ <orderEntry type="library" name="Maven: xpp3:xpp3_min:1.1.4c" level="project" />
+ <orderEntry type="library" name="Maven: net.sf.ehcache:ehcache-core:2.2.0" level="project" />
+ <orderEntry type="library" name="Maven: de.odysseus.juel:juel-impl:2.2.3" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:el-api:6.0.29" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:jasper-el:6.0.29" level="project" />
+ <orderEntry type="library" name="Maven: caja:caja:r4251" level="project" />
+ <orderEntry type="library" name="Maven: caja:htmlparser:r4209" level="project" />
+ <orderEntry type="library" name="Maven: xerces:xercesImpl:2.9.1" level="project" />
+ <orderEntry type="library" name="Maven: com.googlecode.json-simple:json-simple:1.1" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth-httpclient4:20090913" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth-consumer:20090617" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth.core:oauth-provider:20100527" level="project" />
+ <orderEntry type="library" name="Maven: com.google.inject.extensions:guice-multibindings:2.0" level="project" />
+ <orderEntry type="library" name="Maven: rome:rome:0.9" level="project" />
+ <orderEntry type="library" name="Maven: rome:modules:0.3.2" level="project" />
+ <orderEntry type="library" name="Maven: jdom:jdom:1.0" level="project" />
+ <orderEntry type="library" name="Maven: com.ibm.icu:icu4j:3.8" level="project" />
+ <orderEntry type="library" name="Maven: net.sourceforge.nekohtml:nekohtml:1.9.9" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.sanselan:sanselan:0.97-incubator" level="project" />
+ <orderEntry type="module" module-name="exo.portal.component.scripting" />
+ <orderEntry type="module" module-name="exo.portal.component.management" />
+ <orderEntry type="library" name="Maven: org.gatein.management:gatein-management-core:1.0.0-Beta04" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.management:gatein-management-rest:1.0.0-Beta04" level="project" />
+ <orderEntry type="module" module-name="exo.portal.webui.framework" />
+ <orderEntry type="module" module-name="exo.portal.webui.portlet" />
+ <orderEntry type="module" module-name="exo.portal.webui.portal" />
+ <orderEntry type="module" module-name="exo.portal.webui.core" />
+ <orderEntry type="module" module-name="exo.portal.webui.eXo" />
+ <orderEntry type="module" module-name="exo.portal.gadgets-core" />
+ <orderEntry type="library" name="Maven: org.gatein.shindig:shindig-features:2.0.2-Beta02" level="project" />
+ <orderEntry type="module" module-name="exo.portal.webui.dashboard" />
+ <orderEntry type="module" module-name="exo.portal.server.jboss.plugin" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.mc-int:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.mc-int:jboss-mc-int-common:2.2.0.Alpha2" level="project" />
+ <orderEntry type="library" name="Maven: org.jboss.mc-int:jboss-mc-int-servlet:2.2.0.Alpha2" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.kernel:exo.kernel.mc-kernel-extras:2.3.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.ldap:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.core:exo.core.component.organization.ldap:2.4.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.component.webdav:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.framework.web:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.framework.command:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.jcr:exo.jcr.component.ftp:1.14.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: org.exoplatform.ws:exo.ws.frameworks.servlet:2.2.1-GA" level="project" />
+ <orderEntry type="library" name="Maven: commons-httpclient:commons-httpclient:3.1" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.wci:wci-exo:2.1.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.wci:wci-tomcat6:2.1.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:catalina:6.0.29" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:servlet-api:6.0.29" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:juli:6.0.29" level="project" />
+ <orderEntry type="library" name="Maven: org.apache.tomcat:annotations-api:6.0.29" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.pc:pc-controller:2.3.0-Beta06" level="project" />
+ <orderEntry type="library" name="Maven: org.chromattic:chromattic.core:1.1.0-beta6" level="project" />
+ <orderEntry type="library" name="Maven: org.gatein.shindig:shindig-social-api:2.0.2-Beta02" level="project" />
+ <orderEntry type="library" name="Maven: net.oauth:core:20080621" level="project" />
+ <orderEntry type="library" name="Maven: org.hibernate:hibernate-jbosscache2:3.3.2.GA" level="project" />
+ <orderEntry type="library" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
+ <orderEntry type="library" name="Maven: caja:json_simple:r1" level="project" />
+ <orderEntry type="library" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+ <orderEntry type="library" name="Maven: rhino:js:1.6R5" level="project" />
+ <orderEntry type="library" name="Maven: jgroups:jgroups:2.6.13.GA" level="project" />
+ <orderEntry type="library" scope="PROVIDED" name="Maven: org.slf4j:slf4j-jdk14:1.5.6" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.0.0" level="project" />
+ </component>
+</module>
+
Modified: epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/gatein.ear/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/serverAddon/gatein.ear/pom.xml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>gatein</artifactId>
Added: epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/integration.iml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/integration.iml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/integration.iml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.0.0" level="project" />
+ </component>
+</module>
+
Modified: epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/integration.war/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/serverAddon/integration.war/pom.xml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -4,7 +4,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../../pom.xml</relativePath>
</parent>
<artifactId>integration</artifactId>
Modified: epp/portal/tags/EPP_5_2_0_ER03/serverAddon/pom.xml
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/distribution/jboss-epp/serverAddon/pom.xml 2011-10-02 17:25:59 UTC (rev 7588)
+++ epp/portal/tags/EPP_5_2_0_ER03/serverAddon/pom.xml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -5,7 +5,7 @@
<parent>
<groupId>org.exoplatform.portal</groupId>
<artifactId>distribution.parent</artifactId>
- <version>5.2.0-epp-DEV04-SNAPSHOT</version>
+ <version>5.2.0.ER03</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Added: epp/portal/tags/EPP_5_2_0_ER03/serverAddon/serverAddon.iml
===================================================================
--- epp/portal/tags/EPP_5_2_0_ER03/serverAddon/serverAddon.iml (rev 0)
+++ epp/portal/tags/EPP_5_2_0_ER03/serverAddon/serverAddon.iml 2011-10-10 13:08:09 UTC (rev 7697)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <exclude-output />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="starter-gatein" />
+ <orderEntry type="module" module-name="extension-ear-as5" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-jdk14:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.slf4j:slf4j-api:1.5.8" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hsqldb:hsqldb:2.0.0" level="project" />
+ </component>
+</module>
+
13 years, 3 months
- 1
- 0
gatein SVN: r7696 - portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2011-10-10 04:41:22 -0400 (Mon, 10 Oct 2011)
New Revision: 7696
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java
Log:
GTNPORTAL-2157 Use ConcurrentHashMap for FutureMap instead
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-10 08:29:57 UTC (rev 7695)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-10 08:41:22 UTC (rev 7696)
@@ -20,9 +20,8 @@
package org.exoplatform.commons.cache.future;
import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -39,7 +38,7 @@
super(loader);
//
- this.data = Collections.synchronizedMap(new HashMap<K, V>());
+ this.data = new ConcurrentHashMap<K, V>();
}
public void clear()
13 years, 3 months
- 1
- 0
gatein SVN: r7695 - in portal/trunk/component: common/src/test/java/org/exoplatform/commons/cache/future and 11 other directories.
by do-not-reply＠jboss.org
Author: trong.tran
Date: 2011-10-10 04:29:57 -0400 (Mon, 10 Oct 2011)
New Revision: 7695
Added:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java
portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml
portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml
portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css
portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css
Removed:
portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java
portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml
portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml
portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml
portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/portal/TestSkin/
portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/portlet/
Modified:
portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.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/portal/resource/compressor/ResourceCompressor.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java
portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java
portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java
portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml
Log:
GTNPORTAL-2157 Enhance SkinService implementation
Copied: portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java (from rev 7693, portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java)
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java (rev 0)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +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.
+ */
+
+package org.exoplatform.commons.cache.future;
+
+import java.io.Serializable;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
+ * @version $Revision$
+ */
+public class FutureMap<K extends Serializable, V, C> extends FutureCache<K, V, C>
+{
+
+ /** . */
+ final Map<K, V> data;
+
+ public FutureMap(Loader<K, V, C> loader)
+ {
+ super(loader);
+
+ //
+ this.data = Collections.synchronizedMap(new HashMap<K, V>());
+ }
+
+ public void clear()
+ {
+ data.clear();
+ }
+
+ public void remove(K key)
+ {
+ data.remove(key);
+ }
+
+ @Override
+ protected V get(K key)
+ {
+ return data.get(key);
+ }
+
+ @Override
+ protected void put(K key, V value)
+ {
+ data.put(key, value);
+ }
+}
\ No newline at end of file
Deleted: portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/FutureMap.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -1,55 +0,0 @@
-/*
- * 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.
- */
-
-package org.exoplatform.commons.cache.future;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-public class FutureMap<C> extends FutureCache<String, String, C>
-{
-
- /** . */
- final Map<String, String> data;
-
- public FutureMap(Loader<String, String, C> loader)
- {
- super(loader);
-
- //
- this.data = Collections.synchronizedMap(new HashMap<String, String>());
- }
-
- @Override
- protected String get(String key)
- {
- return data.get(key);
- }
-
- @Override
- protected void put(String key, String value)
- {
- data.put(key, value);
- }
-}
Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -23,7 +23,6 @@
import junit.framework.TestCase;
import java.util.concurrent.Callable;
-import java.util.concurrent.atomic.AtomicBoolean;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -33,7 +32,7 @@
{
public void testGet()
{
- FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader());
+ FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader());
Assert.assertEquals("foo_value", futureCache.get(new Callable<String>()
{
public String call() throws Exception
@@ -46,7 +45,7 @@
public void testNullValue()
{
- FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader());
+ FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader());
Assert.assertEquals(null, futureCache.get(new Callable<String>()
{
public String call() throws Exception
@@ -59,7 +58,7 @@
public void testThrowException()
{
- FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader());
+ FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader());
Assert.assertEquals(null, futureCache.get(new Callable<String>()
{
public String call() throws Exception
@@ -72,7 +71,7 @@
public void testReentrancy()
{
- final FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader());
+ final FutureMap<String, String, Callable<String>> futureCache = new FutureMap<String, String, Callable<String>>(new StringLoader());
String res = futureCache.get(new Callable<String>()
{
public String call() throws Exception
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SimpleSkin.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -40,31 +40,26 @@
private final String id_;
- private final int cssPriority_;
+ private final int priority;
public SimpleSkin(SkinService service, String module, String name, String cssPath)
{
- service_ = service;
- module_ = module;
- name_ = name;
- cssPath_ = cssPath;
- id_ = module.replace('/', '_');
- cssPriority_ = -1;
+ this(service, module, name, cssPath, Integer.MAX_VALUE);
}
- public SimpleSkin(SkinService service, String module, String name, String cssPath, Integer cssPriority)
+ public SimpleSkin(SkinService service, String module, String name, String cssPath, int cssPriority)
{
service_ = service;
module_ = module;
name_ = name;
cssPath_ = cssPath;
id_ = module.replace('/', '_');
- cssPriority_ = cssPriority != null ? cssPriority : -1;
+ priority = cssPriority;
}
public int getCSSPriority()
{
- return cssPriority_;
+ return priority;
}
public String getId()
@@ -89,7 +84,7 @@
public String toString()
{
- return "SimpleSkin[id=" + id_ + ",module=" + module_ + ",name=" + name_ + ",cssPath=" + cssPath_ + "]";
+ return "SimpleSkin[id=" + id_ + ",module=" + module_ + ",name=" + name_ + ",cssPath=" + cssPath_ + ", priority=" + priority +"]";
}
public SkinURL createURL()
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 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -19,7 +19,7 @@
package org.exoplatform.portal.resource;
-import org.exoplatform.commons.cache.future.FutureExoCache;
+import org.exoplatform.commons.cache.future.FutureMap;
import org.exoplatform.commons.cache.future.Loader;
import org.exoplatform.commons.utils.BinaryOutput;
import org.exoplatform.commons.utils.ByteArrayOutput;
@@ -36,7 +36,6 @@
import org.exoplatform.management.rest.annotations.RESTEndpoint;
import org.exoplatform.portal.resource.compressor.ResourceCompressor;
import org.exoplatform.portal.resource.compressor.ResourceType;
-import org.exoplatform.services.cache.concurrent.ConcurrentFIFOExoCache;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.resources.Orientation;
@@ -46,13 +45,10 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
-import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
@@ -123,9 +119,9 @@
private final HashSet<String> availableSkins_;
- private final FutureExoCache<String, CachedStylesheet, Orientation> ltCache;
+ private final FutureMap<String, CachedStylesheet, Orientation> ltCache;
- private final FutureExoCache<String, CachedStylesheet, Orientation> rtCache;
+ private final FutureMap<String, CachedStylesheet, Orientation> rtCache;
private final Map<String, Set<String>> portletThemes_;
@@ -152,19 +148,25 @@
{
public CachedStylesheet retrieve(Orientation context, String key) throws Exception
{
+ Resource skin = getCSSResource(key, key);
+ if (skin == null)
+ {
+ return null;
+ }
+
StringBuffer sb = new StringBuffer();
- processCSS(sb, key, context, true);
- String css;
+ processCSSRecursively(sb, true, skin, context);
+ String css = sb.toString();;
try
{
- StringWriter output = new StringWriter();
- SkinService.this.compressor.compress(new StringReader(sb.toString()), output, ResourceType.STYLESHEET);
- css = output.toString();
+ if (SkinService.this.compressor.isSupported(ResourceType.STYLESHEET))
+ {
+ css = SkinService.this.compressor.compress(css, ResourceType.STYLESHEET);
+ }
}
catch (Exception e)
{
log.warn("Error when compressing CSS " + key + " for orientation " + context + " will use normal CSS instead", e);
- css = sb.toString();
}
return new CachedStylesheet(css);
@@ -176,8 +178,8 @@
portalSkins_ = new LinkedHashMap<SkinKey, SkinConfig>();
skinConfigs_ = new LinkedHashMap<SkinKey, SkinConfig>(20);
availableSkins_ = new HashSet<String>(5);
- ltCache = new FutureExoCache<String, CachedStylesheet, Orientation>(loader, new ConcurrentFIFOExoCache<String, CachedStylesheet>(200));
- rtCache = new FutureExoCache<String, CachedStylesheet, Orientation>(loader, new ConcurrentFIFOExoCache<String, CachedStylesheet>(200));
+ ltCache = new FutureMap<String, CachedStylesheet, Orientation>(loader);
+ rtCache = new FutureMap<String, CachedStylesheet, Orientation>(loader);
portletThemes_ = new HashMap<String, Set<String>>();
portalContainerName = context.getPortalContainerName();
mainResolver = new MainResourceResolver(portalContainerName, skinConfigs_);
@@ -186,97 +188,39 @@
}
/**
- * add category into portletThemes_ if portletThemes does not contain one
- * @param categoryName: category's name that wangt to add into portletThemes
+ * Add a new category for portlet themes if it does not exist
+ *
+ * @param categoryName the category name
*/
public void addCategoryTheme(String categoryName)
{
if (!portletThemes_.containsKey(categoryName))
+ {
portletThemes_.put(categoryName, new HashSet<String>());
+ }
}
/**
- * Register the stylesheet for a portal Skin. Do not replace any previous skin
- *
- * @param module
- * skin module identifier
- * @param skinName
- * skin name
- * @param cssPath
- * path uri to the css file. This is relative to the root context,
- * use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
+ * @deprecated use {@link #addPortalSkin(String, String, String, int, boolean)} instead
*/
+ @Deprecated
public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext)
{
- addPortalSkin(module, skinName, cssPath, scontext, false);
+ addPortalSkin(module, skinName, cssPath, Integer.MAX_VALUE, false);
}
+
/**
- * Register the stylesheet for a portal Skin.
- *
- * @param module
- * skin module identifier
- * @param skinName
- * skin name
- * @param cssPath
- * path uri to the css file. This is relative to the root context,
- * use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
- * @param overwrite
- * if any previous skin should be replaced by that one
+ * @deprecated use {@link #addPortalSkin(String, String, String, int, boolean)} instead
*/
+ @Deprecated
public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite)
{
- availableSkins_.add(skinName);
- SkinKey key = new SkinKey(module, skinName);
- SkinConfig skinConfig = portalSkins_.get(key);
- if (skinConfig == null || overwrite)
- {
- skinConfig = new SimpleSkin(this, module, skinName, cssPath);
- portalSkins_.put(key, skinConfig);
-
- if (log.isDebugEnabled())
- {
- log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig);
- }
- }
+ addPortalSkin(module, skinName, cssPath, Integer.MAX_VALUE, overwrite);
}
-
- /**
- * Register the stylesheet for a portal Skin.
- *
- * @param module
- * skin module identifier
- * @param skinName
- * skin name
- * @param cssPath
- * path uri to the css file. This is relative to the root context,
- * use leading '/'
- * @param cssData
- * the content of css
- */
- public void addPortalSkin(String module, String skinName, String cssPath, String cssData)
- {
- SkinKey key = new SkinKey(module, skinName);
- SkinConfig skinConfig = portalSkins_.get(key);
- if (skinConfig == null)
- {
- portalSkins_.put(key, new SimpleSkin(this, module, skinName, cssPath));
- if (log.isDebugEnabled())
- {
- log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig);
- }
- }
- ltCache.remove(cssPath);
- rtCache.remove(cssPath);
- }
-
/**
- * Register the stylesheet for a portal Skin. Do not replace any previous skin. Support priority
+ * Register a portal skin
*
* @param module
* skin module identifier
@@ -285,34 +229,12 @@
* @param cssPath
* path uri to the css file. This is relative to the root context,
* use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
- * @param cssPriority
- * priority to support sorting in skin list
- */
- public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, Integer cssPriority)
- {
- addPortalSkin(module, skinName, cssPath, scontext, false, cssPriority);
- }
-
- /**
- * Register the stylesheet for a portal Skin. Support priority
- *
- * @param module
- * skin module identifier
- * @param skinName
- * skin name
- * @param cssPath
- * path uri to the css file. This is relative to the root context,
- * use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
* @param overwrite
* if any previous skin should be replaced by that one
* @param cssPriority
* priority to support sorting in skin list
*/
- public void addPortalSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite, Integer cssPrioriry)
+ public void addPortalSkin(String module, String skinName, String cssPath, int cssPrioriry, boolean overwrite)
{
availableSkins_.add(skinName);
SkinKey key = new SkinKey(module, skinName);
@@ -330,8 +252,10 @@
}
/**
- * Register the stylesheet for a portal Skin. Support priority
+ * Register a portal skin with the specific <code>cssData</code>
*
+ * @deprecated This method is not supported anymore.
+ * The resource resolver pluggability mechanism should be used somehow
* @param module
* skin module identifier
* @param skinName
@@ -341,106 +265,33 @@
* use leading '/'
* @param cssData
* the content of css
- * @param cssPriority
- * priority to support sorting in skin list
*/
- public void addPortalSkin(String module, String skinName, String cssPath, String cssData, Integer cssPriority)
+ @Deprecated
+ public void addPortalSkin(String module, String skinName, String cssPath, String cssData)
{
- SkinKey key = new SkinKey(module, skinName);
- SkinConfig skinConfig = portalSkins_.get(key);
- if (skinConfig == null)
- {
- portalSkins_.put(key, new SimpleSkin(this, module, skinName, cssPath, cssPriority));
-
- if (log.isDebugEnabled())
- {
- log.debug("Adding Portal skin : Bind " + key + " to " + skinConfig);
- }
- }
- try
- {
- StringWriter output = new StringWriter();
- compressor.compress(new StringReader(cssData), output, ResourceType.STYLESHEET);
- cssData = output.toString();
- }
- catch (Exception e)
- {
- log.debug("Error when compressing CSS, will use normal CSS instead", e);
- }
+ throw new UnsupportedOperationException("This method is not supported anymore.");
}
/**
- *
- * Register the Skin for available portal Skins. Do not override previous skin
- *
- * @param module
- * skin module identifier
- * @param skinName
- * skin name
- * @param cssPath
- * path uri to the css file. This is relative to the root context,
- * use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
+ * @deprecated use {@link #addSkin(String, String, String, int, boolean)} instead
*/
+ @Deprecated
public void addSkin(String module, String skinName, String cssPath, ServletContext scontext)
{
- addSkin(module, skinName, cssPath, scontext, false);
+ addSkin(module, skinName, cssPath, Integer.MAX_VALUE, false);
}
/**
- * Merge several skins into one single skin.
- *
- * @param skins
- * the skins to merge
- * @return the merged skin
+ * @deprecated use {@link #addSkin(String, String, String, int, boolean)} instead
*/
- public Skin merge(Collection<SkinConfig> skins)
+ @Deprecated
+ public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite)
{
- return new CompositeSkin(this, skins);
+ addSkin(module, skinName, cssPath, Integer.MAX_VALUE, overwrite);
}
/**
- * Add a resource resolver to plug external resolvers.
*
- * @param resolver
- * a resolver to add
- */
- public void addResourceResolver(ResourceResolver resolver)
- {
- mainResolver.resolvers.addIfAbsent(resolver);
- }
-
- /**
- *
- * Register the Skin for available portal Skins.
- *
- * @param module
- * skin module identifier
- * @param skinName
- * skin name
- * @param cssPath
- * path uri to the css file. This is relative to the root context,
- * use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
- * @param overwrite
- * if any previous skin should be replaced by that one
- */
- public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite)
- {
- availableSkins_.add(skinName);
- SkinKey key = new SkinKey(module, skinName);
- SkinConfig skinConfig = skinConfigs_.get(key);
- if (skinConfig == null || overwrite)
- {
- skinConfig = new SimpleSkin(this, module, skinName, cssPath);
- skinConfigs_.put(key, skinConfig);
- }
- }
-
- /**
- *
* Register the Skin for available portal Skins. Support priority
*
* @param module
@@ -450,21 +301,19 @@
* @param cssPath
* path uri to the css file. This is relative to the root context,
* use leading '/'
- * @param scontext
- * the webapp's {@link javax.servlet.ServletContext}
* @param overwrite
* if any previous skin should be replaced by that one
- * @param cssPriority
+ * @param priority
* priority to support sorting in skin list
*/
- public void addSkin(String module, String skinName, String cssPath, ServletContext scontext, boolean overwrite, Integer cssPriority)
+ public void addSkin(String module, String skinName, String cssPath, int priority, boolean overwrite)
{
availableSkins_.add(skinName);
SkinKey key = new SkinKey(module, skinName);
SkinConfig skinConfig = skinConfigs_.get(key);
if (skinConfig == null || overwrite)
{
- skinConfig = new SimpleSkin(this, module, skinName, cssPath, cssPriority);
+ skinConfig = new SimpleSkin(this, module, skinName, cssPath, priority);
skinConfigs_.put(key, skinConfig);
}
}
@@ -483,6 +332,7 @@
* @param scontext
* the webapp's {@link javax.servlet.ServletContext}
*/
+ @Deprecated
public void addSkin(String module, String skinName, String cssPath, String cssData)
{
availableSkins_.add(skinName);
@@ -495,8 +345,31 @@
ltCache.remove(cssPath);
rtCache.remove(cssPath);
}
+
+ /**
+ * Merge several skins into one single skin.
+ *
+ * @param skins
+ * the skins to merge
+ * @return the merged skin
+ */
+ public Skin merge(Collection<SkinConfig> skins)
+ {
+ return new CompositeSkin(this, skins);
+ }
/**
+ * Add a resource resolver to plug external resolvers.
+ *
+ * @param resolver
+ * a resolver to add
+ */
+ public void addResourceResolver(ResourceResolver resolver)
+ {
+ mainResolver.resolvers.addIfAbsent(resolver);
+ }
+
+ /**
* Registry theme category with its themes for portlet Theme
* @param categoryName
* category name that will be registried
@@ -525,16 +398,16 @@
/**
* Return the CSS content of the file specified by the given URI.
*
- * @param cssPath
+ * @param path
* path of the css to find
* @return the css contet or null if not found.
*/
- public String getCSS(String cssPath)
+ public String getCSS(String path)
{
try
{
final ByteArrayOutput output = new ByteArrayOutput();
- renderCSS(new ResourceRenderer()
+ boolean success = renderCSS(new ResourceRenderer()
{
public BinaryOutput getOutput() throws IOException
{
@@ -543,20 +416,29 @@
public void setExpiration(long seconds)
{
}
- }, cssPath);
- return output.getString();
+ }, path);
+
+ if (success)
+ {
+ return output.getString();
+ }
+ else
+ {
+ return null;
+ }
}
catch (IOException e)
{
- log.error("Error while rendering css " + cssPath, e);
+ log.error("Error while rendering css " + path, e);
return null;
}
catch (RenderingException e)
{
- log.error("Error while rendering css " + cssPath, e);
+ log.error("Error while rendering css " + path, e);
return null;
}
}
+
/**
* Render css content of the file specified by the given URI
* @param renderer
@@ -565,8 +447,10 @@
* path uri to the css file
* @throws RenderingException
* @throws IOException
+ * @return <code>true</code> if the <code>CSS resource </code>is found and rendered;
+ * <code>false</code> otherwise.
*/
- public void renderCSS(ResourceRenderer renderer, String path) throws RenderingException, IOException
+ public boolean renderCSS(ResourceRenderer renderer, String path) throws RenderingException, IOException
{
Orientation orientation = Orientation.LT;
if (path.endsWith("-lt.css"))
@@ -579,13 +463,30 @@
orientation = Orientation.RT;
}
- // Try cache first
- if (!PropertyManager.isDevelopping())
+ // Check if it is running under developing mode
+ if (PropertyManager.isDevelopping())
{
+ StringBuffer sb = new StringBuffer();
+ Resource skin = getCSSResource(path, path);
+ if (skin == null)
+ {
+ return false;
+ }
+ processCSSRecursively(sb, false, skin, orientation);
+ byte[] bytes = sb.toString().getBytes("UTF-8");
+ renderer.getOutput().write(bytes);
+ }
+ else
+ {
//
- FutureExoCache<String, CachedStylesheet, Orientation> cache = orientation == Orientation.LT ? ltCache : rtCache;
+ FutureMap<String, CachedStylesheet, Orientation> cache = orientation == Orientation.LT ? ltCache : rtCache;
CachedStylesheet cachedCss = cache.get(orientation, path);
-
+
+ if (cachedCss == null)
+ {
+ return false;
+ }
+
if (path.startsWith("/" + portalContainerName + "/resource"))
{
renderer.setExpiration(ONE_MONTH);
@@ -597,29 +498,25 @@
cachedCss.writeTo(renderer.getOutput());
}
- else
- {
- StringBuffer sb = new StringBuffer();
- processCSS(sb, path, orientation, false);
- byte[] bytes = sb.toString().getBytes("UTF-8");
- renderer.getOutput().write(bytes);
- }
+ return true;
}
/**
- * get css content of URI file
- * @param cssPath
+ * Return CSS data corresponding to the <code>path</code>
+ *
+ * @param path
* path uri to the css file
* @return css content of URI file or null if not found
*/
- public String getMergedCSS(String cssPath)
+ @Deprecated
+ public String getMergedCSS(String path)
{
- CachedStylesheet stylesheet = ltCache.get(Orientation.LT, cssPath);
- return stylesheet != null ? stylesheet.getText() : null;
+ return getCSS(path);
}
/**
- * Get all SkinConfig of Portal Skin
+ * Return a collection of Portal Skins that its elements are ordered by CSS priority
+ *
* @param skinName
* name of Portal Skin
* @return
@@ -638,22 +535,16 @@
{
public int compare(SkinConfig o1, SkinConfig o2)
{
- if (o1.getCSSPriority() == o2.getCSSPriority())
- return 1;//Can indicate others condition here
- else if (o1.getCSSPriority() < 0)
- return 1;
- else if (o2.getCSSPriority() < 0)
- return -1;
- else
- return o1.getCSSPriority() - o2.getCSSPriority();
+ return o1.getCSSPriority() - o2.getCSSPriority();
}
});
return portalSkins;
}
/**
- * Get all portlet's themes
- * @return portlet's themes
+ * Return the map of portlet themes
+ *
+ * @return the map of portlet themes
*/
public Map<String, Set<String>> getPortletThemes()
{
@@ -661,7 +552,8 @@
}
/**
- * Get SkinConfig by module and skin name
+ * Return a SkinConfig mapping by the module and skin name
+ *
* @param module
* @param skinName
* @return SkinConfig by SkinKey(module, skinName), or SkinConfig by SkinKey(module, SkinService.DEFAULT_SKIN)
@@ -676,14 +568,30 @@
/**
* Remove SkinKey from SkinCache by portalName and skinName
+ *
+ * @deprecated the method name is wrong to the behaviour it does.
+ * Use {@link #removeSkin(String, String)} instead
+ *
* @param portalName
* @param skinName
*/
+ @Deprecated
public void invalidatePortalSkinCache(String portalName, String skinName)
{
SkinKey key = new SkinKey(portalName, skinName);
skinConfigs_.remove(key);
}
+
+ /**
+ * Invalidate skin from the cache
+ *
+ * @param path the key
+ */
+ public void invalidateCachedSkin(String path)
+ {
+ ltCache.remove(path);
+ rtCache.remove(path);
+ }
/**
* Return last modifed date of cached css
@@ -696,8 +604,13 @@
{
throw new IllegalArgumentException("path must not be null");
}
+
+ if (PropertyManager.isDevelopping())
+ {
+ return Long.MAX_VALUE;
+ }
- FutureExoCache<String, CachedStylesheet, Orientation> cache = ltCache;
+ FutureMap<String, CachedStylesheet, Orientation> cache = ltCache;
Orientation orientation = Orientation.LT;
if (path.endsWith("-lt.css"))
{
@@ -721,54 +634,102 @@
}
/**
- * Remove SkinConfig from Portal Skin Configs by module and skin name
+ * @deprecated The method name is not clear.
+ * Using {@link #removeSkin(String, String)} instead
+ */
+ @Deprecated
+ public void remove(String module, String skinName)
+ {
+ removeSkin(module, skinName);
+ }
+
+ /**
+ * Remove a Skin from the service as well as its cache
+ *
* @param module
* @param skinName
- * @throws Exception
*/
- public void remove(String module, String skinName) throws Exception
+ public void removeSkin(String module, String skinName)
{
SkinKey key;
if (skinName.length() == 0)
+ {
key = new SkinKey(module, DEFAULT_SKIN);
+ }
else
+ {
key = new SkinKey(module, skinName);
- skinConfigs_.remove(key);
+ }
+
+ removeSkin(key);
}
-
+
/**
- * Remove Skin from Portal available Skin by skin name
- * @param skinName
- * name of skin that will be removed
- * @throws Exception
+ * Remove a Skin mapped to the <code>key</code>
+ *
+ * @param key key whose mapping skin is to be removed from the service
*/
- public void removeSupportedSkin(String skinName) throws Exception
+ public void removeSkin(SkinKey key)
{
- availableSkins_.remove(skinName);
+ if (key == null)
+ {
+ return;
+ }
+
+ SkinConfig remove = skinConfigs_.remove(key);
+
+ if (remove != null)
+ {
+ invalidateCachedSkin(remove.getCSSPath());
+ }
}
-
+
/**
+ * @deprecated This is deprecated as its name was not clear.
+ * Use {@link #removeSkins(List)} instead
+ */
+ @Deprecated
+ public void remove(List<SkinKey> keys) throws Exception
+ {
+ removeSkins(keys);
+ }
+
+ /**
* Remove SkinConfig from Portal Skin Config by SkinKey
* @param keys
* SkinKey list these will be removed
* @throws Exception
*/
- public void remove(List<SkinKey> keys) throws Exception
+ public void removeSkins(List<SkinKey> keys) throws Exception
{
if (keys == null)
{
return;
}
+
for (SkinKey key : keys)
{
- skinConfigs_.remove(key);
+ removeSkin(key);
}
}
+
/**
- * get quantity of Portal Skin Config
- * @return
+ * Remove Skin from Portal available Skin by skin name
+ * @param skinName
+ * name of skin that will be removed
+ * @throws Exception
*/
+ public void removeSupportedSkin(String skinName) throws Exception
+ {
+ availableSkins_.remove(skinName);
+ }
+
+ /**
+ * Return the number of skin config maintaining in this SkinService
+ *
+ * @return the number of skin config maintaining in this SkinService
+ */
public int size()
{
return skinConfigs_.size();
@@ -800,7 +761,7 @@
private Resource getCSSResource(String cssPath, String outerCssFile)
{
Resource resource = mainResolver.resolve(cssPath);
- if (resource == null)
+ if (resource == null && log.isErrorEnabled())
{
String logMessage;
if (!cssPath.equals(outerCssFile))
@@ -821,22 +782,6 @@
}
return resource;
}
-
- /**
- * Apply CSS of skin
- * @param appendable
- * @param cssPath
- * @param orientation
- * @param merge
- * @throws RenderingException
- * @throws IOException
- */
- private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge)
- throws RenderingException, IOException
- {
- Resource skin = getCSSResource(cssPath, cssPath);
- processCSSRecursively(appendable, merge, skin, orientation);
- }
/**
* Apply CSS for Skin <br/>
@@ -859,7 +804,6 @@
String basePath = skin.getContextPath() + skin.getParentPath();
//
- String line = "";
Reader tmp = skin.read();
if (tmp == null)
{
@@ -868,7 +812,8 @@
BufferedReader reader = new SkipCommentReader(tmp, new CommentBlockHandler.OrientationCommentBlockHandler());
try
{
- while ((line = reader.readLine()) != null)
+ String line = reader.readLine();
+ while (line != null)
{
line = proccessOrientation(line, orientation);
line = proccessBackgroundUrl(line, basePath);
@@ -900,7 +845,11 @@
matcher.appendReplacement((StringBuffer)appendable, str);
}
matcher.appendTail((StringBuffer)appendable);
- appendable.append("\n");
+
+ if ((line = reader.readLine()) != null)
+ {
+ appendable.append("\n");
+ }
}
}
finally
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/ResourceCompressor.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -31,8 +31,10 @@
public interface ResourceCompressor
{
-
+ public boolean isSupported(ResourceType resourceType);
+
public void compress(Reader input, Writer output, ResourceType resourceType) throws ResourceCompressorException,
IOException;
+ public String compress(String input, ResourceType resourceType) throws ResourceCompressorException, IOException;
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/compressor/impl/ResourceCompressorService.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -20,6 +20,8 @@
import java.io.IOException;
import java.io.Reader;
+import java.io.StringReader;
+import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.HashMap;
@@ -50,16 +52,12 @@
@NameTemplate({@Property(key = "service", value = "resource")})
public class ResourceCompressorService implements ResourceCompressor, ManagementAware
{
-
/** . */
private Log log = ExoLogger.getLogger(ResourceCompressorService.class);
/** . */
private Map<ResourceType, List<ResourceCompressorPlugin>> plugins;
- /** . */
- private ManagementContext managementContext;
-
public ResourceCompressorService(InitParams params) throws Exception
{
@@ -108,6 +106,13 @@
return null;
}
+ @Override
+ final public boolean isSupported(ResourceType resourceType)
+ {
+ return (getHighestPriorityCompressorPlugin(resourceType) != null);
+ }
+
+ @Override
final public void compress(Reader input, Writer output, ResourceType resourceType)
throws ResourceCompressorException, IOException
{
@@ -121,6 +126,15 @@
throw new ResourceCompressorException("There is no compressor for " + resourceType + " type");
}
}
+
+ @Override
+ public String compress(String input, ResourceType resourceType) throws ResourceCompressorException, IOException
+ {
+ StringReader reader = new StringReader(input);
+ StringWriter writer = new StringWriter();
+ compress(reader, writer, resourceType);
+ return writer.toString();
+ }
public ResourceCompressorPlugin getHighestPriorityCompressorPlugin(ResourceType resourceType)
{
@@ -149,8 +163,10 @@
public void setContext(ManagementContext context)
{
- this.managementContext = context;
-
+ if (context == null)
+ {
+ return;
+ }
//
for (Map.Entry<ResourceType, List<ResourceCompressorPlugin>> entry : plugins.entrySet())
{
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortalSkinTask.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -76,14 +76,14 @@
}
String contextPath = scontext.getContextPath();
String fullCSSPath = contextPath + cssPath;
- Integer iCssPriority = null;
+ int priority;
try
{
- iCssPriority = Integer.valueOf(cssPriority);
+ priority = Integer.valueOf(cssPriority);
} catch (Exception e) {
- //Don't set cssPriority when it is not a numarical
+ priority = Integer.MAX_VALUE;
}
- skinService.addPortalSkin(moduleName, skinName, fullCSSPath, scontext, overwrite, iCssPriority);
+ skinService.addPortalSkin(moduleName, skinName, fullCSSPath, priority, overwrite);
updateSkinDependentManager(contextPath, moduleName, skinName);
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/tasks/PortletSkinTask.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -93,14 +93,14 @@
String moduleName = applicationName + "/" + portletName;
String contextPath = scontext.getContextPath();
String fullCSSPath = contextPath + cssPath;
- Integer iCSSPriority = null;
+ int priority;
try
{
- iCSSPriority = Integer.valueOf(cssPriority);
+ priority = Integer.valueOf(cssPriority);
} catch (Exception e) {
- //Don't set cssPriority when it is not a numarical
+ priority = Integer.MAX_VALUE;
}
- skinService.addSkin(moduleName, skinName, fullCSSPath, scontext, overwrite, iCSSPriority);
+ skinService.addSkin(moduleName, skinName, fullCSSPath, priority, overwrite);
updateSkinDependentManager(contextPath, moduleName, skinName);
}
Modified: portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java
===================================================================
--- portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/portal/resource/config/xml/SkinConfigParser.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -152,7 +152,7 @@
NodeList nodes = rootElement.getElementsByTagName(tagName);
SkinConfigTask task;
- for (int i = nodes.getLength() - 1; i >= 0; i--)
+ for (int i = 0; i < nodes.getLength(); i++)
{
task = (SkinConfigTask)elemtToTask(tagName);
if (task != null)
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 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/main/java/org/exoplatform/web/application/javascript/JavascriptConfigService.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -31,9 +31,6 @@
import java.io.BufferedReader;
import java.io.IOException;
import java.io.OutputStream;
-import java.io.Reader;
-import java.io.StringReader;
-import java.io.StringWriter;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.Collection;
@@ -319,11 +316,8 @@
// Minify
try
{
- Reader input = new StringReader(s);
- StringWriter output = new StringWriter();
- compressor.compress(input, output, ResourceType.JAVASCRIPT);
-
- jsBytes = output.toString().getBytes();
+ String output = compressor.compress(s, ResourceType.JAVASCRIPT);
+ jsBytes = output.getBytes();
}
catch (Exception e)
{
Copied: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java (from rev 7650, portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java)
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java (rev 0)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractSkinServiceTest.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1,220 @@
+/*
+ * 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;
+
+import org.exoplatform.commons.utils.PropertyManager;
+import org.exoplatform.commons.xml.DocumentSource;
+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.PortalContainer;
+import org.exoplatform.portal.resource.config.xml.SkinConfigParser;
+
+import java.net.URL;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+import javax.servlet.ServletContext;
+
+@ConfiguredBy({@ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml")})
+public abstract class AbstractSkinServiceTest extends AbstractKernelTest
+{
+ protected SkinService skinService;
+
+ private static ServletContext mockServletContext;
+
+ protected static MockResourceResolver resResolver;
+
+ abstract boolean isDevelopingMode();
+
+ abstract boolean setUpTestEnvironment();
+
+ abstract void touchSetUp();
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ //Set running mode at starting up
+ PropertyManager.setProperty(PropertyManager.DEVELOPING, String.valueOf(isDevelopingMode()));
+
+ PortalContainer portalContainer = getContainer();
+
+ skinService = (SkinService)portalContainer.getComponentInstanceOfType(SkinService.class);
+
+ if (setUpTestEnvironment())
+ {
+ mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader());
+ skinService.registerContext(mockServletContext);
+
+ resResolver = new MockResourceResolver();
+ skinService.addResourceResolver(resResolver);
+
+ URL url = mockServletContext.getResource("/gatein-resources.xml");
+ SkinConfigParser.processConfigResource(DocumentSource.create(url), skinService, mockServletContext);
+
+ touchSetUp();
+ }
+ }
+
+ public void testInitializing()
+ {
+ assertEquals(1, skinService.getAvailableSkinNames().size());
+ assertTrue(skinService.getAvailableSkinNames().contains("TestSkin"));
+
+ String css = skinService.getCSS("/path/to/MockResourceResolver.css");
+ assertEquals(MockResourceResolver.class.getName(), css);
+ }
+
+ public void testPortalSkinAndPriority()
+ {
+ Collection<SkinConfig> portalSkinConfigs = skinService.getPortalSkins("TestSkin");
+ assertNotNull(portalSkinConfigs);
+ assertEquals(4, portalSkinConfigs.size());
+
+ SkinConfig[] array = new SkinConfig[4];
+ portalSkinConfigs.toArray(array);
+
+ SkinConfig portalSkin = array[0];
+ assertNotNull(portalSkin);
+ assertEquals("CoreSkin", portalSkin.getModule());
+ assertEquals(mockServletContext.getContextPath() + "/skin/core/Stylesheet.css", portalSkin.getCSSPath());
+
+ portalSkin = array[1];
+ assertNotNull(portalSkin);
+ assertEquals("Module2", portalSkin.getModule());
+ assertEquals(mockServletContext.getContextPath() + "/skin/module2/Stylesheet.css", portalSkin.getCSSPath());
+
+ portalSkin = array[2];
+ assertNotNull(portalSkin);
+ assertEquals("Module3", portalSkin.getModule());
+ assertEquals(mockServletContext.getContextPath() + "/skin/module3/Stylesheet.css", portalSkin.getCSSPath());
+
+ portalSkin = array[3];
+ assertNotNull(portalSkin);
+ assertEquals("Module1", portalSkin.getModule());
+ assertEquals(mockServletContext.getContextPath() + "/skin/module1/Stylesheet.css", portalSkin.getCSSPath());
+ }
+
+ public void testPortletSkin()
+ {
+ SkinConfig portletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin");
+ assertNotNull(portletSkin);
+ assertEquals(mockServletContext.getContextPath() + "/skin/FirstPortlet.css",
+ portletSkin.getCSSPath());
+
+ portletSkin = skinService.getSkin("mockwebapp/SecondPortlet", "TestSkin");
+ assertNotNull(portletSkin);
+ assertEquals(mockServletContext.getContextPath() + "/skin/SecondPortlet.css",
+ portletSkin.getCSSPath());
+ }
+
+ public void testThemes()
+ {
+ Map<String, Set<String>> themeStyles = skinService.getPortletThemes();
+ Set<String> themes = themeStyles.get("Simple");
+ assertNotNull(themes);
+ assertTrue(themes.contains("SimpleBlue"));
+ assertTrue(themes.contains("SimpleViolet"));
+
+ assertNotNull(themeStyles.get("VistaStyle"));
+ }
+
+ public void testExistingCSS() throws Exception
+ {
+ String css = skinService.getCSS("/mockwebapp/skin/Stylesheet-lt.css");
+ assertTrue(css.length() > 0);
+
+ css = skinService.getCSS("/mockwebapp/skin/Stylesheet-rt.css");
+ assertTrue(css.length() > 0);
+ }
+
+ public void testNonExistingCSS()
+ {
+ String css = skinService.getCSS("/non/existing/file.css");
+ assertNull(css);
+
+ css = skinService.getCSS("/non/existing/file-lt.css");
+ assertNull(css);
+ }
+
+ public void testProcessComment()
+ {
+ String path = "/process/comment/file.css";
+ String css =
+ "foo; /*background:url(bar.gif); Inline comment*/" +
+ "/* Block comment\n" +
+ " background:url(bar.gif);\n" +
+ " End of block comment */";
+
+ resResolver.addResource(path, css);
+
+ //TODO: It should only ignore the comment instead of removing it
+// assertEquals(
+// "foo; /*background:url(bar.gif); Inline comment*/" +
+// "/* Block comment\n" +
+// " background:url(bar.gif);\n" +
+// " End of block comment */",
+// skinService.getCSS(path));
+ assertEquals("foo;", skinService.getCSS(path));
+ }
+
+ public void testOrientation()
+ {
+ String path = "/orientation/file";
+ String css =
+ "aaa;/*orientation=lt*/bbb;/*orientation=rt*/\n" +
+ " aaa; /* orientation=lt */ bbb; /* orientation=rt */ \n" +
+ "{aaa;bbb;/*orientation=lt*/ccc;ddd;/*orientation=rt*/}\n" +
+ "{aaa;/*orientation=lt*/bbb;}{ccc;/*orientation=rt*/ddd;}";
+
+ resResolver.addResource(path + ".css", css);
+
+ assertEquals(
+ "aaa;\n" +
+ "aaa;\n" +
+ "{aaa;bbb;/*orientation=lt*/ccc;}\n" +
+ "{aaa;/*orientation=lt*/bbb;}{ddd;}",
+ skinService.getCSS(path + "-lt.css"));
+
+ assertEquals(
+ "bbb;/*orientation=rt*/\n" +
+ " bbb; /* orientation=rt */\n" +
+ "{aaa;ccc;ddd;/*orientation=rt*/}\n" +
+ "{bbb;}{ccc;/*orientation=rt*/ddd;}",
+ skinService.getCSS(path + "-rt.css"));
+ }
+
+ public void testBackgroundURL()
+ {
+ String path = "/background/url/file.css";
+ String css =
+ "background:url(images/foo.gif);\n" +
+ "background:url('/images/foo.gif');\n" +
+ "aaa; background: #fff url('images/foo.gif') no-repeat center -614px; ccc;";
+
+ resResolver.addResource(path, css);
+ assertEquals(
+ "background:url(/background/url/images/foo.gif);\n" +
+ "background:url('/images/foo.gif');\n" +
+ "aaa; background: #fff url('/background/url/images/foo.gif') no-repeat center -614px; ccc;",
+ skinService.getCSS(path));
+ }
+}
Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/AbstractWebResourceTest.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -28,9 +28,8 @@
* @date 7/5/11
*/
@ConfiguredBy({
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/js-service-configuration.xml"),
- @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/skin-service-configuration.xml")
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/test-configuration.xml"),
+ @ConfigurationUnit(scope = ContainerScope.PORTAL, path = "conf/resource-compressor-service-configuration.xml")
})
public abstract class AbstractWebResourceTest extends AbstractKernelTest
{
Added: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java (rev 0)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/MockResourceResolver.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1,80 @@
+/*
+ * 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.
+ */
+
+package org.exoplatform.portal.resource;
+
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
+
+import java.io.Reader;
+import java.io.StringReader;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="trongtt(a)gmail.com">Trong Tran</a>
+ * @version $Revision$
+ */
+class MockResourceResolver implements ResourceResolver
+{
+ /** . */
+ private final Logger log = LoggerFactory.getLogger(MockResourceResolver.class);
+
+ private Map<String, String> map = new HashMap<String, String>();
+
+ public MockResourceResolver()
+ {
+ addResource("/path/to/MockResourceResolver.css", this.getClass().getName());
+ }
+
+ public void addResource(String path, String value)
+ {
+ map.put(path, value);
+ }
+
+ public String removeResource(String path)
+ {
+ return map.remove(path);
+ }
+
+ @Override
+ public Resource resolve(String path) throws NullPointerException
+ {
+ if (path == null)
+ {
+ throw new NullPointerException("No null path is accepted");
+ }
+
+ log.info("path to resolve : " + path);
+
+ final String css = map.get(path);
+ if (css != null)
+ {
+ return new Resource(path)
+ {
+ @Override
+ public Reader read()
+ {
+ return new StringReader(css);
+ }
+ };
+ }
+ return null;
+ }
+}
Modified: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinService.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -18,207 +18,116 @@
*/
package org.exoplatform.portal.resource;
-import org.exoplatform.commons.xml.DocumentSource;
-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.PortalContainer;
-import org.exoplatform.portal.resource.config.xml.SkinConfigParser;
-import java.io.ByteArrayOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
-import java.net.URL;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-import javax.servlet.ServletContext;
+import org.exoplatform.services.resources.Orientation;
+import java.util.Arrays;
+
/**
- * @author <a href="hoang281283(a)gmail.com">Minh Hoang TO</a>
- * @date 6/29/11
+ * @author <a href="trongtt(a)gmail.com">Trong Tran</a>
+ * @version $Revision$
*/
-public class TestSkinService extends AbstractWebResourceTest
+
+public class TestSkinService extends AbstractSkinServiceTest
{
- private PortalContainer portalContainer;
+ private static boolean isFirstStartup = true;
- private SkinService skinService;
-
- private ServletContext mockServletContext;
-
- private volatile boolean initSkinService = true;
-
- /** A cache of Method in SkinService, served for reflect invocation **/
- private Map<String, Method> methodsOfSkinService = new HashMap<String, Method>();
-
- @Override
- protected void setUp() throws Exception
+ boolean isDevelopingMode()
{
- if(initSkinService)
- {
- initSkinService = false;
-
- portalContainer = getContainer();
- skinService = (SkinService)portalContainer.getComponentInstanceOfType(SkinService.class);
- mockServletContext = new MockServletContext("mockwebapp", portalContainer.getPortalClassLoader());
- skinService.registerContext(mockServletContext);
-
- processSkinConfiguration("/gatein-resources.xml");
- }
+ return false;
}
- private void processSkinConfiguration(String configResource) throws Exception
+ @Override
+ boolean setUpTestEnvironment()
{
- URL url = mockServletContext.getResource(configResource);
- SkinConfigParser.processConfigResource(DocumentSource.create(url), skinService, mockServletContext);
+ return isFirstStartup;
}
- public void testInitService()
+ @Override
+ void touchSetUp()
{
- assertNotNull(portalContainer);
- assertEquals("portal", portalContainer.getName());
- assertNotNull(skinService);
+ isFirstStartup = false;
}
- public void testInitSkinModules()
+ public void testCompositeSkin()
{
- assertNotNull(skinService.getAvailableSkinNames());
- assertTrue(skinService.getAvailableSkinNames().contains("TestSkin"));
- }
+ SkinConfig fSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin");
+ SkinConfig sSkin = skinService.getSkin("mockwebapp/SecondPortlet", "TestSkin");
+ assertNotNull(fSkin);
+ assertNotNull(sSkin);
- public void testInitThemes()
- {
+ Skin merged = skinService.merge(Arrays.asList(fSkin, sSkin));
+ SkinURL url = merged.createURL();
- }
+ url.setOrientation(Orientation.LT);
+ assertEquals(
+ ".FirstPortlet {foo1 : bar1}\n" +
+ ".SecondPortlet {foo2 : bar2}",
+ skinService.getCSS(url.toString()));
- public void testDeployedSkinModules()
- {
- assertNotNull(skinService.getAvailableSkinNames());
- assertTrue(skinService.getAvailableSkinNames().contains("TestSkin"));
-
- Collection<SkinConfig> skinConfigs = skinService.getPortalSkins("TestSkin");
- assertNotNull(skinConfigs);
-
- SkinConfig portalSkin = null;
- for(SkinConfig config : skinConfigs)
- {
- if("TestSkin".equals(config.getName()))
- {
- portalSkin = config;
- break;
- }
- }
- assertNotNull(portalSkin);
- assertEquals(mockServletContext.getContextPath() + "/skin/Stylesheet.css", portalSkin.getCSSPath());
-
- SkinConfig firstPortletSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin");
- assertNotNull(firstPortletSkin);
- assertEquals(mockServletContext.getContextPath() + "/skin/portlet/FirstPortlet/Stylesheet.css", firstPortletSkin.getCSSPath());
+ url.setOrientation(Orientation.RT);
+ assertEquals(
+ ".FirstPortlet {foo1 : bar1}\n" +
+ ".SecondPortlet {foo2 : bar2}",
+ skinService.getCSS(url.toString()));
}
- public void testDeployedThemes()
+ public void testCache()
{
+ String path = "/path/to/test/caching.css";
- }
+ resResolver.addResource(path, "foo");
+ assertEquals("foo", skinService.getCSS(path));
- public void testRenderLT_CSS() throws Exception
- {
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ResourceRenderer renderer = new MockResourceRenderer(out);
-
- skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-lt.css");
-
- //TODO: Check the array of bytes in out
+ resResolver.addResource(path, "bar");
+ assertEquals("foo", skinService.getCSS(path));
}
-
- public void testRenderRT_CSS() throws Exception
+
+ public void testInvalidateCache()
{
- ByteArrayOutputStream out = new ByteArrayOutputStream();
- ResourceRenderer renderer = new MockResourceRenderer(out);
+ String path = "/path/to/test/caching.css";
- skinService.renderCSS(renderer, "/mockwebapp/skin/Stylesheet-rt.css");
+ resResolver.addResource(path, "foo");
+ assertEquals("foo", skinService.getCSS(path));
- //TODO: Check the array of bytes in out
+ resResolver.addResource(path, "bar");
+ skinService.invalidateCachedSkin(path);
+ assertEquals("bar", skinService.getCSS(path));
}
- public void testBackground() throws Exception
+ public void testProcessImportCSS()
{
- }
+ String parent = "/process/import/css.css";
- public void testServiceCache() throws Exception
- {
- }
+ resResolver.addResource(parent, "@import url(Portlet/Stylesheet.css); aaa;");
+ assertEquals(" aaa;", skinService.getCSS(parent));
+ skinService.invalidateCachedSkin(parent);
+
+ resResolver.addResource(parent, "@import url('/Portlet/Stylesheet.css'); aaa;");
+ assertEquals(" aaa;", skinService.getCSS(parent));
+ skinService.invalidateCachedSkin(parent);
- public void testSkinPriority() throws Exception
- {
- }
+ //parent file import child css file
+ resResolver.addResource(parent, "@import url(childCSS/child.css); background:url(images/foo.gif);");
+ String child = "/process/import/childCSS/child.css";
+ resResolver.addResource(child, "background:url(bar.gif);");
- public void testUndeploySkinConfig() throws Exception
- {
- //TODO: Fork the work of GateInSkinConfigRemoval here
+ /*
+ * Now test merge and process recursively (run in non-dev mode)
+ * We have folder /path/to/parent.css
+ * /images/foo.gif
+ * /childCSS/child.css
+ * /bar.gif
+ */
+ assertEquals("background:url(/process/import/childCSS/bar.gif); background:url(/process/import/images/foo.gif);",
+ skinService.getCSS(parent));
}
- /**
- * Designed to invoke reflectively private methods of SkinService. That facilitate
- * writting JUnit tests
- *
- * @param methodName
- * @param arguments
- */
- private void invokeMethodOfSkinService(String methodName, Object... arguments)
+ public void testLastModifiedSince()
{
- StringBuilder methodSignature = new StringBuilder(methodName);
- Class<?>[] paramTypes = new Class<?>[arguments.length];
- for(int i =0; i < arguments.length; i++)
- {
- paramTypes[i] = arguments[i].getClass();
- methodSignature.append("_");
- methodSignature.append(paramTypes[i].getName());
- }
- //First we look at the cache
- Method method = methodsOfSkinService.get(methodSignature.toString());
+ String path = "/last/modify/since.css";
+ resResolver.addResource(path, "foo");
- //Find method by reflection
- if(method == null)
- {
- try
- {
- method = skinService.getClass().getDeclaredMethod(methodName, paramTypes);
- if(method != null)
- {
- method.setAccessible(true);
- methodsOfSkinService.put(methodSignature.toString(), method);
- }
- else
- {
- return;
- }
- }
- catch (NoSuchMethodException ex)
- {
- }
- }
-
- try
- {
- if(Modifier.isStatic(method.getModifiers()))
- {
- method.invoke(null, arguments);
- }
- else
- {
- method.invoke(skinService, arguments);
- }
- }
- catch(Exception ex)
- {
- ex.printStackTrace();
- }
+ assertTrue(skinService.getCSS(path).length() > 0);
+ assertTrue(skinService.getLastModified(path) < System.currentTimeMillis());
}
-
- @Override
- protected void tearDown() throws Exception
- {
- }
}
Added: portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java
===================================================================
--- portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java (rev 0)
+++ portal/trunk/component/web/resources/src/test/java/org/exoplatform/portal/resource/TestSkinServiceInDevelopingMode.java 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1,116 @@
+/*
+ * 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;
+
+import org.exoplatform.services.resources.Orientation;
+
+import java.util.Arrays;
+
+
+/**
+ * @author <a href="trongtt(a)gmail.com">Trong Tran</a>
+ * @version $Revision$
+ */
+
+public class TestSkinServiceInDevelopingMode extends AbstractSkinServiceTest
+{
+ private static boolean isFirstStartup = true;
+
+ boolean isDevelopingMode()
+ {
+ return true;
+ }
+
+ @Override
+ boolean setUpTestEnvironment()
+ {
+ return isFirstStartup;
+ }
+
+ @Override
+ void touchSetUp()
+ {
+ isFirstStartup = false;
+ }
+
+ public void testCompositeSkin()
+ {
+ SkinConfig fSkin = skinService.getSkin("mockwebapp/FirstPortlet", "TestSkin");
+ SkinConfig sSkin = skinService.getSkin("mockwebapp/SecondPortlet", "TestSkin");
+ assertNotNull(fSkin);
+ assertNotNull(sSkin);
+
+ Skin merged = skinService.merge(Arrays.asList(fSkin, sSkin));
+ SkinURL url = merged.createURL();
+
+ url.setOrientation(Orientation.LT);
+ assertEquals("@import url(/mockwebapp/skin/FirstPortlet-lt.css);\n"
+ + "@import url(/mockwebapp/skin/SecondPortlet-lt.css);", skinService.getCSS(url.toString()));
+
+ url.setOrientation(Orientation.RT);
+ assertEquals("@import url(/mockwebapp/skin/FirstPortlet-rt.css);\n"
+ + "@import url(/mockwebapp/skin/SecondPortlet-rt.css);", skinService.getCSS(url.toString()));
+ }
+
+ public void testCache()
+ {
+ String path = "/path/to/test/caching.css";
+
+ resResolver.addResource(path, "foo");
+ assertEquals("foo", skinService.getCSS(path));
+
+ resResolver.addResource(path, "bar");
+ assertEquals("bar", skinService.getCSS(path));
+ }
+
+ public void testProcessImportCSS()
+ {
+ String parent = "/process/import/css.css";
+
+ resResolver.addResource(parent, "@import url(Portlet/Stylesheet.css); aaa;");
+ assertEquals("@import url(/process/import/Portlet/Stylesheet-lt.css); aaa;", skinService.getCSS(parent));
+
+ resResolver.addResource(parent, "@import url('/Portlet/Stylesheet.css'); aaa;");
+ assertEquals("@import url('/Portlet/Stylesheet-lt.css'); aaa;", skinService.getCSS(parent));
+
+ //parent file import child css file
+ resResolver.addResource(parent, "@import url(childCSS/child.css); background:url(images/foo.gif);");
+ String child = "/process/import/childCSS/child.css";
+ resResolver.addResource(child, "background:url(bar.gif);");
+
+ /*
+ * Now test merge and process recursively (run in non-dev mode)
+ * We have folder /process/import/css.css
+ * /images/foo.gif
+ * /childCSS/child.css
+ * /bar.gif
+ */
+ assertEquals("@import url(/process/import/childCSS/child-lt.css); background:url(/process/import/images/foo.gif);",
+ skinService.getCSS(parent));
+ }
+
+ public void testLastModifiedSince()
+ {
+ String path = "/last/modify/since.css";
+ resResolver.addResource(path, "foo");
+
+ assertTrue(skinService.getCSS(path).length() > 0);
+ assertEquals(Long.MAX_VALUE, skinService.getLastModified(path));
+ }
+}
Deleted: portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/test/resources/conf/js-service-configuration.xml 2011-10-10 08:29:57 UTC (rev 7695)
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
- <component>
- <key>org.exoplatform.web.application.javascript.JavascriptConfigService</key>
- <type>org.exoplatform.web.application.javascript.JavascriptConfigService</type>
- </component>
-</configuration>
Deleted: portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-10 08:29:57 UTC (rev 7695)
@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
-
- <component>
- <key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key>
- <type>org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService</type>
- <component-plugins>
- <component-plugin>
- <name>MockCompressorPlugin</name>
- <set-method>registerCompressorPlugin</set-method>
- <type>org.exoplatform.portal.resource.compressor.MockCompressorPlugin</type>
- <init-params>
- <value-param>
- <name>plugin.priority</name>
- <value>5</value>
- </value-param>
- </init-params>
- </component-plugin>
-
- <component-plugin>
- <name>JSMinCompressorPlugin</name>
- <set-method>registerCompressorPlugin</set-method>
- <type>org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin</type>
- <init-params>
- <value-param>
- <name>plugin.priority</name>
- <value>9</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>
- <init-params>
- <value-param>
- <name>plugin.priority</name>
- <value>1</value>
- </value-param>
- <value-param>
- <name>line.break.position</name>
- <value>100</value>
- </value-param>
- </init-params>
- </component-plugin>
- </component-plugins>
- </component>
-</configuration>
Added: portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml (rev 0)
+++ portal/trunk/component/web/resources/src/test/resources/conf/resource-compressor-service-configuration.xml 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
+
+ <external-component-plugins>
+ <target-component>org.exoplatform.portal.resource.compressor.ResourceCompressor</target-component>
+ <component-plugin>
+ <name>MockCompressorPlugin</name>
+ <set-method>registerCompressorPlugin</set-method>
+ <type>org.exoplatform.portal.resource.compressor.MockCompressorPlugin</type>
+ <init-params>
+ <value-param>
+ <name>plugin.priority</name>
+ <value>5</value>
+ </value-param>
+ </init-params>
+ </component-plugin>
+
+ <component-plugin>
+ <name>JSMinCompressorPlugin</name>
+ <set-method>registerCompressorPlugin</set-method>
+ <type>org.exoplatform.portal.resource.compressor.impl.JSMinCompressorPlugin</type>
+ <init-params>
+ <value-param>
+ <name>plugin.priority</name>
+ <value>9</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>
+ <init-params>
+ <value-param>
+ <name>plugin.priority</name>
+ <value>1</value>
+ </value-param>
+ <value-param>
+ <name>line.break.position</name>
+ <value>100</value>
+ </value-param>
+ </init-params>
+ </component-plugin>
+ </external-component-plugins>
+</configuration>
Deleted: portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/test/resources/conf/skin-service-configuration.xml 2011-10-10 08:29:57 UTC (rev 7695)
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- 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.
-
--->
-
-<configuration
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
- xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
-
- <component>
- <key>org.exoplatform.portal.resource.SkinService</key>
- <type>org.exoplatform.portal.resource.SkinService</type>
- </component>
-</configuration>
Added: portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml (rev 0)
+++ portal/trunk/component/web/resources/src/test/resources/conf/test-configuration.xml 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+ 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.
+
+-->
+
+<configuration
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd http://www.exoplaform.org/xml/ns/kernel_1_1.xsd"
+ xmlns="http://www.exoplaform.org/xml/ns/kernel_1_1.xsd">
+
+ <component>
+ <key>org.exoplatform.portal.resource.SkinService</key>
+ <type>org.exoplatform.portal.resource.SkinService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.web.application.javascript.JavascriptConfigService</key>
+ <type>org.exoplatform.web.application.javascript.JavascriptConfigService</type>
+ </component>
+
+ <component>
+ <key>org.exoplatform.portal.resource.compressor.ResourceCompressor</key>
+ <type>org.exoplatform.portal.resource.compressor.impl.ResourceCompressorService</type>
+ </component>
+</configuration>
\ No newline at end of file
Modified: portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-10 08:10:35 UTC (rev 7694)
+++ portal/trunk/component/web/resources/src/test/resources/mockwebapp/gatein-resources.xml 2011-10-10 08:29:57 UTC (rev 7695)
@@ -21,128 +21,93 @@
-->
<gatein-resources
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_1 http://www.gatein.org/xml/ns/gatein_resources_1_1"
- xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_1">
+ xsi:schemaLocation="http://www.gatein.org/xml/ns/gatein_resources_1_2 http://www.gatein.org/xml/ns/gatein_resources_1_2"
+ xmlns="http://www.gatein.org/xml/ns/gatein_resources_1_2">
- <portal-skin>
- <skin-name>TestSkin</skin-name>
- <css-path>/skin/Stylesheet.css</css-path>
- </portal-skin>
+ <portal-skin>
+ <skin-name>TestSkin</skin-name>
+ <css-path>/skin/core/Stylesheet.css</css-path>
+ <css-priority>0</css-priority>
+ </portal-skin>
- <portlet-skin>
- <application-name>mockwebapp</application-name>
- <portlet-name>FirstPortlet</portlet-name>
- <skin-name>TestSkin</skin-name>
- <css-path>/skin/portlet/FirstPortlet/Stylesheet.css</css-path>
- </portlet-skin>
+ <portal-skin>
+ <skin-name>TestSkin</skin-name>
+ <skin-module>Module1</skin-module>
+ <css-path>/skin/module1/Stylesheet.css</css-path>
+ </portal-skin>
- <!-- Simple window style -->
- <window-style>
- <style-name>Simple</style-name>
- <style-theme>
- <theme-name>SimpleBlue</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>SimpleViolet</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>SimpleOrange</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>SimplePink</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>SimpleGreen</theme-name>
- </style-theme>
- </window-style>
-
- <!-- RoundConer window style -->
- <window-style>
- <style-name>RoundConer</style-name>
- <style-theme>
- <theme-name>RoundConerBlue</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>RoundConerViolet</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>RoundConerOrange</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>RoundConerPink</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>RoundConerGreen</theme-name>
- </style-theme>
- </window-style>
-
- <!-- Shadow window style -->
- <window-style>
- <style-name>Shadow</style-name>
- <style-theme>
- <theme-name>ShadowBlue</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>ShadowViolet</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>ShadowOrange</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>ShadowPink</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>ShadowGreen</theme-name>
- </style-theme>
- </window-style>
-
- <!-- MacStyle window style -->
- <window-style>
- <style-name>MacStyle</style-name>
- <style-theme>
- <theme-name>MacTheme</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>MacGray</theme-name>
- </style-theme>
- <style-theme>
- <theme-name>MacGreenSteel</theme-name>
- </style-theme>
- </window-style>
-
- <!-- VistaStyle window style -->
- <window-style>
- <style-name>VistaStyle</style-name>
- <style-theme>
- <theme-name>VistaTheme</theme-name>
- </style-theme>
- </window-style>
-
- <javascript>
- <param>
- <js-module>js.test1</js-module>
- <js-path>/js/test1.js</js-path>
- <js-priority>-1</js-priority>
- </param>
- </javascript>
- <javascript>
- <param>
- <js-module>js.test2</js-module>
- <js-path>/js/test2.js</js-path>
- <js-priority>1</js-priority>
- </param>
- </javascript>
- <javascript>
- <param>
- <js-module>js.test3</js-module>
- <js-path>/js/test3.js</js-path>
- </param>
- </javascript>
- <javascript>
- <param>
- <js-module>js.test4</js-module>
- <js-path>/js/test4.js</js-path>
- <js-priority>2</js-priority>
- </param>
- </javascript>
+ <portal-skin>
+ <skin-name>TestSkin</skin-name>
+ <skin-module>Module2</skin-module>
+ <css-path>/skin/module2/Stylesheet.css</css-path>
+ <css-priority>1</css-priority>
+ </portal-skin>
+
+ <portal-skin>
+ <skin-name>TestSkin</skin-name>
+ <skin-module>Module3</skin-module>
+ <css-path>/skin/module3/Stylesheet.css</css-path>
+ <css-priority>1</css-priority>
+ </portal-skin>
+
+ <portlet-skin>
+ <application-name>mockwebapp</application-name>
+ <portlet-name>FirstPortlet</portlet-name>
+ <skin-name>TestSkin</skin-name>
+ <css-path>/skin/FirstPortlet.css</css-path>
+ </portlet-skin>
+
+ <portlet-skin>
+ <application-name>mockwebapp</application-name>
+ <portlet-name>SecondPortlet</portlet-name>
+ <skin-name>TestSkin</skin-name>
+ <css-path>/skin/SecondPortlet.css</css-path>
+ </portlet-skin>
+
+ <!-- Simple window style -->
+ <window-style>
+ <style-name>Simple</style-name>
+ <style-theme>
+ <theme-name>SimpleBlue</theme-name>
+ </style-theme>
+ <style-theme>
+ <theme-name>SimpleViolet</theme-name>
+ </style-theme>
+ </window-style>
+
+ <!-- VistaStyle window style -->
+ <window-style>
+ <style-name>VistaStyle</style-name>
+ <style-theme>
+ <theme-name>VistaTheme</theme-name>
+ </style-theme>
+ </window-style>
+
+ <javascript>
+ <param>
+ <js-module>js.test1</js-module>
+ <js-path>/js/test1.js</js-path>
+ <js-priority>-1</js-priority>
+ </param>
+ </javascript>
+ <javascript>
+ <param>
+ <js-module>js.test2</js-module>
+ <js-path>/js/test2.js</js-path>
+ <js-priority>1</js-priority>
+ </param>
+ </javascript>
+ <javascript>
+ <param>
+ <js-module>js.test3</js-module>
+ <js-path>/js/test3.js</js-path>
+ </param>
+ </javascript>
+ <javascript>
+ <param>
+ <js-module>js.test4</js-module>
+ <js-path>/js/test4.js</js-path>
+ <js-priority>2</js-priority>
+ </param>
+ </javascript>
</gatein-resources>
Added: portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css (rev 0)
+++ portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/FirstPortlet.css 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1 @@
+.FirstPortlet {foo1 : bar1}
\ No newline at end of file
Added: portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css
===================================================================
--- portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css (rev 0)
+++ portal/trunk/component/web/resources/src/test/resources/mockwebapp/skin/SecondPortlet.css 2011-10-10 08:29:57 UTC (rev 7695)
@@ -0,0 +1 @@
+.SecondPortlet {foo2 : bar2}
\ No newline at end of file
13 years, 3 months
- 1
- 0
gatein SVN: r7694 - portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster.
by do-not-reply＠jboss.org
Author: haint
Date: 2011-10-10 04:10:35 -0400 (Mon, 10 Oct 2011)
New Revision: 7694
Modified:
portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
Log:
GTNPORTAL-2158 No eviction policy is allowed in case of the cache for indexing
Modified: portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-10-10 01:25:25 UTC (rev 7693)
+++ portal/trunk/component/common/src/main/java/conf/jcr/jbosscache/cluster/indexer-config.xml 2011-10-10 08:10:35 UTC (rev 7694)
@@ -29,12 +29,4 @@
<jgroupsConfig multiplexerStack="jcr.stack" />
<sync />
</clustering>
- <!-- Eviction configuration -->
- <eviction wakeUpInterval="5000">
- <default algorithmClass="org.jboss.cache.eviction.FIFOAlgorithm" eventQueueSize="1000000">
- <property name="maxNodes" value="5000" />
- <property name="minTimeToLive" value="20000" />
- </default>
- </eviction>
-
</jbosscache>
13 years, 3 months
- 1
- 0