January 2011 - gatein-commits - Jboss List Archives

gatein SVN: r5819 - in components/wsrp/branches/2.0.x/producer/src: test/java/org/gatein/wsrp/producer/config and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-01-26 06:47:35 -0500 (Wed, 26 Jan 2011) New Revision: 5819 Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerRegistrationRequirementsTestCase.java Log: - GTNWSRP-198: Fixed improper check to see if we needed to reload the RegistrationPolicy. Added related tests. Modified: components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java =================================================================== --- components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2011-01-26 09:52:23 UTC (rev 5818) +++ components/wsrp/branches/2.0.x/producer/src/main/java/org/gatein/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2011-01-26 11:47:35 UTC (rev 5819) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * 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. @@ -358,12 +358,8 @@ { // only reload if we don't already have a policy or if the requested policy/validator classes are different // from the ones we already have - if ( - policy == null || - ( - ParameterValidation.isOldAndNewDifferent(this.policyClassName, policyClassName) && - ParameterValidation.isOldAndNewDifferent(this.validatorClassName, validatorClassName) - ) + if (policy == null || ParameterValidation.isOldAndNewDifferent(this.policyClassName, policyClassName) || + (DEFAULT_POLICY_CLASS_NAME.equals(policyClassName) && ParameterValidation.isOldAndNewDifferent(this.validatorClassName, validatorClassName)) ) { if (policyClassName != null && !DEFAULT_POLICY_CLASS_NAME.equals(policyClassName)) Modified: components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerRegistrationRequirementsTestCase.java =================================================================== --- components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerRegistrationRequirementsTestCase.java 2011-01-26 09:52:23 UTC (rev 5818) +++ components/wsrp/branches/2.0.x/producer/src/test/java/org/gatein/wsrp/producer/config/ProducerRegistrationRequirementsTestCase.java 2011-01-26 11:47:35 UTC (rev 5819) @@ -1,6 +1,6 @@ /* * JBoss, a division of Red Hat - * Copyright 2010, Red Hat Middleware, LLC, and individual + * 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. @@ -27,6 +27,8 @@ import org.gatein.registration.RegistrationPolicy; import org.gatein.registration.RegistrationPolicyChangeListener; import org.gatein.registration.RegistrationPropertyChangeListener; +import org.gatein.registration.policies.DefaultRegistrationPolicy; +import org.gatein.registration.policies.RegistrationPolicyWrapper; import org.gatein.wsrp.WSRPConstants; import org.gatein.wsrp.producer.config.impl.ProducerRegistrationRequirementsImpl; import org.gatein.wsrp.registration.PropertyDescription; @@ -68,6 +70,20 @@ assertTrue(requirements.getLastModified() > lastModified); } + public void testChangeRegistrationPolicy() + { + ProducerRegistrationRequirements requirements = new ProducerRegistrationRequirementsImpl(); + requirements.setRegistrationRequired(true); // so that we load the policy + assertTrue(requirements.getPolicy() instanceof DefaultRegistrationPolicy); + + requirements.reloadPolicyFrom("org.gatein.wsrp.producer.config.TestRegistrationPolicy", ProducerRegistrationRequirements.DEFAULT_VALIDATOR_CLASS_NAME); + + RegistrationPolicy policy = requirements.getPolicy(); + assertTrue(policy instanceof RegistrationPolicyWrapper); + RegistrationPolicyWrapper wrapper = (RegistrationPolicyWrapper)policy; + assertTrue(wrapper.getDelegate() instanceof TestRegistrationPolicy); + } + public void testSetUnchangedRegistrationProperties() { ProducerRegistrationRequirements requirements = new ProducerRegistrationRequirementsImpl();

13 years, 3 months

1
0
0 / 0

gatein SVN: r5818 - portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future.

by do-not-reply＠jboss.org

Author: julien_viet Date: 2011-01-26 04:52:23 -0500 (Wed, 26 Jan 2011) New Revision: 5818 Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureCache.java Log: clarify FutureCache usage with javadoc Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureCache.java =================================================================== --- portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureCache.java 2011-01-25 17:12:23 UTC (rev 5817) +++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureCache.java 2011-01-26 09:52:23 UTC (rev 5818) @@ -25,9 +25,20 @@ import java.util.concurrent.*; /** - * A future cache that prevents the loading of the same resource twice. This should be used when the resource - * to load is very expensive or cannot be concurrently retrieved (like a classloading). + * <p>A future cache that prevents the loading of the same resource twice. This should be used when the resource + * to load is very expensive or cannot be concurrently retrieved (like a classloading).</p> * + * <p>The future cache should be used with the {@link #get(Object, Object)} method, that retrieves an object + * from the cache. When the object is not found, then the {@link Loader#retrieve(Object, Object)} method is + * used to retrieve the data and then this data is inserted in the cache.</p> + * + * <p>The class is abstract and does not implement a cache technology by itself, the cache implementation is delegated + * to the contractual methods {@link #get(Object)} and {@link #put(Object, Object)}. Those methods are intended + * to be used by the future cache only.</p> + * + * <p>The {@link Loader} interface provides a source to retrieve objects to put in the cache. The goal to maintain + * this interface is to decouple the cache from the object source.</p> + * * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> * @version $Revision$ * @param <K> the key type parameter @@ -52,8 +63,21 @@ this.futureEntries = new ConcurrentHashMap<K, FutureTask<V>>(); } + /** + * Retrieves the cached value corresponding to the specified key from the cache, it must returns null when the + * key does not exist. This method is intended for internal use by the future cache only. + * + * @param key the key + * @return the cache value + */ protected abstract V get(K key); + /** + * Updates the cache with a new key/value pair. This method is intended for internal use by the future cache only. + * + * @param key the key + * @param value the cache value + */ protected abstract void put(K key, V value); /**

13 years, 3 months

1
0
0 / 0

gatein SVN: r5817 - in portal/branches/wci: component/wsrp/src/main/java/org/gatein/portal/wsrp/structure and 12 other directories.

by do-not-reply＠jboss.org

Author: alain_defrance Date: 2011-01-25 12:12:23 -0500 (Tue, 25 Jan 2011) New Revision: 5817 Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java Log: merged from trunk 5801 Modified: portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java =================================================================== --- portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/component/web/security/src/main/java/org/exoplatform/web/login/ErrorLoginServlet.java 2011-01-25 17:12:23 UTC (rev 5817) @@ -71,13 +71,12 @@ resp.setContentType("text/html; charset=UTF-8"); // This allows the customer to define another login page without changing the portal - //context.getRequestDispatcher("/login/jsp/login.jsp").include(req, resp); showLoginForm(req, resp); } private void showLoginForm(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException - { - String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri"); + { + String initialURI = (String)req.getAttribute("javax.servlet.forward.request_uri"); if (initialURI == null) { throw new IllegalStateException("request attribute javax.servlet.forward.request_uri should not be null here"); Modified: portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java =================================================================== --- portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/component/wsrp/src/main/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProvider.java 2011-01-25 17:12:23 UTC (rev 5817) @@ -88,7 +88,7 @@ private void addPage(Page page) { Described described = page.adapt(Described.class); - PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName()); + PageInfo pageInfo = new PageInfo(page.getObjectId(), described.getName(), page.getName()); pageInfos.put(pageInfo.getName(), pageInfo); UIContainer container = page.getRootComponent(); processContainer(container, pageInfo); @@ -194,6 +194,16 @@ org.exoplatform.portal.config.model.Page portalPage = event.getData(); Page page = structureAccess.getPageFrom(portalPage); + if (page == null && DataStorage.PAGE_REMOVED.equals(eventName)) + { + // if we try to remove a page, when we get this event, the page has already been removed from JCR + // so we need to work around that fact by retrieving the corresponding PageInfo from the portal page title + // which should match the Described name and check that it matches the internal name before removing it + removePage(portalPage.getTitle(), portalPage.getName()); + + return; + } + if (page != null) { if (DataStorage.PAGE_CREATED.equals(eventName)) @@ -201,10 +211,6 @@ // add information for new page addPage(page); } - else if (DataStorage.PAGE_REMOVED.equals(eventName)) - { - removePage(page); - } else if (DataStorage.PAGE_UPDATED.equals(eventName)) { removePage(page); @@ -218,8 +224,13 @@ Described described = page.adapt(Described.class); String name = described.getName(); + removePage(name, page.getName()); + } + + private void removePage(String name, String internalName) + { PageInfo pageInfo = pageInfos.get(name); - if (pageInfo != null) + if (pageInfo != null && internalName.equals(pageInfo.getInternalName())) { // remove page info pageInfos.remove(name); @@ -230,12 +241,18 @@ { private final String uuid; private final Map<String, String> childrenWindows = new HashMap<String, String>(); + + /** Name as provided by Described */ private final String name; - private PageInfo(String uuid, String name) + /** Name as automatically generated */ + private final String internalName; + + private PageInfo(String uuid, String name, String internalName) { this.uuid = uuid; this.name = name; + this.internalName = internalName; } public String getUUID() @@ -243,6 +260,11 @@ return uuid; } + public String getInternalName() + { + return internalName; + } + public List<String> getChildrenWindows() { return new ArrayList<String>(childrenWindows.keySet()); Modified: portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java =================================================================== --- portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/component/wsrp/src/test/java/org/gatein/portal/wsrp/structure/MOPConsumerStructureProviderTestCase.java 2011-01-25 17:12:23 UTC (rev 5817) @@ -132,9 +132,15 @@ public void testPageDeletionEvent() throws Exception { + String pageToRemove = "page1"; + org.exoplatform.portal.config.model.Page portalPage = mock(org.exoplatform.portal.config.model.Page.class); - when(structureAccess.getPageFrom(portalPage)).thenReturn(page1); + when(portalPage.getName()).thenReturn(createInternalNameFrom(pageToRemove)); + when(portalPage.getTitle()).thenReturn(pageToRemove); + // on delete, we actually get the event after the page has been removed from JCR so we don't have an actual page + when(structureAccess.getPageFrom(portalPage)).thenReturn(null); + int pageNumber = provider.getPageIdentifiers().size(); provider.onEvent(new Event<DataStorage, org.exoplatform.portal.config.model.Page>(DataStorage.PAGE_REMOVED, null, portalPage)); @@ -142,7 +148,7 @@ List<String> identifiers = provider.getPageIdentifiers(); assertEquals(pageNumber - 1, identifiers.size()); // deleting a page doesn't delete its children, see GTNPORTAL-1630 - assertFalse(identifiers.contains("page1")); + assertFalse(identifiers.contains(pageToRemove)); assertTrue(identifiers.contains("page11")); assertTrue(identifiers.contains("page12")); } @@ -201,7 +207,7 @@ { Page page = mock(Page.class); - when(page.getName()).thenThrow(new RuntimeException("Page.getName returns the internal name, not the human readable one")); + when(page.getName()).thenReturn(createInternalNameFrom(name)); // mock call to adapt Described described = mock(Described.class); @@ -227,6 +233,11 @@ return page; } + private String createInternalNameFrom(String name) + { + return name + "internal"; + } + private void addWindows(Page page, String... windowNames) { if (windowNames != null) Modified: portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/examples/extension/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 17:12:23 UTC (rev 5817) @@ -26,7 +26,6 @@ <%@ page import="java.util.ResourceBundle"%> <%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%> <%@ page import="org.gatein.common.text.EntityEncoder"%> -<%--<%@ page import="javax.servlet.http.HttpSession"%>--%> <%@ page language="java" %> <%@ page contentType="text/html; charset=utf-8" %> <% @@ -41,10 +40,6 @@ ResourceBundleService service = (ResourceBundleService) portalContainer.getComponentInstanceOfType(ResourceBundleService.class); ResourceBundle res = service.getResourceBundle(service.getSharedResourceBundleNames(), request.getLocale()) ; - //String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); - /*HttpSession httpSession = request.getSession(true); - String uri = (String)httpSession.getAttribute("org.gatein.portal.login.initial_uri"); - httpSession.removeAttribute("org.gatein.portal.login.initial_uri");*/ String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, ""); Modified: portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/examples/portal/war/src/main/webapp/login/jsp/login.jsp 2011-01-25 17:12:23 UTC (rev 5817) @@ -26,7 +26,6 @@ <%@ page import="java.util.ResourceBundle"%> <%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%> <%@ page import="org.gatein.common.text.EntityEncoder"%> -<%--<%@ page import="javax.servlet.http.HttpSession"%>--%> <%@ page language="java" %> <%@ page contentType="text/html; charset=utf-8" %> <% @@ -41,10 +40,6 @@ ResourceBundleService service = (ResourceBundleService) portalContainer.getComponentInstanceOfType(ResourceBundleService.class); ResourceBundle res = service.getResourceBundle(service.getSharedResourceBundleNames(), request.getLocale()) ; - //String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); - /*HttpSession httpSession = request.getSession(true); - String uri = (String)httpSession.getAttribute("org.gatein.portal.login.initial_uri"); - httpSession.removeAttribute("org.gatein.portal.login.initial_uri");*/ String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); Cookie cookie = new Cookie(InitiateLoginServlet.COOKIE_NAME, ""); Modified: portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml =================================================================== --- portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/gadgets/eXoGadgets/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817) @@ -19,4 +19,4 @@ --> -<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/> \ No newline at end of file +<Context path="/eXoGadgetServer" docBase="eXoGadgetServer" debug="0" reloadable="true" crossContext="true"/> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_26_ChangeApplicationInPortal.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -467,6 +467,11 @@ <td>Test_SNF_PRL_26</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td></td> +</tr> +<tr> <td>dragAndDropToObject</td> <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> <td>UIPageBody</td> @@ -503,17 +508,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[5]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> <td>Test_SNF_PRL_26</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[5]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[5]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[4]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_31_ManageNodePortal.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -133,16 +133,46 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//tr[2]/td[5]/div/img</td> + <td>searchTerm</td> <td></td> </tr> <tr> + <td>type</td> + <td>searchTerm</td> + <td>Group Navigation</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//tr[2]/td[5]/div/img</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> @@ -273,16 +303,46 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td> + <td>searchTerm</td> <td></td> </tr> <tr> + <td>type</td> + <td>searchTerm</td> + <td>Link</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//div[@id='UIRepeater']/table/tbody/tr[4]/td[5]/div/img</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> @@ -307,6 +367,11 @@ <td></td> </tr> <tr> + <td>echo</td> + <td>-- View node node after change page --</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>//div[@id='PortalNavigationTopContainer']/div[3]/div/div/div/div/div/div/a</td> <td></td> @@ -401,7 +466,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_32_MoreActionOnNodeInEditNavigationOfPortal.html.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -123,16 +123,46 @@ </tr> <tr> <td>waitForElementPresent</td> - <td>//tr[2]/td[5]/div/img</td> + <td>searchTerm</td> <td></td> </tr> <tr> + <td>type</td> + <td>searchTerm</td> + <td>Group Navigation</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> <td>click</td> - <td>//tr[2]/td[5]/div/img</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> <td></td> </tr> <tr> <td>waitForElementPresent</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//img[@title='Select Page']</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>link=Save</td> <td></td> </tr> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_33_EditNodePageProperties.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -128,6 +128,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_34_ChangeContainerWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -107,6 +107,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> + <td></td> +</tr> +<tr> <td>click</td> <td>//div[2]/div/div/div/div/div/div[1]/div/div/div/div/div/div/div/div/div[2]/div/div/div/div</td> <td></td> @@ -123,6 +128,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -252,16 +287,36 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForTextPresent</td> + <td>User Management</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyTextPresent</td> + <td>User Management</td> <td></td> </tr> <tr> + <td>waitForTextPresent</td> + <td>Group Management</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Group Management</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Membership Management</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Membership Management</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Switch View mode</td> <td></td> @@ -394,7 +449,7 @@ <tr> <td>dragAndDropToObject</td> <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> - <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> + <td>//a[@title='mix']</td> </tr> <tr> <td>echo</td> @@ -576,7 +631,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_35_ChangeApplicationWhenEditPropertiesOfNodeInPortalNavigation.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -123,6 +123,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_36_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -123,6 +123,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -252,16 +282,36 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForTextPresent</td> + <td>User Management</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyTextPresent</td> + <td>User Management</td> <td></td> </tr> <tr> + <td>waitForTextPresent</td> + <td>Group Management</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Group Management</td> + <td></td> +</tr> +<tr> + <td>waitForTextPresent</td> + <td>Membership Management</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Membership Management</td> + <td></td> +</tr> +<tr> <td>waitForElementPresent</td> <td>link=Switch View mode</td> <td></td> @@ -566,7 +616,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_40_EditPageForGroup.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -177,13 +177,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForElementPresent</td> + <td>//div[@class="VIEW-PAGE"]</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyElementPresent</td> + <td>//div[@class="VIEW-PAGE"]</td> <td></td> </tr> <tr> @@ -589,7 +589,7 @@ <tr> <td>waitForElementPresent</td> <td>searchTerm</td> - <td>Test_SNF_PRL_40</td> + <td></td> </tr> <tr> <td>type</td> @@ -671,7 +671,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_42_ChangeContainerWhenEditLayoutForGroupPage.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -177,13 +177,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForElementPresent</td> + <td>// div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyElementPresent</td> + <td>//div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> @@ -319,7 +319,7 @@ <tr> <td>dragAndDropToObject</td> <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> - <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> + <td>//div[@class='LAYOUT-PORTAL LAYOUT-BLOCK']</td> </tr> <tr> <td>echo</td> @@ -353,17 +353,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> <td>Test_SNF_PRL_42</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> @@ -551,7 +551,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_44_AddApplicationIntoCategoryWhenEditLayoutForGroupPage.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -177,13 +177,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForElementPresent</td> + <td>//div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyElementPresent</td> + <td>//div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> @@ -531,7 +531,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_45_ManageNodeGroup.html.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -372,11 +372,6 @@ <td></td> </tr> <tr> - <td>pause</td> - <td>2000</td> - <td></td> -</tr> -<tr> <td>waitForElementPresent</td> <td>//div[@id='UINavigationNodeSelector']/div/div/div/div[2]/div/div/div[3]/div/a</td> <td></td> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_48_ChangeContainerWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -123,6 +123,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -374,7 +404,7 @@ <tr> <td>waitForElementPresent</td> <td>height</td> - <td>100px</td> + <td></td> </tr> <tr> <td>type</td> @@ -404,7 +434,7 @@ <tr> <td>dragAndDropToObject</td> <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> - <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> + <td>//a[@title='mix']</td> </tr> <tr> <td>echo</td> @@ -447,11 +477,6 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> - <td></td> -</tr> -<tr> <td>mouseOver</td> <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> <td>Test_SNF_PRL_48</td> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_49_ChangeApplicationWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -92,6 +92,11 @@ <td>Test_SNF_PRL_49</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>label</td> + <td></td> +</tr> +<tr> <td>type</td> <td>label</td> <td>Test_SNF_PRL_49</td> @@ -123,6 +128,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> @@ -672,6 +707,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Test_SNF_PRL_49</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Test_SNF_PRL_49</td> <td></td> @@ -682,6 +722,11 @@ <td></td> </tr> <tr> + <td>waitForElementPresent</td> + <td>link=Group</td> + <td></td> +</tr> +<tr> <td>clickAndWait</td> <td>link=Group</td> <td></td> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_50_AddApplicationIntoContainerWhenEditPagePropertiesOfNode.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -123,6 +123,36 @@ </tr> <tr> <td>waitForElementPresent</td> + <td>searchTerm</td> + <td></td> +</tr> +<tr> + <td>type</td> + <td>searchTerm</td> + <td>Community Management</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>searchOption</td> + <td></td> +</tr> +<tr> + <td>select</td> + <td>searchOption</td> + <td>label=Title</td> +</tr> +<tr> + <td>waitForElementPresent</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>click</td> + <td>//form[@id='UIPageSearch']/div[2]/a</td> + <td></td> +</tr> +<tr> + <td>waitForElementPresent</td> <td>xpath=//img[@title='Select Page']</td> <td></td> </tr> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_55_EditPageForUser.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -167,13 +167,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForElementPresent</td> + <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyElementPresent</td> + <td>//div[2]/div/div/div/div/div/div[2]/div/div/div/div/div</td> <td></td> </tr> <tr> @@ -544,7 +544,7 @@ <tr> <td>waitForElementPresent</td> <td>searchTerm</td> - <td>Test_SNF_PRL_55</td> + <td></td> </tr> <tr> <td>type</td> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_57_ChangeContainerWhenEditLayoutForUserPage.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -132,11 +132,16 @@ <td></td> </tr> <tr> - <td>assertLocation</td> - <td>http://localhost:8080/portal/private/classic/Test_SNF_PRL_57</td> + <td>waitForTextPresent</td> + <td>Test_SNF_PRL_57</td> <td></td> </tr> <tr> + <td>verifyTextPresent</td> + <td>Test_SNF_PRL_57</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>-- Edit Layout --</td> <td></td> @@ -309,7 +314,7 @@ <tr> <td>dragAndDropToObject</td> <td>//div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div</td> - <td>//div[@class='LAYOUT-BLOCK LAYOUT-PORTLET']</td> + <td>//div[@id='UIPortal-UIPortal']/div/div[1]</td> </tr> <tr> <td>echo</td> @@ -342,23 +347,18 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[2]/div/div/div/div[1]/div</td> - <td></td> -</tr> -<tr> <td>mouseOver</td> - <td>//div/div/div/div/div/div[2]/div/div/div/div/div[1]/div/div/div[2]/div/div/div/div[1]/div</td> + <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> <td>Test_SNF_PRL_57</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div[3]/div/div/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_58_ChangeApplicationWhenEditLayoutForUserPage.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -167,13 +167,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForElementPresent</td> + <td>// div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyElementPresent</td> + <td>//div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> @@ -217,16 +217,26 @@ <td></td> </tr> <tr> - <td>waitForElementPresent</td> - <td>UIPortalApplication</td> + <td>waitForTextPresent</td> + <td>Test_SNF_PRL_58</td> <td></td> </tr> <tr> - <td>verifyElementPresent</td> - <td>UIPortalApplication</td> + <td>verifyTextPresent</td> + <td>Test_SNF_PRL_58</td> <td></td> </tr> <tr> + <td>waitForTextPresent</td> + <td>Calculator</td> + <td></td> +</tr> +<tr> + <td>verifyTextPresent</td> + <td>Calculator</td> + <td></td> +</tr> +<tr> <td>echo</td> <td>-- Return to normal view --</td> <td></td> @@ -382,19 +392,9 @@ <td>Test_SNF_PRL_58</td> </tr> <tr> - <td>waitForElementPresent</td> - <td>//div[1]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> - <td></td> -</tr> -<tr> - <td>mouseOver</td> - <td>//html/body/div/div[2]/div/div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[2]/div</td> - <td></td> -</tr> -<tr> <td>dragAndDropToObject</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> - <td>//html/body/div/div[2]/div/div[2]/div/div/div/div/div/div[2]/div/div/div/div/div/div/div/div[3]/div/div/div</td> + <td>//div[3]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[1]</td> + <td>//div[@class='LPortletLayoutDecorator']</td> </tr> <tr> <td>echo</td> @@ -438,17 +438,17 @@ </tr> <tr> <td>mouseOver</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/div[2]</td> + <td>//div/div/div[2]/div/div/div/div/div/div/div[2]</td> <td>Test_SNF_PRL_58</td> </tr> <tr> <td>waitForElementPresent</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> <td>click</td> - <td>//div[2]/div/div[2]/div/div/div[2]/div/div/div/div/div/div/a[2]</td> + <td>//div/div/div[2]/div/div/div/div/div/div/a[2]</td> <td></td> </tr> <tr> @@ -506,7 +506,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_59_AddApplicationIntoCateGoryWhenEditLayoutForUserPage.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -167,13 +167,13 @@ <td></td> </tr> <tr> - <td>waitForElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>waitForElementPresent</td> + <td>//div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> - <td>verifyElementNotPresent</td> - <td>css= div[@id="UIPortalApplication"]</td> + <td>verifyElementPresent</td> + <td>//div[@id="UIPortalApplication"]</td> <td></td> </tr> <tr> @@ -396,7 +396,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html =================================================================== --- portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/NewSnifftest/Test_SNF_PRL_63_ManagePageOfUser.html 2011-01-25 17:12:23 UTC (rev 5817) @@ -92,6 +92,11 @@ <td>Test_SNF_PRL_63</td> </tr> <tr> + <td>waitForElementPresent</td> + <td>title</td> + <td></td> +</tr> +<tr> <td>type</td> <td>title</td> <td>Test_SNF_PRL_63</td> @@ -276,7 +281,6 @@ <td>link=Sign out</td> <td></td> </tr> - </tbody></table> </body> </html> Modified: portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml =================================================================== --- portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/testsuite/selenium-tests-other/src/test/resources/org/jboss/gatein/selenium/jira/Test_GTNPORTAL_1257_SeamSessionOutlivesTheGateInSession-build.xml 2011-01-25 17:12:23 UTC (rev 5817) @@ -108,7 +108,7 @@ <arg value="-DconnectionUrl=${scm.url}"/> <arg value="-Dbasedir=${testRoot.dir}"/> <arg value="-DcheckoutDirectory=${checkout.dir}"/> - <arg value="-Dgoals=install"/> + <arg value="-Dgoals=install -Dmaven.repo.local=${localRepository}"/> </artifact:mvn> </target> Modified: portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml =================================================================== --- portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/web/eXoResources/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817) @@ -19,4 +19,4 @@ --> -<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/> \ No newline at end of file +<Context path="/eXoResources" docBase="eXoResources" debug="0" reloadable="true" crossContext="true"/> Modified: portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml =================================================================== --- portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/web/portal/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817) @@ -20,12 +20,12 @@ --> <Context path='/portal' docBase='portal' debug='0' reloadable='true' crossContext='true' privileged='true'> - <Realm className='org.apache.catalina.realm.JAASRealm' + <Realm className='org.apache.catalina.realm.JAASRealm' appName='gatein-domain' userClassNames='org.exoplatform.services.security.jaas.UserPrincipal' roleClassNames='org.exoplatform.services.security.jaas.RolePrincipal' debug='0' cache='false'/> - <Valve + <Valve className='org.apache.catalina.authenticator.FormAuthenticator' characterEncoding='UTF-8'/> -</Context> \ No newline at end of file +</Context> Modified: portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml =================================================================== --- portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/web/portal/src/main/webapp/WEB-INF/conf/organization/picketlink-idm/jboss-cache.xml 2011-01-25 17:12:23 UTC (rev 5817) @@ -2,11 +2,12 @@  <eviction wakeUpInterval="5000"> - <default algorithmClass="org.jboss.cache.eviction.LRUAlgorithm" + <default algorithmClass="org.jboss.cache.eviction.ExpirationAlgorithm" eventQueueSize="1000000"> - <property name="maxNodes" value="1000000" /> + <property name="maxNodes" value="100000" /> <property name="timeToLive" value="120000" /> + <property name="warnNoExpirationKey" value="false" /> </default> </eviction> -</jbosscache> \ No newline at end of file +</jbosscache> Modified: portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp =================================================================== --- portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/web/portal/src/main/webapp/login/jsp/login.jsp 2011-01-25 17:12:23 UTC (rev 5817) @@ -26,7 +26,6 @@ <%@ page import="java.util.ResourceBundle"%> <%@ page import="org.exoplatform.web.login.InitiateLoginServlet"%> <%@ page import="org.gatein.common.text.EntityEncoder"%> -<%--<%@ page import="javax.servlet.http.HttpSession"%>--%> <%@ page language="java" %> <% String contextPath = request.getContextPath() ; @@ -45,10 +44,6 @@ cookie.setMaxAge(0); response.addCookie(cookie); - //String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); - /*HttpSession httpSession = request.getSession(true); - String uri = (String)httpSession.getAttribute("org.gatein.portal.login.initial_uri"); - httpSession.removeAttribute("org.gatein.portal.login.initial_uri");*/ String uri = (String)request.getAttribute("org.gatein.portal.login.initial_uri"); response.setCharacterEncoding("UTF-8"); Modified: portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml =================================================================== --- portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/web/rest/src/main/webapp/META-INF/context.xml 2011-01-25 17:12:23 UTC (rev 5817) @@ -21,9 +21,9 @@ <Context path="/rest" docBase="rest" reloadable="true" crossContext="false"> - <Realm className='org.apache.catalina.realm.JAASRealm' + <Realm className='org.apache.catalina.realm.JAASRealm' appName='gatein-domain' userClassNames="org.exoplatform.services.security.jaas.UserPrincipal" roleClassNames="org.exoplatform.services.security.jaas.RolePrincipal" debug='0' cache='false'/> -</Context> \ No newline at end of file +</Context> Modified: portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java =================================================================== --- portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2011-01-25 15:56:22 UTC (rev 5816) +++ portal/branches/wci/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIPortlet.java 2011-01-25 17:12:23 UTC (rev 5817) @@ -440,11 +440,9 @@ } Set<ModeInfo> modes = portlet.getInfo().getCapabilities().getModes(MediaType.create("text/html")); - Iterator<ModeInfo> modeIter = modes.iterator(); - while (modeIter.hasNext()) + for (ModeInfo mode : modes) { - ModeInfo info = modeIter.next(); - supportModes.add(info.getModeName()); + supportModes.add(mode.getModeName()); } if (supportModes.size() > 0) @@ -497,16 +495,21 @@ supportedProcessingEvents_ = new ArrayList<QName>(consumedEvents.keySet()); } - for (Iterator<QName> iter = supportedProcessingEvents_.iterator(); iter.hasNext();) + for (QName eventName : supportedProcessingEvents_) { - QName eventName = iter.next(); if (eventName.equals(name)) { - log.info("The Portlet " + producerOfferedPortletContext + " supports comsuming the event : " + name); + if (log.isDebugEnabled()) + { + log.debug("The Portlet " + producerOfferedPortletContext + " supports comsuming the event : " + name); + } return true; } } - log.info("The portlet " + producerOfferedPortletContext + " doesn't support consuming the event : " + name); + if (log.isDebugEnabled()) + { + log.debug("The portlet " + producerOfferedPortletContext + " doesn't support consuming the event : " + name); + } return false; } @@ -533,16 +536,21 @@ supportedPublishingEvents_ = new ArrayList<QName>(producedEvents.keySet()); } - for (Iterator<QName> iter = supportedPublishingEvents_.iterator(); iter.hasNext();) + for (QName eventName : supportedPublishingEvents_) { - QName eventName = iter.next(); if (eventName.equals(name)) { - log.info("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name); + if (log.isDebugEnabled()) + { + log.debug("The Portlet " + producerOfferedPortletContext + " supports producing the event : " + name); + } return true; } } - log.info("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name); + if (log.isDebugEnabled()) + { + log.debug("The portlet " + producerOfferedPortletContext + " doesn't support producing the event : " + name); + } return false; }

13 years, 3 months

1
0
0 / 0

gatein SVN: r5816 - components/wsrp/trunk/hibernate-impl.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-01-25 10:56:22 -0500 (Tue, 25 Jan 2011) New Revision: 5816 Modified: components/wsrp/trunk/hibernate-impl/pom.xml Log: - Renamed artifactId to wsrp-hibernate-impl for better namespacing and consistency. Modified: components/wsrp/trunk/hibernate-impl/pom.xml =================================================================== --- components/wsrp/trunk/hibernate-impl/pom.xml 2011-01-25 15:54:05 UTC (rev 5815) +++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-01-25 15:56:22 UTC (rev 5816) @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- ~ JBoss, a division of Red Hat - ~ Copyright 2010, Red Hat Middleware, LLC, and individual + ~ 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. @@ -33,7 +33,7 @@ </parent> <groupId>org.gatein.wsrp</groupId> - <artifactId>hibernate-impl</artifactId> + <artifactId>wsrp-hibernate-impl</artifactId> <packaging>jar</packaging> <name>GateIn WSRP Hibernate-based persistence implementation</name>

13 years, 3 months

1
0
0 / 0

gatein SVN: r5815 - in components/wsrp/trunk: jcr-impl and 1 other directory.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-01-25 10:54:05 -0500 (Tue, 25 Jan 2011) New Revision: 5815 Modified: components/wsrp/trunk/jcr-impl/pom.xml components/wsrp/trunk/pom.xml Log: - GTNWSRP-196: + Renamed artifactId to wsrp-jcr-impl for better namespacing. + Added Chromattic APT dependency so that annotations are processed. + Added version.chromattic property initialized in parent POM. Modified: components/wsrp/trunk/jcr-impl/pom.xml =================================================================== --- components/wsrp/trunk/jcr-impl/pom.xml 2011-01-25 15:50:15 UTC (rev 5814) +++ components/wsrp/trunk/jcr-impl/pom.xml 2011-01-25 15:54:05 UTC (rev 5815) @@ -32,7 +32,7 @@ </parent> <modelVersion>4.0.0</modelVersion> - <artifactId>jcr-impl</artifactId> + <artifactId>wsrp-jcr-impl</artifactId> <name>GateIn WSRP JCR-based persistence implementation</name> <dependencies> <dependency> @@ -54,9 +54,16 @@ <dependency> <groupId>org.chromattic</groupId> <artifactId>chromattic.api</artifactId> - <version>1.0.4</version> + <version>${version.chromattic}</version> </dependency> +  <dependency> + <groupId>org.chromattic</groupId> + <artifactId>chromattic.apt</artifactId> + <version>${version.chromattic}</version> + <scope>provided</scope> + </dependency> + <dependency> <groupId>org.gatein.common</groupId> <artifactId>common-common</artifactId> </dependency> Modified: components/wsrp/trunk/pom.xml =================================================================== --- components/wsrp/trunk/pom.xml 2011-01-25 15:50:15 UTC (rev 5814) +++ components/wsrp/trunk/pom.xml 2011-01-25 15:54:05 UTC (rev 5815) @@ -26,7 +26,7 @@ <modelVersion>4.0.0</modelVersion> - <name>GateIn - WSRP</name> + <name>GateIn WSRP</name> <groupId>org.gatein.wsrp</groupId> <artifactId>wsrp-parent</artifactId> @@ -57,6 +57,7 @@ <version.javax.xml.ws>2.1</version.javax.xml.ws> <version.javax.xml.soap.saaj>1.3</version.javax.xml.soap.saaj> <version.google-collections>1.0</version.google-collections> + <version.chromattic>1.0.4</version.chromattic> </properties> <dependencyManagement>

13 years, 3 months

1
0
0 / 0

gatein SVN: r5814 - components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping.

by do-not-reply＠jboss.org

Author: chris.laprun(a)jboss.com Date: 2011-01-25 10:50:15 -0500 (Tue, 25 Jan 2011) New Revision: 5814 Added: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/PortletContextMapping.java Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java Log: - GTNWSRP-72: Added mapping to save portlet contexts associated with registrations and related persistence code. Added: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/PortletContextMapping.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/PortletContextMapping.java (rev 0) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/PortletContextMapping.java 2011-01-25 15:50:15 UTC (rev 5814) @@ -0,0 +1,61 @@ +/* + * 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. + */ + +package org.gatein.wsrp.registration.mapping; + +import org.chromattic.api.annotations.PrimaryType; +import org.chromattic.api.annotations.Property; + +import java.io.ByteArrayInputStream; +import java.io.InputStream; + +/** + * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a> + * @version $Revision$ + */ +@PrimaryType(name = PortletContextMapping.NODE_NAME) +public abstract class PortletContextMapping +{ + public static final String NODE_NAME = "wsrp:portletcontext"; + + @Property(name = "id") + public abstract String getId(); + + public abstract void setId(String id); + + @Property(name = "state") + public abstract InputStream getState(); + + public abstract void setState(InputStream state); + + public void initFrom(String id, byte[] state) + { + setId(id); + + if (state != null && state.length > 0) + { + ByteArrayInputStream is = new ByteArrayInputStream(state); + setState(is); + } + } +} Modified: components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java =================================================================== --- components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-01-25 14:32:03 UTC (rev 5813) +++ components/wsrp/trunk/jcr-impl/src/main/java/org/gatein/wsrp/registration/mapping/RegistrationMapping.java 2011-01-25 15:50:15 UTC (rev 5814) @@ -26,19 +26,25 @@ import org.chromattic.api.annotations.Create; import org.chromattic.api.annotations.Id; import org.chromattic.api.annotations.MappedBy; +import org.chromattic.api.annotations.OneToMany; import org.chromattic.api.annotations.OneToOne; import org.chromattic.api.annotations.Owner; import org.chromattic.api.annotations.PrimaryType; import org.chromattic.api.annotations.Property; import org.gatein.common.util.ParameterValidation; +import org.gatein.pc.api.PortletContext; +import org.gatein.pc.api.PortletStateType; +import org.gatein.pc.api.StatefulPortletContext; import org.gatein.registration.Registration; import org.gatein.registration.RegistrationException; import org.gatein.registration.RegistrationStatus; import org.gatein.registration.spi.ConsumerSPI; import org.gatein.registration.spi.RegistrationSPI; +import org.gatein.wsrp.jcr.mapping.Utils; import org.gatein.wsrp.registration.JCRRegistrationPersistenceManager; import javax.xml.namespace.QName; +import java.util.Collection; import java.util.Collections; import java.util.Map; @@ -64,12 +70,11 @@ public abstract void setRegistrationHandle(String handle); - /* -TODO: convert to use PortletContexts instead of just handles -@Property(name="portlethandles") -public abstract List<String> getPortletHandles(); + @OneToMany + public abstract Collection<PortletContextMapping> getPortletContexts(); -public abstract void setPortletHandles(List<String> portletHandles);*/ + @Create + public abstract PortletContextMapping createPortletContext(String id); @OneToOne @Owner @@ -90,8 +95,30 @@ { setStatus(registration.getStatus()); setRegistrationHandle(registration.getRegistrationHandle()); -// setPortletHandles(registration.getPortletHandles()); // TODO + // clear and recreate portlet context mappings + Collection<PortletContextMapping> contextMappings = getPortletContexts(); + contextMappings.clear(); + for (PortletContext portletContext : registration.getKnownPortletContexts()) + { + String id = portletContext.getId(); + PortletContextMapping contextMapping = createPortletContext(id); + contextMappings.add(contextMapping); + + if (portletContext instanceof StatefulPortletContext) + { + StatefulPortletContext context = (StatefulPortletContext)portletContext; + if (PortletStateType.OPAQUE.equals(context.getType())) + { + contextMapping.initFrom(id, ((StatefulPortletContext<byte[]>)context).getState()); + } + else + { + throw new IllegalArgumentException("Cannot handle PortletContext state: " + context.getState()); + } + } + } + Map<QName, Object> properties = registration.getProperties(); if (ParameterValidation.existsAndIsNotEmpty(properties)) { @@ -117,8 +144,14 @@ RegistrationSPI reg = persistenceManager.newRegistrationSPI(consumer, props, getPersistentKey()); reg.setStatus(getStatus()); reg.setRegistrationHandle(getRegistrationHandle()); -// reg.getPortletHandles().addAll(getPortletHandles()); // TODO + Collection<PortletContextMapping> pcms = getPortletContexts(); + for (PortletContextMapping pcm : pcms) + { + PortletContext pc = PortletContext.createPortletContext(pcm.getId(), Utils.safeGetBytes(pcm.getState())); + reg.addPortletContext(pc); + } + return reg; } }

13 years, 3 months

1
0
0 / 0

gatein SVN: r5813 - in portal/trunk/packaging/jboss-as5: pkg and 1 other directory.

by do-not-reply＠jboss.org

Author: mstruk Date: 2011-01-25 09:32:03 -0500 (Tue, 25 Jan 2011) New Revision: 5813 Modified: portal/trunk/packaging/jboss-as5/README.txt portal/trunk/packaging/jboss-as5/pkg/pom.xml Log: GTNMAVEN-16 Packaging that supports JBossAS6 and does away with javascript packager - refactored jboss-as5 pom.xml, move 'pack' profile into pom build - added 'pkg-jbossas5' profile with previous packaging kind of behaviour (exo properties) Modified: portal/trunk/packaging/jboss-as5/README.txt =================================================================== --- portal/trunk/packaging/jboss-as5/README.txt 2011-01-25 12:34:55 UTC (rev 5812) +++ portal/trunk/packaging/jboss-as5/README.txt 2011-01-25 14:32:03 UTC (rev 5813) @@ -16,6 +16,7 @@ + == Usage == @@ -25,14 +26,10 @@ Then go to packaging/jboss-as5 to perform packaging. -There are three profiles that cover dependency download (-Pdownload), packaging as exploded (-Ppack), and bundling as a zip (-Pbundle). +There are three profiles that cover dependency download (-Pdownload), packaging as exploded (default), and bundling as a zip (-Pbundle). -For main build use either 'download' or 'pack' profile, but not both, as 'download' also includes 'pack' functionality. -Both of these profiles also automatically perform 'clean' to assure consistent results. +For main build use either 'download' profile or no profile (default). Both of these automatically perform 'clean' to ensure consistent results. -Profile 'pack' is the one active by default. When activating any other profile, the 'pack' profile is automatically turned off, so - it may have to be explicitly activated again if packaging is required (i.e. -Ppack,bundle). - There are two system properties that control where the root directory for JBoss AS servers is located, and what specific JBoss AS directory to use. They are preset to default location: @@ -46,16 +43,17 @@ -== Examples == +== Some examples == + 1) The simplest form uses default location for JBoss AS mvn This is equivalent to: -mvn clean package -Ppack -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-5.1.0.GA +mvn clean package -Dservers.dir=$GATEIN/portal/trunk/packaging/servers -Djbossas.name=jboss-5.1.0.GA 2) If JBoss AS is located somewhere else adjust servers.dir and jbossas.name accordingly @@ -67,11 +65,11 @@ mvn -Pdownload -If SERVERS_DIR is not at default location explicitly set it: +If SERVERS_DIR is not at default location, explicitly set it: mvn -Pdownload -Dservers.dir=SERVERS_DIR -You shouldn't set jbossas.name property when using -Pdownload. +There's no need to set 'jbossas.name' property when using -Pdownload (if set, its value should be 'jboss-5.1.0.GA'). 4) Zip bundle may be produced by activating 'bundle' profile @@ -80,8 +78,72 @@ or -mvn -Ppack,bundle +mvn -Pbundle -or just -mvn -Pbundle + + + +== Compatibility with previous packaging (PKG) == + + +The previous packaging uses two different properties to specify 'servers.dir' and 'jbossas.name': + + - exo.projects.directory.dependencies (equivalent to 'servers.dir') + - exo.projects.app.jboss.version (equivalent to 'jbossas.name') + + +Compatibility mode can be activated by using -Ppkg-jbossas5. + + + + + +== Build integration == + + +Packaging can be run separately from portal build as described before: + +# build portal first +cd $GATEIN/portal/trunk +mvn clean install -DskipTests + +# then package +cd packaging/jboss-as5 +mvn + + +Or it can be run together with the portal build, by using -Ppkg-jbossas5 compatibility mode: + +# build and package all at once +cd $GATEIN/portal/trunk +mvn clean install -Ppkg-jbossas5,download -DskipTests -Dexo.projects.directory.dependencies=$GATEIN/portal/trunk/packaging/servers + +(Notice how we also activate 'download' profile in this example - that's ideal for a new user who's building GateIn for the first time) + + + + + +== Troubleshoot == + + +1) 'Checksum validation failed!' + +When using -Pdownload it may happen that the download is interrupted, and the resulting file corrupt. +The solution is to manually delete the target file from the filesystem, and run 'mvn -Pdownload' again. + +2) 'DIRECTORY does not exist.' when using -Pdownload. + +When using -Pdownload, and specifying -Djbossas.name=NAME at the same time (something you're adviced not to practice), +the download part of the build will completely ignore 'jbossas.name' property, but the packaging part will use it, and look for +JBoss AS instance in the specified directory. +The solution is to not specify -Djbossas.name=NAME at all, or to set its value to 'jboss-5.1.0.GA'. + +3) 'Destination JBossAS directory exists already: DIRECTORY' + +When using -Pdownload the downloaded JBoss AS distribution is unpacked into a local directory. If the directory exists already +the build will abort, to avoid corrupting a possibly carefully prepared specially configured JBoss AS instance. +One solution is to not use -Pdownload in this case since the appropriate JBoss AS is already present. Or, you can move the +directory out of the way, or delete it. + Modified: portal/trunk/packaging/jboss-as5/pkg/pom.xml =================================================================== --- portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-25 12:34:55 UTC (rev 5812) +++ portal/trunk/packaging/jboss-as5/pkg/pom.xml 2011-01-25 14:32:03 UTC (rev 5813) @@ -17,8 +17,10 @@ <name>GateIn for JBoss AS 5.x.x packaging</name> <properties> +  <jbossas.version>5.1.0.GA</jbossas.version> <jbossas.dist.version>5.1.0.GA-jdk6</jbossas.dist.version> + <servers.dir>${project.basedir}/../../servers</servers.dir> <jbossas.path>${servers.dir}</jbossas.path> <jbossas.name>jboss-${jbossas.version}</jbossas.name> @@ -909,133 +911,206 @@ </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> + <executions> + <execution> + <id>check-jboss-environment-ready</id> + <goals> + <goal>enforce</goal> + </goals> + <configuration> + <rules> + <requireProperty> + <property>jbossas.path</property> + <message>" +You must define the property 'jbossas.path' +to give the path to the directory where you store your applications servers. +" + </message> + </requireProperty> + <requireProperty> + <property>jbossas.name</property> + <message>" +You must define the property 'jbossas.name' +to give the name of the directory where JBoss AS is stored. +" + </message> + </requireProperty> + <requireFilesExist> + <files> + <file>${jbossas.path}/${jbossas.name}/</file> + </files> + <message>" +The following JBoss AS directory doesn't exist : + ${jbossas.path}/${jbossas.name} +Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location of servers directory +and/or -Djbossas.name=NAME to point to the correct directory under the servers directory. +You can also use -Pdownload to automatically provide JBoss AS instance. +" + </message> + </requireFilesExist> + </rules> + <fail>true</fail> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>2.4.1</version> + <executions> + <execution> + <id>auto-clean</id> + <phase>initialize</phase> + <goals> + <goal>clean</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <version>1.6</version> + <executions> + <execution> + <id>prepare-package</id> + <phase>prepare-package</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <target> + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> + <target name="package"/> + <property name="maven.project.basedir" value="${project.basedir}"/> + <property name="maven.project.build.directory" value="${project.build.directory}"/> + </ant> + </target> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> <profile> - <id>download</id> + <id>pkg-jbossas5</id> + + <properties> + <exo.projects.app.jboss.version>jboss-5.1.0.GA</exo.projects.app.jboss.version> + <servers.dir>${exo.projects.directory.dependencies}</servers.dir> + <jbossas.name>${exo.projects.app.jboss.version}</jbossas.name> + </properties> + <build> <plugins> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>auto-clean</id> - <phase>initialize</phase> + <id>check-jboss-legacy-environment-dependencies-dir</id> <goals> - <goal>clean</goal> + <goal>enforce</goal> </goals> + <configuration> + <rules> + <requireProperty> + <property>exo.projects.directory.dependencies</property> + <message>" +You must define the property 'exo.projects.directory.dependencies' +to specify the path to the directory where you store your application servers. +" + </message> + </requireProperty> + </rules> + <fail>true</fail> + </configuration> </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> - <version>1.6</version> - <executions> <execution> - <id>prepare-package</id> - <phase>prepare-package</phase> + <id>check-jboss-legacy-environment-jboss-name</id> <goals> - <goal>run</goal> + <goal>enforce</goal> </goals> <configuration> - <target> - <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/> - -  - <mkdir dir="${jbossas.path}"/> - -  - <ant antfile="${project.basedir}/download-jboss.xml"> - <target name="download-jboss"/> - <property name="url" - value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/> - <property name="dest" value="${jbossas.zip}"/> - </ant> - - <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> - - <fail message="Destination JBossAS directory exists already: ${jbossas.dir} (Won't overwrite!)" - if="jbossas.dir.exists"/> - -  - <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> - - <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> - <target name="package"/> - <property name="maven.project.basedir" value="${project.basedir}"/> - <property name="maven.project.build.directory" value="${project.build.directory}"/> - </ant> - </target> + <rules> + <requireProperty> + <property>exo.projects.app.jboss.version</property> + <message>" +You must define the property 'exo.projects.app.jboss.version' +to specify the name of the directory where JBoss AS is stored. +" + </message> + </requireProperty> + </rules> + <fail>true</fail> </configuration> </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>pack</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> - <executions> <execution> - <id>jboss-check-environment-ready</id> + <id>check-jboss-dir-exists</id> <goals> <goal>enforce</goal> </goals> <configuration> <rules> - <requireProperty> - <property>jbossas.path</property> - <message>"You must define the property jbossas.path to give the path to the directory - where you store your applications servers" - </message> - </requireProperty> - <requireProperty> - <property>jbossas.name</property> - <message>"You must define the property jbossas.name to give the name of the directory - where JBoss AS is stored" - </message> - </requireProperty> - <requireFilesExist> - <files> - <file>${jbossas.path}/${jbossas.name}/</file> - </files> - <message>"The following JBoss AS directory doesn't exist : - ${jbossas.path}/${jbossas.name} + <requireFilesExist> + <files> + <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/</file> + </files> + <message>" +The following JBoss AS directory doesn't exist : + ${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version} -Make JBoss AS instance available at that location, or use -Dservers.dir=PATH to point to the correct location. +Make JBoss AS instance available at that location, or use -Dexo.projects.directory.dependencies=PATH to point to the correct location of servers directory +and/or -Dexo.projects.app.jboss.version=NAME to point to the correct directory under the servers directory. You can also use -Pdownload to automatically provide JBoss AS instance. " - </message> - </requireFilesExist> + </message> + </requireFilesExist> </rules> <fail>true</fail> </configuration> </execution> + <execution> + <id>check-jboss-environment-ready</id> + <phase>none</phase> + </execution> </executions> </plugin> + + </plugins> + </build> + </profile> + + <profile> + <id>download</id> + <build> + <plugins> <plugin> - <artifactId>maven-clean-plugin</artifactId> - <version>2.4.1</version> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-enforcer-plugin</artifactId> <executions> <execution> - <id>auto-clean</id> - <phase>initialize</phase> - <goals> - <goal>clean</goal> - </goals> + <id>check-jboss-environment-ready</id> + <phase>none</phase> </execution> + <execution> + <id>check-jboss-legacy-environment-jboss-name</id> + <phase>none</phase> + </execution> + <execution> + <id>check-jboss-dir-exists</id> + <phase>none</phase> + </execution> </executions> </plugin> <plugin> @@ -1051,6 +1126,32 @@ </goals> <configuration> <target> + <available property="jbossas.dir.exists" type="dir" file="${jbossas.dir}"/> + + <fail if="jbossas.dir.exists">" +Destination JBossAS directory exists already: + ${jbossas.dir} + +Either rename it, delete it, or deactivate -Pdownload profile. +" + </fail> + + <property name="jbossas.zip" value="${jbossas.path}/jboss-${jbossas.dist.version}.zip"/> + +  + <mkdir dir="${jbossas.path}"/> + +  + <ant antfile="${project.basedir}/download-jboss.xml"> + <target name="download-jboss"/> + <property name="url" + value="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.version..."/> + <property name="dest" value="${jbossas.zip}"/> + </ant> + +  + <unzip src="${jbossas.zip}" dest="${jbossas.path}" overwrite="false"/> + <ant antfile="${project.basedir}/package.xml" inheritRefs="true"> <target name="package"/> <property name="maven.project.basedir" value="${project.basedir}"/> @@ -1064,7 +1165,7 @@ </plugins> </build> </profile> - + <profile> <id>bundle</id> <build>

