gatein SVN: r2166 - in portal/trunk/component/common/src: test/java/org/exoplatform/commons/chromattic and 1 other directory.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-03-11 07:49:58 -0500 (Thu, 11 Mar 2010)
New Revision: 2166
Removed:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java
portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java
portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
Log:
GTNPORTAL-852 : Memory leak caused by uncleaned JCR sessions in some HTTP requests
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/AbstractContext.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -19,7 +19,10 @@
package org.exoplatform.commons.chromattic;
import org.chromattic.api.ChromatticSession;
+import org.exoplatform.services.jcr.core.ManageableRepository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Map;
@@ -31,7 +34,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-class AbstractContext implements SessionContext
+abstract class AbstractContext implements SessionContext
{
/** . */
@@ -41,7 +44,7 @@
private Map<String, Object> attributes;
/** The related life cycle. */
- private final ChromatticLifeCycle lifeCycle;
+ final ChromatticLifeCycle lifeCycle;
/** . */
private HashSet<SynchronizationListener> listeners;
@@ -87,6 +90,20 @@
}
}
+ public abstract Session doLogin() throws RepositoryException;
+
+ /**
+ * Open and returns a session. Should be used by subclasses.
+ *
+ * @return a session
+ * @throws RepositoryException any repository exception
+ */
+ protected final Session openSession() throws RepositoryException
+ {
+ ManageableRepository repo = lifeCycle.manager.repositoryService.getCurrentRepository();
+ return repo.getSystemSession(lifeCycle.getWorkspaceName());
+ }
+
public void close(boolean save)
{
if (listeners != null)
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/ChromatticLifeCycle.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -23,7 +23,6 @@
import org.exoplatform.container.component.BaseComponentPlugin;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.container.xml.PropertiesParam;
-import org.exoplatform.services.jcr.core.ManageableRepository;
import org.gatein.common.logging.Logger;
import org.gatein.common.logging.LoggerFactory;
@@ -139,14 +138,14 @@
return manager;
}
- LoginContext getLoginContext()
+ AbstractContext getLoginContext()
{
Synchronization sync = manager.getSynchronization();
//
if (sync != null)
{
- return sync;
+ return sync.getContext(domainName);
}
//
@@ -304,7 +303,7 @@
Session doLogin() throws RepositoryException
{
- LoginContext loginContext = getLoginContext();
+ AbstractContext loginContext = getLoginContext();
//
if (loginContext == null)
@@ -313,16 +312,7 @@
}
//
- ManageableRepository repo = manager.repositoryService.getCurrentRepository();
-
- //
- Session session = repo.getSystemSession(workspaceName);
-
- //
- loginContext.loggedIn(session);
-
- //
- return session;
+ return loginContext.doLogin();
}
public final void start() throws Exception
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LocalContext.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.commons.chromattic;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
/**
@@ -26,7 +27,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-class LocalContext extends AbstractContext implements LoginContext
+class LocalContext extends AbstractContext
{
/** The related JCR session. */
@@ -37,9 +38,14 @@
super(configurator);
}
- public void loggedIn(Session session)
+ public Session doLogin() throws RepositoryException
{
- this.jcrSession = session;
+ if (jcrSession != null)
+ {
+ throw new IllegalStateException("Already logged in");
+ }
+ jcrSession = openSession();
+ return jcrSession;
}
@Override
Deleted: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/LoginContext.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -1,36 +0,0 @@
-/**
- * Copyright (C) 2009 eXo Platform SAS.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.exoplatform.commons.chromattic;
-
-import javax.jcr.Session;
-
-/**
- * Allows the implementor to be aware of external session life cycle management.
- *
- * @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
- * @version $Revision$
- */
-interface LoginContext
-{
-
- void loggedIn(Session session);
-
- void close(boolean save);
-
-}
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/Synchronization.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -18,6 +18,7 @@
*/
package org.exoplatform.commons.chromattic;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
import java.util.HashMap;
import java.util.Map;
@@ -28,7 +29,7 @@
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
* @version $Revision$
*/
-public class Synchronization implements LoginContext
+public class Synchronization
{
/** The sessions mapped by workspace name. */
@@ -80,9 +81,24 @@
return context;
}
- public void loggedIn(Session session)
+ public Session doLogin(SynchronizedContext ctx) throws RepositoryException
{
- repositorySessions.put(session.getWorkspace().getName(), session);
+ if (ctx == null)
+ {
+ throw new NullPointerException();
+ }
+ if (ctx.synchronization != this)
+ {
+ throw new IllegalArgumentException();
+ }
+ String workspaceName = ctx.lifeCycle.getWorkspaceName();
+ Session session = repositorySessions.get(workspaceName);
+ if (session == null)
+ {
+ session = ctx.openSession();
+ repositorySessions.put(workspaceName, session);
+ }
+ return session;
}
public void close(boolean save)
Modified: portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/chromattic/SynchronizedContext.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -18,6 +18,9 @@
*/
package org.exoplatform.commons.chromattic;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+
/**
* The synchronized context is associated with a {@link org.exoplatform.commons.chromattic.Synchronization} object.
*
@@ -37,4 +40,9 @@
//
this.synchronization = synchronization;
}
+
+ public Session doLogin() throws RepositoryException
+ {
+ return synchronization.doLogin(this);
+ }
}
Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-03-11 12:45:39 UTC (rev 2165)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/chromattic/ChromatticIntegrationTestCase.java 2010-03-11 12:49:58 UTC (rev 2166)
@@ -237,17 +237,12 @@
}
public void testTwoLifeCycleWithSameRepository() {
-/*
chromatticManager.beginRequest();
-
SessionContext ctx1 = test1LF.openContext();
Session session1 = ctx1.getSession().getJCRSession();
SessionContext ctx2 = test2LF.openContext();
Session session2 = ctx2.getSession().getJCRSession();
-// assertSame(session1, session2);
-
+ assertSame(session1, session2);
chromatticManager.endRequest(false);
-*/
}
-
}
14 years, 9 months
gatein SVN: r2165 - portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common.
by do-not-reply@jboss.org
Author: julien_viet
Date: 2010-03-11 07:45:39 -0500 (Thu, 11 Mar 2010)
New Revision: 2165
Modified:
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
Log:
remove unused configuration
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-03-11 12:29:39 UTC (rev 2164)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml 2010-03-11 12:45:39 UTC (rev 2165)
@@ -157,22 +157,10 @@
<component>
<type>org.exoplatform.groovyscript.text.TemplateStatisticService</type>
- <init-params>
- <value-param>
- <name>name</name>
- <value>false</value>
- </value-param>
- </init-params>
</component>
<component>
<type>org.exoplatform.groovyscript.text.TemplateService</type>
- <init-params>
- <value-param>
- <name>name</name>
- <value>false</value>
- </value-param>
- </init-params>
</component>
<external-component-plugins>
14 years, 9 months
gatein SVN: r2164 - components/wsrp/trunk.
by do-not-reply@jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-03-11 07:29:39 -0500 (Thu, 11 Mar 2010)
New Revision: 2164
Modified:
components/wsrp/trunk/UpdateWSRPForGateIn.sh
Log:
- Now check both current and most recent version and remove current versions so that we don't end up
with duplicated and conflicting libraries if the two versions differ (as jars have the version in
their name).
Modified: components/wsrp/trunk/UpdateWSRPForGateIn.sh
===================================================================
--- components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-03-11 11:46:51 UTC (rev 2163)
+++ components/wsrp/trunk/UpdateWSRPForGateIn.sh 2010-03-11 12:29:39 UTC (rev 2164)
@@ -32,18 +32,26 @@
# Use this if you want to extract most recent version of WSRP module from the maven-metadata-local.xml <version> tag
# Looks at wsrp-common Maven metadat and only process 5 lines at most (to avoid retrieving several values)
-# Deprecated solution, see below.
-# export CURRENT_WSRP=`sed -n -e '5 s/.*<version>\(.*\)<\/version>.*/\1/p' $HOME/.m2/repository/org/gatein/wsrp/wsrp-common/maven-metadata-local.xml`
+# This allows to always use the most recent version regardless of what version might already be deployed
+export MOST_RECENT_WSRP=`sed -n -e '5 s/.*<version>\(.*\)<\/version>.*/\1/p' $HOME/.m2/repository/org/gatein/wsrp/wsrp-common/maven-metadata-local.xml`
-# extract most recent version of WSRP module from existing files
+# extract the current version of WSRP module from existing files
CURRENT_WSRP=`ls $GATEIN_EAR_HOME/lib/wsrp* | sed -n '1 s/.*\/.*-\([0-9]\.[0-9].[0-9]-.*-.*\).jar/\1/p'`
+
echo Current WSRP version: \'$CURRENT_WSRP\'
-
+echo Most recent WSRP version: \'$MOST_RECENT_WSRP\'
echo
+# get the list of jar files we need to replace in lib
+current=`ls $GATEIN_EAR_HOME/lib/wsrp* | sed -n 's/.*\/\(.*\)-'$CURRENT_WSRP'.jar/\1/p'`
+
+# remove existing files so that we don't end up with duplicate (and conflicting) files if most recent and current
+# version don't match
+rm -f $GATEIN_EAR_HOME/lib/wsrp*
+
# extract which WSRP libs are currently needed by GateIn and replace them with a fresh version from local repository
echo Deploying JAR files:
-for lib in `ls $GATEIN_EAR_HOME/lib/wsrp* | sed -n 's/.*\/\(.*\)-'$CURRENT_WSRP'.jar/\1/p'`
+for lib in $current
do
echo Copying $lib-$CURRENT_WSRP.jar to $GATEIN_EAR_HOME/lib/
cp $HOME/.m2/repository/org/gatein/wsrp/$lib/$CURRENT_WSRP/$lib-$CURRENT_WSRP.jar $GATEIN_EAR_HOME/lib/
@@ -51,9 +59,15 @@
echo
+# get the list of war files we need to replace in $GATEIN_EAR_HOME
+current=`ls $GATEIN_EAR_HOME/wsrp* | sed -n 's/.*\/\(.*\).war/\1/p'`
+
+# remove existing files
+rm -f $GATEIN_EAR_HOME/wsrp*
+
# deal with producer and admin GUI WARs separately as they are put elsewhere and without version name
echo Deploying WAR files:
-for war in `ls $GATEIN_EAR_HOME/wsrp* | sed -n 's/.*\/\(.*\).war/\1/p'`
+for war in $current
do
echo Copying $war-$CURRENT_WSRP.war to $GATEIN_EAR_HOME/$war.war
cp $HOME/.m2/repository/org/gatein/wsrp/$war/$CURRENT_WSRP/$war-$CURRENT_WSRP.war $GATEIN_EAR_HOME/$war.war
14 years, 9 months
gatein SVN: r2163 - portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design.
by do-not-reply@jboss.org
Author: arthurpeltier
Date: 2010-03-11 06:46:51 -0500 (Thu, 11 Mar 2010)
New Revision: 2163
Modified:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html
Log:
GTNPORTAL-775 : * Correct Test_POR_22.019
Modified: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html 2010-03-11 11:35:33 UTC (rev 2162)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html 2010-03-11 11:46:51 UTC (rev 2163)
@@ -447,7 +447,7 @@
<td></td>
</tr>
<tr>
- <td>waitForTitle</td>
+ <td>verifyTitle</td>
<td>POR_22_019*</td>
<td></td>
</tr>
14 years, 9 months
gatein SVN: r2162 - in portal/trunk/testsuite: selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design and 1 other directory.
by do-not-reply@jboss.org
Author: arthurpeltier
Date: 2010-03-11 06:35:33 -0500 (Thu, 11 Mar 2010)
New Revision: 2162
Added:
portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html
Modified:
portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
Log:
GTNPORTAL-775 : * Created Test "POR_22.019" - Change edit right on portal page while editing portal page's properties
* Added Sellenium Column to GateIn_v3.0_MainFucntions_TestDefinition.ods to follow sript creation
Modified: portal/trunk/testsuite/GateIn_v3.0_MainFucntions_TestDefinition.ods
===================================================================
(Binary files differ)
Added: portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html
===================================================================
--- portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html (rev 0)
+++ portal/trunk/testsuite/selenium-snifftests/src/suite/org/exoplatform/portal/selenium/design/Test_POR_22_019.html 2010-03-11 11:35:33 UTC (rev 2162)
@@ -0,0 +1,527 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head profile="http://selenium-ide.openqa.org/profiles/test-case">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<link rel="selenium.base" href="http://localhost:8080/portal" />
+<title>Test_POR_22_019</title>
+</head>
+<body>
+<table cellpadding="1" cellspacing="1" border="1">
+<thead>
+<tr><td rowspan="1" colspan="3">Test_POR_22_019</td></tr>
+</thead><tbody>
+<tr>
+ <td>open</td>
+ <td>/portal/public/classic/</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>-Change edit right on portal page-</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>username</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Create new page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Site</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Navigation</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Add Node</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>name</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>name</td>
+ <td>POR_22_019_name</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>label</td>
+ <td>POR_22_019_label</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UISiteManagement']/div[@class='UIPopupWindow UIDragObject']//div[@class='TabsContainer']//div[2]//div[@class='MiddleTab']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>pageName</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>pageTitle</td>
+ <td>POR_22_019_title</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>pageName</td>
+ <td>POR_22_019_page</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Create Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForText</td>
+ <td>xpath=//div[@id='UIPageSelector2']/div[2]/div/div/table/tbody/tr[1]/td[2]</td>
+ <td>exact:portal::classic::POR_22_019_page</td>
+</tr>
+<tr>
+ <td>verifyText</td>
+ <td>xpath=//div[@id='UIPageSelector2']/div[2]/div/div/table/tbody/tr[1]/td[2]</td>
+ <td>exact:portal::classic::POR_22_019_page</td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@id='UISiteManagement']/div[@class='UIPopupWindow UIDragObject']//div[@id='UINavigationManagement']//div[@class='UIAction']//td[2]//div[contains(@onclick,'Save')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UISiteManagement']/div[@class='UIPopupWindow UIDragObject']//div[@id='UINavigationManagement']//div[@class='UIAction']//td[2]//div[contains(@onclick,'Save')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=POR_22_019_label</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[@class='SelectedNavigationTab']//a[contains(@href,'POR_22_019_name')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=View Page properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=View Page properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[contains(@onclick,'PermissionSetting')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[contains(@onclick,'PermissionSetting')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>publicMode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyTextPresent</td>
+ <td>/platform/administrators</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[@id='UIPageEditor']//a[@class='EdittedSaveButton']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTextPresent</td>
+ <td>Root Root</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Login with user without edit permission on page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>demo</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=POR_22_019_label</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=POR_22_019_label</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementNotPresent</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Login with user with edit permission on page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>john</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=POR_22_019_label</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=View Page properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=View Page properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>xpath=//div[contains(@onclick,'PermissionSetting')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//div[contains(@onclick,'PermissionSetting')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>publicMode</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Choose permission to let only Guests edit this page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Permission Setting</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Select Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Select Permission</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Platform</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Guests</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>//a[contains(@href,'objectId=/platform/guests')]</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=exact:*</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>//div[@class='OverflowContainer']/div[@class='Info']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Save</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//a[@class='EdittedSaveButton']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify User doesn't have edit rights anymore for this page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Site Editor</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementNotPresent</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Login with Guest profile - with edit permission on page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>demo</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Verify Guest has edit rights</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=POR_22_019_label</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForTitle</td>
+ <td>POR_22_019*</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Edit Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>waitForElementPresent</td>
+ <td>link=View Page properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>verifyElementPresent</td>
+ <td>link=View Page properties</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//a[@class='SaveButton']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+<tr>
+ <td>echo</td>
+ <td>--Delete Page</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign in</td>
+ <td></td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>username</td>
+ <td>root</td>
+</tr>
+<tr>
+ <td>type</td>
+ <td>password</td>
+ <td>gtn</td>
+</tr>
+<tr>
+ <td>clickAndWait</td>
+ <td>xpath=//div[@id='UIPortalLoginFormAction']/div/div/div</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Page Management</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>xpath=//img[@title='Delete Page']</td>
+ <td></td>
+</tr>
+<tr>
+ <td>assertConfirmation</td>
+ <td>Do you want to delete this page?</td>
+ <td></td>
+</tr>
+<tr>
+ <td>clickAt</td>
+ <td>link=Sign out</td>
+ <td></td>
+</tr>
+
+</tbody></table>
+</body>
+</html>
14 years, 9 months
gatein SVN: r2161 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui.
by do-not-reply@jboss.org
Author: tan_pham_dinh
Date: 2010-03-11 06:19:35 -0500 (Thu, 11 Mar 2010)
New Revision: 2161
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
Log:
GTNPORTAL-857: Bad redirect when log in
Modified: portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
===================================================================
--- portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2010-03-11 10:50:05 UTC (rev 2160)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2010-03-11 11:19:35 UTC (rev 2161)
@@ -25,7 +25,7 @@
<% uiform.begin(); %>
<!--<form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;">
<input type="hidden" name="<%= uiform.ACTION %>" value=""/>-->
- <input type="hidden" name="uri" value="<%=session.getAttribute("initialURI"); %>"/>
+ <input type="hidden" name="initialURI" value="<%=session.getAttribute("initialURI"); %>"/>
<div class="VerticalLayout">
<table class="UIFormGrid">
<tr class="UserNameField">
14 years, 9 months
gatein SVN: r2160 - in portal/trunk/examples/skins/simpleskin/src/main/webapp/skin: SimpleSkin/UITabPaneDashboard/background and 2 other directories.
by do-not-reply@jboss.org
Author: thanh.do
Date: 2010-03-11 05:50:05 -0500 (Thu, 11 Mar 2010)
New Revision: 2160
Added:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif
Modified:
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css
portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css
Log:
GTNPORTAL-750: Change UI of Tabbed Dashboard Portlet
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2010-03-11 10:44:04 UTC (rev 2159)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/Stylesheet.css 2010-03-11 10:50:05 UTC (rev 2160)
@@ -32,7 +32,7 @@
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle {
- margin-right: 4px;
+ margin: 0px 4px 0px 0px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .MiddleTab,
@@ -56,6 +56,7 @@
float: left; /* orientation=lt */
float: right; /* orientation=rt */
cursor: pointer;
+ margin-top: 0px;
}
.UITabPaneDashboard .UIHorizontalTabs .GrayTabStyle .NormalTab .LeftTab {
Added: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif
===================================================================
(Binary files differ)
Property changes on: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UITabPaneDashboard/background/AddDashboard.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2010-03-11 10:44:04 UTC (rev 2159)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/SimpleSkin/UIToolbarContainer/Stylesheet.css 2010-03-11 10:50:05 UTC (rev 2160)
@@ -161,5 +161,5 @@
background: url('background/GateinLogo.jpg') no-repeat 10px 6px; /* orientation=lt */
background: url('background/GateinLogo.jpg') no-repeat 23px 5px; /* orientation=rt */
width: 64px;
- height: 32px;
+ height: 30px;
}
\ No newline at end of file
Modified: portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css
===================================================================
--- portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css 2010-03-11 10:44:04 UTC (rev 2159)
+++ portal/trunk/examples/skins/simpleskin/src/main/webapp/skin/webPortlet/webui/component/UIPortalNavigationPortlet/Stylesheet.css 2010-03-11 10:50:05 UTC (rev 2160)
@@ -50,6 +50,7 @@
.UINavigationPortlet .UINavigationBar .MiddleNavigationBar {
padding: 0px 24px;
+ background: #f9f9f9;
}
.UINavigationPortlet .UITab a.TabLabel {
14 years, 9 months
gatein SVN: r2159 - in portal/trunk: portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component and 1 other directories.
by do-not-reply@jboss.org
Author: tan_pham_dinh
Date: 2010-03-11 05:44:04 -0500 (Thu, 11 Mar 2010)
New Revision: 2159
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
Log:
GTNPORTAL-866: Show wrong in UI Trees in Edit Navigation when add/edit node(page)
Remove 'delete portal' button with default portal in SiteManagement
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-03-11 10:33:17 UTC (rev 2158)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2010-03-11 10:44:04 UTC (rev 2159)
@@ -25,6 +25,7 @@
import org.exoplatform.portal.config.UserACL;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.exoplatform.portal.config.model.PageNavigation;
+import org.exoplatform.portal.config.model.PageNode;
import org.exoplatform.portal.webui.navigation.UIAddGroupNavigation;
import org.exoplatform.portal.webui.navigation.UINavigationManagement;
import org.exoplatform.portal.webui.navigation.UINavigationNodeSelector;
@@ -356,6 +357,12 @@
ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>();
navis.add(selectedNavigation);
selector.initNavigations(navis);
+
+ if (uiPageNodeForm.getSelectedParent() instanceof PageNode)
+ {
+ PageNode selectedParent = (PageNode)uiPageNodeForm.getSelectedParent();
+ selector.selectPageNodeByUri(selectedParent.getUri());
+ }
//selector.removeChild(UIRightClickPopupMenu.class);
uiNavigationPopup.setUIComponent(pageManager);
uiNavigationPopup.setWindowSize(400, 400);
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2010-03-11 10:33:17 UTC (rev 2158)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/groovy/navigation/webui/component/UISiteManagement.gtmpl 2010-03-11 10:44:04 UTC (rev 2159)
@@ -3,10 +3,13 @@
import org.exoplatform.webui.form.UIForm;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+ import org.exoplatform.portal.config.UserPortalConfigService;
String[] actions = uicomponent.getActions();
uicomponent.loadPortalConfigs();
def rcontext = _ctx.getRequestContext();
+ def userPortalConfigService = uicomponent.getApplicationComponent(UserPortalConfigService.class);
+ def defaultPortalName = userPortalConfigService.getDefaultPortal();
%>
<div class="UISiteManagement UIManagement" id="<%=uicomponent.getId();%>">
<%
@@ -23,7 +26,10 @@
<a href="<%=uicomponent.event("EditPortalLayout", portalConfig.getName());%>" class="EditLayoutIcon"><%=_ctx.appRes("UISiteManagement.label.editLayout")%></a>
<a href="<%=uicomponent.event("EditNavigation", portalConfig.getName());%>" class="EditNavIcon"><%=_ctx.appRes("UISiteManagement.label.editNav")%></a>
<a href="javascript:ajaxGet(eXo.env.server.createPortalURL('UIPortal', 'EditPortalProperties', true, [{name:'portalName',value:'<%=portalConfig.getName()%>'}]))" class="EditNavIcon"><%=_ctx.appRes("UISiteManagement.label.editPortalProp")%></a>
- <a href="<%=uicomponent.url("DeletePortal", portalConfig.getName());%>" class="DeleteIcon"><%=_ctx.appRes("UISiteManagement.label.deletePortal")%></a>
+
+ <% if(defaultPortalName != null && !defaultPortalName.equals(portalConfig.getName())) {%>
+ <a href="<%=uicomponent.url("DeletePortal", portalConfig.getName());%>" class="DeleteIcon"><%=_ctx.appRes("UISiteManagement.label.deletePortal")%></a>
+ <% } %>
</td>
</tr>
</table>
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-03-11 10:33:17 UTC (rev 2158)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/navigation/UINavigationNodeSelector.java 2010-03-11 10:44:04 UTC (rev 2159)
@@ -539,7 +539,7 @@
uiNodeForm.setOwnerType(uiNodeSelector.getSelectedNavigation().getOwnerType());
uiNodeForm.setValues(selectedNode);
- uiNodeForm.setSelectedParent(obj);
+ uiNodeForm.setSelectedParent(selectedNode);
uiManagementPopup.setWindowSize(800, 500);
event.getRequestContext().addUIComponentToUpdateByAjax(uiManagementPopup.getParent());
}
14 years, 9 months
gatein SVN: r2158 - in components/shindig/trunk: assembly and 7 other directories.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-11 05:33:17 -0500 (Thu, 11 Mar 2010)
New Revision: 2158
Modified:
components/shindig/trunk/assembly/pom.xml
components/shindig/trunk/features/pom.xml
components/shindig/trunk/java/common/pom.xml
components/shindig/trunk/java/gadgets/pom.xml
components/shindig/trunk/java/pom.xml
components/shindig/trunk/java/samples/pom.xml
components/shindig/trunk/java/server/pom.xml
components/shindig/trunk/java/social-api/pom.xml
components/shindig/trunk/pom.xml
Log:
Prepare for next iteration
Modified: components/shindig/trunk/assembly/pom.xml
===================================================================
--- components/shindig/trunk/assembly/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/assembly/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -32,9 +32,9 @@
<description>Assembles the PHP code base into a deployment package.</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/as...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/assembly</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/assembly</url>
</scm>
<build>
Modified: components/shindig/trunk/features/pom.xml
===================================================================
--- components/shindig/trunk/features/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/features/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -23,7 +23,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -36,9 +36,9 @@
</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/fe...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/features</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/features</url>
</scm>
<build>
Modified: components/shindig/trunk/java/common/pom.xml
===================================================================
--- components/shindig/trunk/java/common/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/java/common/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,9 +33,9 @@
<description>Common java code for Shindig</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/c...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/common</url>
</scm>
<build>
Modified: components/shindig/trunk/java/gadgets/pom.xml
===================================================================
--- components/shindig/trunk/java/gadgets/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/java/gadgets/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -34,9 +34,9 @@
all javascript required by the OpenSocial specification.</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/g...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/gadgets</url>
</scm>
<build>
Modified: components/shindig/trunk/java/pom.xml
===================================================================
--- components/shindig/trunk/java/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/java/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
</parent>
<artifactId>shindig-parent</artifactId>
@@ -40,9 +40,9 @@
</modules>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/java</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java</url>
</scm>
<properties>
Modified: components/shindig/trunk/java/samples/pom.xml
===================================================================
--- components/shindig/trunk/java/samples/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/java/samples/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
</parent>
<artifactId>shindig-samples</artifactId>
@@ -32,9 +32,9 @@
<description>Provides Sample implementations of the SPI and API's inside the core of Shindig.</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/samples</url>
</scm>
<repositories>
Modified: components/shindig/trunk/java/server/pom.xml
===================================================================
--- components/shindig/trunk/java/server/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/java/server/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,9 +33,9 @@
<description>Default server war containing both the gadget rendering code and the social api code.</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/server</url>
</scm>
<properties>
Modified: components/shindig/trunk/java/social-api/pom.xml
===================================================================
--- components/shindig/trunk/java/social-api/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/java/social-api/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -22,7 +22,7 @@
<parent>
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-parent</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
@@ -33,9 +33,9 @@
<description>Serves OpenSocial Data and the RESTful APIs.</description>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk/ja...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk/java/s...</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk/java/soci...</url>
</scm>
<build>
Modified: components/shindig/trunk/pom.xml
===================================================================
--- components/shindig/trunk/pom.xml 2010-03-11 10:31:56 UTC (rev 2157)
+++ components/shindig/trunk/pom.xml 2010-03-11 10:33:17 UTC (rev 2158)
@@ -28,7 +28,7 @@
<groupId>org.gatein.shindig</groupId>
<artifactId>shindig-project</artifactId>
- <version>1.0-r790473-Patch02</version>
+ <version>1.0-r790473-Patch03-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Shindig Project</name>
@@ -48,9 +48,9 @@
<!-- S C M -->
<!-- ====================================================================== -->
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/tags/1.0...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/tags/1.0-r79...</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/shindig/tags/1.0-r79047...</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/shindig/trunk</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/shindig/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/shindig/trunk</url>
</scm>
<!-- ====================================================================== -->
14 years, 9 months
gatein SVN: r2157 - components/shindig/tags.
by do-not-reply@jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-03-11 05:31:56 -0500 (Thu, 11 Mar 2010)
New Revision: 2157
Added:
components/shindig/tags/1.0-r790473-Patch02/
Log:
Tagging 1.0-r790473-Patch02
Copied: components/shindig/tags/1.0-r790473-Patch02 (from rev 2156, components/shindig/trunk)
14 years, 9 months