13 years, 3 months

1
0
0 / 0

gatein SVN: r5812 - exo/portal/branches/3.1.x.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-01-25 07:34:55 -0500 (Tue, 25 Jan 2011) New Revision: 5812 Modified: exo/portal/branches/3.1.x/pom.xml Log: [REL-641] Upgrade dependencies to next snapshots Modified: exo/portal/branches/3.1.x/pom.xml =================================================================== --- exo/portal/branches/3.1.x/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) +++ exo/portal/branches/3.1.x/pom.xml 2011-01-25 12:34:55 UTC (rev 5812) @@ -37,10 +37,10 @@ <name>GateIn - Portal</name> <properties> - <org.exoplatform.kernel.version>2.2.7-GA</org.exoplatform.kernel.version> - <org.exoplatform.core.version>2.3.7-GA</org.exoplatform.core.version> - <org.exoplatform.ws.version>2.1.7-GA</org.exoplatform.ws.version> - <org.exoplatform.jcr.version>1.12.7-GA</org.exoplatform.jcr.version> + <org.exoplatform.kernel.version>2.2.8-GA-SNAPSHOT</org.exoplatform.kernel.version> + <org.exoplatform.core.version>2.3.8-GA-SNAPSHOT</org.exoplatform.core.version> + <org.exoplatform.ws.version>2.1.8-GA-SNAPSHOT</org.exoplatform.ws.version> + <org.exoplatform.jcr.version>1.12.8-GA-SNAPSHOT</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> <org.shindig.version>1.0-r790473-Patch04</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version>

13 years, 3 months

1
0
0 / 0

gatein SVN: r5811 - in exo/portal/branches/3.1.x: component and 71 other directories.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-01-25 07:12:47 -0500 (Tue, 25 Jan 2011) New Revision: 5811 Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml exo/portal/branches/3.1.x/component/common/pom.xml exo/portal/branches/3.1.x/component/dashboard/pom.xml exo/portal/branches/3.1.x/component/identity/pom.xml exo/portal/branches/3.1.x/component/management/pom.xml exo/portal/branches/3.1.x/component/pc/pom.xml exo/portal/branches/3.1.x/component/pom.xml exo/portal/branches/3.1.x/component/portal/pom.xml exo/portal/branches/3.1.x/component/resources/pom.xml exo/portal/branches/3.1.x/component/scripting/pom.xml exo/portal/branches/3.1.x/component/test/core/pom.xml exo/portal/branches/3.1.x/component/test/jcr/pom.xml exo/portal/branches/3.1.x/component/test/organization/pom.xml exo/portal/branches/3.1.x/component/test/pom.xml exo/portal/branches/3.1.x/component/web/pom.xml exo/portal/branches/3.1.x/component/wsrp/pom.xml exo/portal/branches/3.1.x/docs/pom.xml exo/portal/branches/3.1.x/docs/reference-guide/pom.xml exo/portal/branches/3.1.x/docs/user-guide/pom.xml exo/portal/branches/3.1.x/examples/extension/config/pom.xml exo/portal/branches/3.1.x/examples/extension/ear/pom.xml exo/portal/branches/3.1.x/examples/extension/jar/pom.xml exo/portal/branches/3.1.x/examples/extension/pom.xml exo/portal/branches/3.1.x/examples/extension/war/pom.xml exo/portal/branches/3.1.x/examples/pom.xml exo/portal/branches/3.1.x/examples/portal/config/pom.xml exo/portal/branches/3.1.x/examples/portal/ear/pom.xml exo/portal/branches/3.1.x/examples/portal/jar/pom.xml exo/portal/branches/3.1.x/examples/portal/pom.xml exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml exo/portal/branches/3.1.x/examples/portal/war/pom.xml exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml exo/portal/branches/3.1.x/examples/portlets/pom.xml exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml exo/portal/branches/3.1.x/examples/skins/pom.xml exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml exo/portal/branches/3.1.x/gadgets/core/pom.xml exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml exo/portal/branches/3.1.x/gadgets/pom.xml exo/portal/branches/3.1.x/gadgets/server/pom.xml exo/portal/branches/3.1.x/packaging/module/pom.xml exo/portal/branches/3.1.x/packaging/pkg/pom.xml exo/portal/branches/3.1.x/packaging/pom.xml exo/portal/branches/3.1.x/packaging/product/pom.xml exo/portal/branches/3.1.x/packaging/reports/pom.xml exo/portal/branches/3.1.x/pom.xml exo/portal/branches/3.1.x/portlet/dashboard/pom.xml exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml exo/portal/branches/3.1.x/portlet/pom.xml exo/portal/branches/3.1.x/portlet/web/pom.xml exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml exo/portal/branches/3.1.x/server/jboss/pom.xml exo/portal/branches/3.1.x/server/pom.xml exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml exo/portal/branches/3.1.x/server/tomcat/pom.xml exo/portal/branches/3.1.x/starter/ear/pom.xml exo/portal/branches/3.1.x/starter/pom.xml exo/portal/branches/3.1.x/starter/war/pom.xml exo/portal/branches/3.1.x/testsuite/pom.xml exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml exo/portal/branches/3.1.x/web/eXoResources/pom.xml exo/portal/branches/3.1.x/web/pom.xml exo/portal/branches/3.1.x/web/portal/pom.xml exo/portal/branches/3.1.x/web/rest/pom.xml exo/portal/branches/3.1.x/webui/core/pom.xml exo/portal/branches/3.1.x/webui/eXo/pom.xml exo/portal/branches/3.1.x/webui/pom.xml exo/portal/branches/3.1.x/webui/portal/pom.xml Log: [maven-release-plugin] [REL-641]prepare for next development iteration Modified: exo/portal/branches/3.1.x/component/application-registry/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/application-registry/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/application-registry/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/common/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/common/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/common/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>exo.portal.component.common</artifactId> Modified: exo/portal/branches/3.1.x/component/dashboard/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/dashboard/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/dashboard/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/identity/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/identity/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/identity/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/management/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/management/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/management/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -21,7 +21,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/pc/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/pc/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/pc/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.component</artifactId> Modified: exo/portal/branches/3.1.x/component/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/portal/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/portal/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/resources/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/resources/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/resources/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/scripting/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/scripting/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/scripting/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/core/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/test/core/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/jcr/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/test/jcr/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/organization/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/organization/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/test/organization/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/test/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/test/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/test/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -22,7 +22,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/web/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/web/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/component/wsrp/pom.xml =================================================================== --- exo/portal/branches/3.1.x/component/wsrp/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/component/wsrp/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/docs/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/docs/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/reference-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/docs/reference-guide/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.doc</groupId> Modified: exo/portal/branches/3.1.x/docs/user-guide/pom.xml =================================================================== --- exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/docs/user-guide/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.gatein.doc</groupId> <artifactId>docs-aggregator</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-user-guide-en</artifactId> Modified: exo/portal/branches/3.1.x/examples/extension/config/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/extension/config/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/extension/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/extension/ear/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,23 +37,23 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.config</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.jar</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.extension.war</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/examples/extension/jar/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/extension/jar/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/extension/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/extension/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample.extension.root</artifactId> Modified: exo/portal/branches/3.1.x/examples/extension/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/extension/war/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample</artifactId> Modified: exo/portal/branches/3.1.x/examples/portal/config/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portal/config/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portal/ear/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,29 +37,29 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.config</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.jar</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <scope>provided</scope> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.war</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>war</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.sample.portal.rest-war</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/examples/portal/jar/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portal/jar/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portal/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.sample.portal.root</artifactId> Modified: exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portal/rest-war/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portal/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portal/war/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portlets/jsfhellouser/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-jsf-hellouser</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portlets/jsphellouser/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-jsp-hellouser</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portlets/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.portal.examples.portlets</groupId> Modified: exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portlets/simplesthelloworld/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -9,7 +9,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-simplest-helloworld</artifactId> Modified: exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/portlets/struts-jpetstore/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -5,7 +5,7 @@ <parent> <groupId>org.gatein.portal.examples.portlets</groupId> <artifactId>parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>struts-jpetstore</artifactId> Modified: exo/portal/branches/3.1.x/examples/skins/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/skins/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/skins/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -5,7 +5,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <groupId>org.gatein.portal.examples.skins</groupId> Modified: exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/examples/skins/simpleskin/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -25,7 +25,7 @@ <parent> <groupId>org.gatein.portal.examples.skins</groupId> <artifactId>parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>gatein-sample-skin</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/core/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/gadgets/core/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -14,7 +14,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-core</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/gadgets/eXoGadgets/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/gadgets/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/gadgets/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets</artifactId> Modified: exo/portal/branches/3.1.x/gadgets/server/pom.xml =================================================================== --- exo/portal/branches/3.1.x/gadgets/server/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/gadgets/server/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -25,7 +25,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.gadgets-server</artifactId> Modified: exo/portal/branches/3.1.x/packaging/module/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/module/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/packaging/module/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/pkg/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/packaging/pkg/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -72,19 +72,19 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.module</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>portal.packaging.product</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>js</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss.patch-ear</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency>  Modified: exo/portal/branches/3.1.x/packaging/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/packaging/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/product/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/product/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/packaging/product/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/packaging/reports/pom.xml =================================================================== --- exo/portal/branches/3.1.x/packaging/reports/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/packaging/reports/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.packaging</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/pom.xml =================================================================== --- exo/portal/branches/3.1.x/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -31,7 +31,7 @@ <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <packaging>pom</packaging> <name>GateIn - Portal</name> @@ -101,9 +101,9 @@ </distributionManagement> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/tags/3.1.7-PLF</connection> - <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/tags/3.1.7-PLF</developerConnection> - <url>http://fisheye.jboss.org/browse/gatein/exo/portal/tags/3.1.7-PLF</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</connection> + <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/exo/portal/branches/3.1.x</developerConnection> + <url>http://fisheye.jboss.org/browse/gatein/exo/portal/branches/3.1.x</url> </scm> <modules> @@ -341,43 +341,43 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.common</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.web</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.portal</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.pc</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.identity</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.resources</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.application-registry</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> @@ -387,64 +387,64 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.scripting</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.dashboard</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.portal</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.eXo</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui.core</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.gadgets-core</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.core</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.jcr</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </dependency> <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.component.test.organization</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>test-jar</type> </dependency> Modified: exo/portal/branches/3.1.x/portlet/dashboard/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/portlet/dashboard/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/portlet/exoadmin/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/portlet/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/portlet/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.portlet</artifactId> Modified: exo/portal/branches/3.1.x/portlet/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/portlet/web/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/portlet/web/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.portlet</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/jboss/patch-ear/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/jboss/plugin/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.jboss</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/jboss/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/jboss/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/jboss/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.jboss</artifactId> Modified: exo/portal/branches/3.1.x/server/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.server</artifactId> Modified: exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/tomcat/patch/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/tomcat/plugin/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server.tomcat</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/server/tomcat/pom.xml =================================================================== --- exo/portal/branches/3.1.x/server/tomcat/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/server/tomcat/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.server</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.server.tomcat</artifactId> Modified: exo/portal/branches/3.1.x/starter/ear/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/ear/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/starter/ear/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -37,7 +37,7 @@ <dependency> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.starter.war</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> <type>war</type> </dependency> </dependencies> Modified: exo/portal/branches/3.1.x/starter/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/starter/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -24,7 +24,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.starter.root</artifactId> Modified: exo/portal/branches/3.1.x/starter/war/pom.xml =================================================================== --- exo/portal/branches/3.1.x/starter/war/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/starter/war/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/testsuite/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/testsuite/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.testsuite</artifactId> Modified: exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/testsuite/selenium-snifftests/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.selenium.snifftests</artifactId> Modified: exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml =================================================================== --- exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/testsuite/webuibasedsamples/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -3,7 +3,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.testsuite</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.webui.based.samples</artifactId> Modified: exo/portal/branches/3.1.x/web/eXoResources/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/web/eXoResources/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/web/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/web/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.web</artifactId> Modified: exo/portal/branches/3.1.x/web/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/portal/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/web/portal/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/web/rest/pom.xml =================================================================== --- exo/portal/branches/3.1.x/web/rest/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/web/rest/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.web</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/core/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/core/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/webui/core/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/eXo/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/eXo/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/webui/eXo/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> Modified: exo/portal/branches/3.1.x/webui/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/webui/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -26,7 +26,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.parent</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <artifactId>exo.portal.webui</artifactId> Modified: exo/portal/branches/3.1.x/webui/portal/pom.xml =================================================================== --- exo/portal/branches/3.1.x/webui/portal/pom.xml 2011-01-25 12:10:46 UTC (rev 5810) +++ exo/portal/branches/3.1.x/webui/portal/pom.xml 2011-01-25 12:12:47 UTC (rev 5811) @@ -23,7 +23,7 @@ <parent> <groupId>org.exoplatform.portal</groupId> <artifactId>exo.portal.webui</artifactId> - <version>3.1.7-PLF</version> + <version>3.1.8-PLF-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion>

13 years, 3 months

1
0
0 / 0

gatein SVN: r5810 - exo/portal/tags.

by do-not-reply＠jboss.org

Author: paristote Date: 2011-01-25 07:10:46 -0500 (Tue, 25 Jan 2011) New Revision: 5810 Added: exo/portal/tags/3.1.7-PLF/ Log: [maven-release-plugin] [REL-641] copy for tag 3.1.7-PLF Copied: exo/portal/tags/3.1.7-PLF (from rev 5809, exo/portal/branches/3.1.x)

13 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits January 2011