gatein SVN: r7623 - portal/trunk/web/portal/src/main/webapp/groovy/portal/webui.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-03 17:07:32 -0400 (Mon, 03 Oct 2011)
New Revision: 7623
Modified:
portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl
Log:
GTNPORTAL-2039: 404 Page on Failed Login attemp followed by correct login
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 2011-10-03 21:00:22 UTC (rev 7622)
+++ portal/trunk/web/portal/src/main/webapp/groovy/portal/webui/UILoginForm.gtmpl 2011-10-03 21:07:32 UTC (rev 7623)
@@ -6,8 +6,7 @@
jsmanager.importJavascript('eXo.portal.UIPortalControl');
jsmanager.addCustomizedOnLoadScript('document.getElementById("UIPortalComponentLogin").username.focus();');
HttpSession session = rcontext.getRequest().getSession();
- String requestPath = rcontext.getInitialURI();
- //session.setAttribute("initialURI", requestPath);
+ String initialURI = rcontext.getRequestParameter("initialURI");
%>
<div class="UILoginForm">
<div class="LoginDecorator">
@@ -23,7 +22,7 @@
<div class="LoginDecoratorBackground">
<div class="LoginDetailBox">
<form class="UIForm" id="$uicomponent.id" name="loginForm" action="<%= rcontext.getRequestContextPath() + "/login"%>" method="post" style="margin: 0px;">
- <input type="hidden" name="initialURI" value="<%=requestPath %>"/>
+ <input type="hidden" name="initialURI" value="<%=initialURI %>"/>
<div class="VerticalLayout">
<table class="UIFormGrid">
<tr class="UserNameField">
13 years, 2 months
gatein SVN: r7622 - in epp/portal/branches/EPP_5_2_Branch: component and 3 other directories.
by do-not-reply＠jboss.org
Author: theute
Date: 2011-10-03 17:00:22 -0400 (Mon, 03 Oct 2011)
New Revision: 7622
Modified:
epp/portal/branches/EPP_5_2_Branch/
epp/portal/branches/EPP_5_2_Branch/component/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheValue.java
epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/SimpleDataCache.java
epp/portal/branches/EPP_5_2_Branch/wsrp-integration/
Log:
JBEPP-1247: Don't know how to marshall object of type class org.exoplatform.portal.mop.description.CacheValue on startup with cluster mode
Property changes on: epp/portal/branches/EPP_5_2_Branch
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478,7497,7552,7554-7555,7598
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795:5868
/portal/branches/branch-GTNPORTAL-1592:4894
/portal/branches/branch-GTNPORTAL-1643:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745:5765
/portal/branches/branch-GTNPORTAL-1790:5871
/portal/branches/branch-GTNPORTAL-1822:5943,5952
/portal/branches/branch-GTNPORTAL-1832:6030,6063
/portal/branches/branch-GTNPORTAL-1872:6400,6551
/portal/branches/branch-GTNPORTAL-1921:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963:6904,6915-6916
/portal/branches/decoupled-webos:6214-6243
/portal/branches/gatein-management:6920-6958
/portal/branches/global-portlet-metadata:6298-6384
/portal/branches/site-describability:6171-6235
/portal/branches/xss:7377-7595,7597
/portal/branches/xss-issues:7350-7351,7358
/portal/trunk:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7239,7262,7308,7326,7331,7334,7359,7367,7433,7452,7454,7478,7497,7552,7554-7555,7598
Property changes on: epp/portal/branches/EPP_5_2_Branch/component
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7331,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7598
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component:5868
/portal/branches/branch-GTNPORTAL-1592/component:4894
/portal/branches/branch-GTNPORTAL-1643/component:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component:5765
/portal/branches/branch-GTNPORTAL-1790/component:5871
/portal/branches/branch-GTNPORTAL-1822/component:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component:6904,6915-6916
/portal/trunk/component:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7239,7262,7308,7326,7331,7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7598
Property changes on: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7359,7367,7433,7452,7454,7478,7497,7552,7554-7555,7598
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/component/portal/src/main/java/org:5868
/portal/branches/branch-GTNPORTAL-1592/component/portal/src/main/java/org:4894
/portal/branches/branch-GTNPORTAL-1643/component/portal/src/main/java/org:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/component/portal/src/main/java/org:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/component/portal/src/main/java/org:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/component/portal/src/main/java/org:5765
/portal/branches/branch-GTNPORTAL-1790/component/portal/src/main/java/org:5871
/portal/branches/branch-GTNPORTAL-1822/component/portal/src/main/java/org:5943,5952
/portal/branches/branch-GTNPORTAL-1832/component/portal/src/main/java/org:6030,6063
/portal/branches/branch-GTNPORTAL-1872/component/portal/src/main/java/org:6400,6551
/portal/branches/branch-GTNPORTAL-1921/component/portal/src/main/java/org:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/component/portal/src/main/java/org:6904,6915-6916
/portal/trunk/component/portal/src/main/java/org:4876,4891,5269,5744,5822,5943,6031,6033,6168,6196,6201-6203,6205-6206,6223,6292,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7120,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7334,7359,7367,7433,7452,7454,7478,7497,7552,7554-7555,7598
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheValue.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheValue.java 2011-10-03 20:52:36 UTC (rev 7621)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/CacheValue.java 2011-10-03 21:00:22 UTC (rev 7622)
@@ -21,12 +21,13 @@
import org.exoplatform.portal.mop.Described;
+import java.io.Serializable;
import java.util.concurrent.atomic.AtomicLong;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
*/
-public class CacheValue
+public class CacheValue implements Serializable
{
/** . */
Modified: epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/SimpleDataCache.java
===================================================================
--- epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/SimpleDataCache.java 2011-10-03 20:52:36 UTC (rev 7621)
+++ epp/portal/branches/EPP_5_2_Branch/component/portal/src/main/java/org/exoplatform/portal/mop/description/SimpleDataCache.java 2011-10-03 21:00:22 UTC (rev 7622)
@@ -19,6 +19,7 @@
package org.exoplatform.portal.mop.description;
+import org.exoplatform.commons.serialization.MarshalledObject;
import org.exoplatform.portal.mop.Described;
import org.exoplatform.portal.pom.config.POMSession;
@@ -31,33 +32,46 @@
{
/** . */
- private final ConcurrentHashMap<CacheKey, CacheValue> map;
+ private final ConcurrentHashMap<MarshalledObject<CacheKey>, MarshalledObject<CacheValue>> map;
public SimpleDataCache()
{
- this.map = new ConcurrentHashMap<CacheKey, CacheValue>();
+ this.map = new ConcurrentHashMap<MarshalledObject<CacheKey>, MarshalledObject<CacheValue>>();
}
@Override
protected Described.State getState(POMSession session, CacheKey key)
{
- CacheValue value = map.get(key);
- if (value == null)
+ MarshalledObject<CacheKey> marshalledKey = MarshalledObject.marshall(key);
+ MarshalledObject<CacheValue> marshalledValue = map.get(marshalledKey);
+ if (marshalledValue == null)
{
- value = getValue(session, key);
+ CacheValue value = getValue(session, key);
+ if (value != null)
+ {
+ map.put(marshalledKey, MarshalledObject.marshall(value));
+ return value.state;
+ }
+ else
+ {
+ return null;
+ }
}
- return value != null ? value.state : null;
+ else
+ {
+ return marshalledValue.unmarshall().state;
+ }
}
@Override
protected void removeState(CacheKey key)
{
- map.remove(key);
+ map.remove(MarshalledObject.marshall(key));
}
@Override
protected void putValue(CacheKey key, CacheValue value)
{
- map.put(key, value);
+ map.put(MarshalledObject.marshall(key), MarshalledObject.marshall(value));
}
}
Property changes on: epp/portal/branches/EPP_5_2_Branch/wsrp-integration
___________________________________________________________________
Modified: svn:mergeinfo
- /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7598
+ /epp/portal/branches/EPP_5_1_0_GA_JBEPP-795/wsrp-integration:5868
/portal/branches/branch-GTNPORTAL-1592/wsrp-integration:4894
/portal/branches/branch-GTNPORTAL-1643/wsrp-integration:5002,5063,5167
/portal/branches/branch-GTNPORTAL-1700/wsrp-integration:5348,5363,5402,5445
/portal/branches/branch-GTNPORTAL-1731/wsrp-integration:5622,5644,5668
/portal/branches/branch-GTNPORTAL-1745/wsrp-integration:5765
/portal/branches/branch-GTNPORTAL-1790/wsrp-integration:5871
/portal/branches/branch-GTNPORTAL-1822/wsrp-integration:5943,5952
/portal/branches/branch-GTNPORTAL-1832/wsrp-integration:6030,6063
/portal/branches/branch-GTNPORTAL-1872/wsrp-integration:6400,6551
/portal/branches/branch-GTNPORTAL-1921/wsrp-integration:6603,6771-6772,6774
/portal/branches/branch-GTNPORTAL-1963/wsrp-integration:6904,6915-6916
/portal/branches/decoupled-webos/wsrp-integration:6214-6243
/portal/branches/gatein-management/wsrp-integration:6920-6958
/portal/branches/global-portlet-metadata/wsrp-integration:6298-6384
/portal/branches/site-describability/wsrp-integration:6171-6235
/portal/trunk/wsrp-integration:4876,4891,5269,5744,5822,5943,6168,6196,6201-6203,6205-6206,6223,6323,6437,6440,6449,6452,6573,6741,6783-6784,6912-6913,6960,7042,7061,7095,7117,7125,7132-7134,7186,7198,7239,7262,7308,7326,7331,7334,7359,7367,7433,7450-7452,7454,7478,7497,7500,7552,7554-7555,7598
13 years, 2 months
gatein SVN: r7621 - portal/trunk.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-03 16:52:36 -0400 (Mon, 03 Oct 2011)
New Revision: 7621
Modified:
portal/trunk/pom.xml
Log:
- Updated to use WSRP 2.1.0-Beta07
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2011-10-03 19:09:59 UTC (rev 7620)
+++ portal/trunk/pom.xml 2011-10-03 20:52:36 UTC (rev 7621)
@@ -47,7 +47,7 @@
<org.gatein.wci.version>2.1.0-Beta06</org.gatein.wci.version>
<org.gatein.pc.version>2.3.0-Beta06</org.gatein.pc.version>
<org.picketlink.idm>1.3.0.Alpha04</org.picketlink.idm>
- <org.gatein.wsrp.version>2.1.0-Beta06</org.gatein.wsrp.version>
+ <org.gatein.wsrp.version>2.1.0-Beta07</org.gatein.wsrp.version>
<org.gatein.mop.version>1.1.0-Beta06</org.gatein.mop.version>
<org.gatein.mgmt.version>1.0.0-Beta04</org.gatein.mgmt.version>
<org.slf4j.version>1.5.8</org.slf4j.version>
13 years, 2 months
gatein SVN: r7620 - portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity.
by do-not-reply＠jboss.org
Author: mwringe
Date: 2011-10-03 15:09:59 -0400 (Mon, 03 Oct 2011)
New Revision: 7620
Modified:
portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
Log:
GTNPORTAL-2147: update SSO documentation on how to use CAS with the latest changes.
Modified: portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-10-03 17:13:14 UTC (rev 7619)
+++ portal/trunk/docs/reference-guide/en-US/modules/AuthenticationAndIdentity/SSO.xml 2011-10-03 19:09:59 UTC (rev 7620)
@@ -104,8 +104,8 @@
| local authentication strategy. You might accomplish this by coding a new such handler and declaring
| edu.someschool.its.cas.MySpecialHandler here, or you might use one of the handlers provided in the adaptors modules.
+-->
- <bean
- class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" />
+ <emphasis role="bold"><bean
+ class="org.jasig.cas.authentication.handler.support.SimpleTestUsernamePasswordAuthenticationHandler" /></emphasis>
</list>
</property>
</programlisting>
@@ -143,11 +143,11 @@
| Note: Modify the Plugin Configuration based on the actual information of a GateIn instance.
| The instance can be anywhere on the internet...Not necessarily on localhost where CAS is running
+-->
- <bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin">
+ <emphasis role="bold"><bean class="org.gatein.sso.cas.plugin.AuthenticationPlugin">
<property name="gateInHost"><value>localhost</value></property>
<property name="gateInPort"><value>8080</value></property>
<property name="gateInContext"><value>portal</value></property>
- </bean>
+ </bean></emphasis>
</list>
</property>
</programlisting>
@@ -194,7 +194,21 @@
</step>
</procedure>
</section>
+ <note>
+ <para>
+ By default on logout the CAS server will display the CAS logout page with a link to return to the portal. To make the CAS server redirect to the portal page after a logout, modify the
+ <filename>cas.war/WEB-INF/cas-servlet.xml</filename> to include the follow line :
+ </para>
+ <programlisting>
+ <bean id="logoutController" class="org.jasig.cas.web.LogoutController"
+ p:centralAuthenticationService-ref="centralAuthenticationService"
+ p:logoutView="casLogoutView"
+ p:warnCookieGenerator-ref="warnCookieGenerator"
+ p:ticketGrantingTicketCookieGenerator-ref="ticketGrantingTicketCookieGenerator"
+ <emphasis role="bold">p:followServiceRedirects="true"/></emphasis>
+ </programlisting>
+ </note>
</section>
<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Setup_the_CAS_client">
@@ -319,13 +333,12 @@
<!--
If casRenewTicket param value of InitiateLoginServlet is: not specified or false
-->
- <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/priv...</param-value>
+ <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/init...</param-value>
<!--
If casRenewTicket param value of InitiateLoginServlet is : true
-->
<!--
- <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/private
- /classic&renew=true</param-value>
+ <param-value>http://localhost:8888/cas/login?service=http://localhost:8080/portal/init...</param-value>
-->
</init-param>
</filter>
@@ -337,7 +350,27 @@
<param-name>LOGOUT_URL</param-name>
<param-value>http://localhost:8888/cas/logout</param-value>
</init-param>
- </filter>
+ </filter>
+ <filter>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <filter-class>org.gatein.sso.agent.filter.InitiateLoginFilter</filter-class>
+ <init-param>
+ <param-name>ssoServerUrl</param-name>
+ <param-value>http://localhost:8888/cas</param-value>
+ </init-param>
+ <init-param>
+ <param-name>casRenewTicket</param-name>
+ <param-value>false</param-value>
+ </init-param>
+ <init-param>
+ <param-name>casServiceUrl</param-name>
+ <param-value>http://localhost:8080/portal/initiatessologin</param-value>
+ </init-param>
+ <init-param>
+ <param-name>loginUrl</param-name>
+ <param-value>http://localhost:8080/portal/dologin</param-value>
+ </init-param>
+ </filter>
<!-- Mapping the filters at the very top of the filter chain -->
<filter-mapping>
@@ -348,28 +381,14 @@
<filter-name>CASLogoutFilter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
+ <filter-mapping>
+ <filter-name>InitiateLoginFilter</filter-name>
+ <url-pattern>/initiatessologin</url-pattern>
+ </filter-mapping>
]]>
</programlisting>
</para>
</listitem>
- <listitem>
- <para>
- Replace the <literal>InitiateLoginServlet</literal> declaration in <filename>gatein.ear/02portal.war/WEB-INF/web.xml</filename> with:
-<programlisting><servlet>
- <servlet-name>InitiateLoginServlet</servlet-name>
- <servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class>
- <init-param>
- <param-name>ssoServerUrl</param-name>
- <param-value>http://localhost:8888/cas</param-value>
- </init-param>
- <init-param>
- <param-name>casRenewTicket</param-name>
- <param-value>false</param-value>
- </init-param>
-</servlet>
-</programlisting>
- </para>
- </listitem>
</itemizedlist>
</para>
<para>
13 years, 2 months
gatein SVN: r7619 - in sandbox/as7_support/branches/gatein-as7/wci: exo and 21 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2011-10-03 13:13:14 -0400 (Mon, 03 Oct 2011)
New Revision: 7619
Modified:
sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
Log:
2.1.0-Beta07-AS7-Beta01
Modified: sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/exo/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-exo</artifactId>
@@ -13,6 +13,7 @@
<dependency>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-wci</artifactId>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss6/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss6</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 6 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/jboss7/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-jboss</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss7</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
<packaging>jar</packaging>
<name>GateIn - WCI JBoss 7 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/jboss/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jboss</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/jetty/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-jetty</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -6,7 +6,7 @@
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
<packaging>pom</packaging>
<parent>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/core/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-core</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/exo-portlet/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-exo-portlet</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI eXo Backwards Compatibility Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/gatein-portlet/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-gatein-portlet</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Gatein Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/native-portlet/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-portlets</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-native-portlet</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>war</packaging>
<name>GateIn - WCI Native Test Portlet</name>
</project>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/portlets/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-portlets</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss42/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta03-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss42</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss51/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss51</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jboss6/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jboss6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/jetty6/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-jetty6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-server-parent</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat6/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat6</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/test/servers/tomcat7/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-test-server-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-test-tomcat7</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat</artifactId>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat6/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat6</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 6 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/tomcat/tomcat7/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-tomcat</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-tomcat7</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
<packaging>jar</packaging>
<name>GateIn - WCI Tomcat 7 compatibility component</name>
Modified: sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml
===================================================================
--- sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
+++ sandbox/as7_support/branches/gatein-as7/wci/wci/pom.xml 2011-10-03 17:13:14 UTC (rev 7619)
@@ -2,11 +2,10 @@
<parent>
<groupId>org.gatein.wci</groupId>
<artifactId>wci-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07-AS7-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wci-wci</artifactId>
- <version>2.1.0-Beta07-AS7-Beta01</version>
<packaging>jar</packaging>
<name>GateIn - Web Container Integration component (wci)</name>
13 years, 2 months
gatein SVN: r7618 - in components/wsrp/trunk: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-03 12:54:47 -0400 (Mon, 03 Oct 2011)
New Revision: 7618
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/jcr-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/ws-security/jboss5/pom.xml
components/wsrp/trunk/ws-security/pom.xml
components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/trunk/ws-security/wss/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/api/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/common/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/consumer/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -29,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
<packaging>pom</packaging>
@@ -40,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-...</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Beta07</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Beta07</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/producer/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/test/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/trunk/ws-security/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/ws-security/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2011-10-03 16:54:33 UTC (rev 7617)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-10-03 16:54:47 UTC (rev 7618)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta07</version>
+ <version>2.1.0-Beta08-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 2 months
gatein SVN: r7617 - components/wsrp/tags.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-03 12:54:33 -0400 (Mon, 03 Oct 2011)
New Revision: 7617
Added:
components/wsrp/tags/2.1.0-Beta07/
Log:
[maven-release-plugin] copy for tag 2.1.0-Beta07
13 years, 2 months
gatein SVN: r7616 - in components/wsrp/trunk: admin-gui and 14 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2011-10-03 12:54:21 -0400 (Mon, 03 Oct 2011)
New Revision: 7616
Modified:
components/wsrp/trunk/admin-gui/pom.xml
components/wsrp/trunk/api/pom.xml
components/wsrp/trunk/common/pom.xml
components/wsrp/trunk/consumer/pom.xml
components/wsrp/trunk/hibernate-impl/pom.xml
components/wsrp/trunk/jcr-impl/pom.xml
components/wsrp/trunk/pom.xml
components/wsrp/trunk/producer/pom.xml
components/wsrp/trunk/test/pom.xml
components/wsrp/trunk/ws-security/jboss5/pom.xml
components/wsrp/trunk/ws-security/pom.xml
components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
components/wsrp/trunk/ws-security/wss/pom.xml
components/wsrp/trunk/wsrp-producer-war/pom.xml
components/wsrp/trunk/wsrp1-ws/pom.xml
components/wsrp/trunk/wsrp2-ws/pom.xml
Log:
[maven-release-plugin] prepare release 2.1.0-Beta07
Modified: components/wsrp/trunk/admin-gui/pom.xml
===================================================================
--- components/wsrp/trunk/admin-gui/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/admin-gui/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -21,12 +21,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-admin-gui</artifactId>
Modified: components/wsrp/trunk/api/pom.xml
===================================================================
--- components/wsrp/trunk/api/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/api/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-integration-api</artifactId>
Modified: components/wsrp/trunk/common/pom.xml
===================================================================
--- components/wsrp/trunk/common/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/common/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-common</artifactId>
Modified: components/wsrp/trunk/consumer/pom.xml
===================================================================
--- components/wsrp/trunk/consumer/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/consumer/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-consumer</artifactId>
Modified: components/wsrp/trunk/hibernate-impl/pom.xml
===================================================================
--- components/wsrp/trunk/hibernate-impl/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/hibernate-impl/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -28,7 +28,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<groupId>org.gatein.wsrp</groupId>
Modified: components/wsrp/trunk/jcr-impl/pom.xml
===================================================================
--- components/wsrp/trunk/jcr-impl/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/jcr-impl/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/pom.xml
===================================================================
--- components/wsrp/trunk/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -21,8 +21,7 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
@@ -30,7 +29,7 @@
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
<packaging>pom</packaging>
@@ -41,9 +40,9 @@
</parent>
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/trunk/</connection>
- <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/trunk/</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/trunk/</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-...</connection>
+ <developerConnection>scm:svn:https://svn.jboss.org/repos/gatein/components/wsrp/tags/2.1.0-Beta07</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/wsrp/tags/2.1.0-Beta07</url>
</scm>
<properties>
Modified: components/wsrp/trunk/producer/pom.xml
===================================================================
--- components/wsrp/trunk/producer/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/producer/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-lib</artifactId>
Modified: components/wsrp/trunk/test/pom.xml
===================================================================
--- components/wsrp/trunk/test/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/test/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -26,7 +26,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/ws-security/jboss5/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/ws-security/jboss5/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss-jboss5</artifactId>
Modified: components/wsrp/trunk/ws-security/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/ws-security/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -27,7 +27,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<artifactId>wsrp-wss-parent</artifactId>
Modified: components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/ws-security/wsrp-producer-jb5wss-producer-war/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-producer-jb5wss</artifactId>
Modified: components/wsrp/trunk/ws-security/wss/pom.xml
===================================================================
--- components/wsrp/trunk/ws-security/wss/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/ws-security/wss/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-wss-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wss</artifactId>
Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -22,12 +22,11 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/wsrp/trunk/wsrp1-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp1-ws/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/wsrp1-ws/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -25,7 +25,7 @@
<parent>
<groupId>org.gatein.wsrp</groupId>
<artifactId>wsrp-parent</artifactId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp1-ws</artifactId>
Modified: components/wsrp/trunk/wsrp2-ws/pom.xml
===================================================================
--- components/wsrp/trunk/wsrp2-ws/pom.xml 2011-10-03 16:20:33 UTC (rev 7615)
+++ components/wsrp/trunk/wsrp2-ws/pom.xml 2011-10-03 16:54:21 UTC (rev 7616)
@@ -26,7 +26,7 @@
<parent>
<artifactId>wsrp-parent</artifactId>
<groupId>org.gatein.wsrp</groupId>
- <version>2.1.0-Beta07-SNAPSHOT</version>
+ <version>2.1.0-Beta07</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>wsrp-wsrp2-ws</artifactId>
13 years, 2 months
gatein SVN: r7615 - portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-10-03 12:20:33 -0400 (Mon, 03 Oct 2011)
New Revision: 7615
Added:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/Retrieval.java
Log:
GTNPORTAL-2148 : Detect reentrancy in future cache to prevent self deadlock
Added: portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/Retrieval.java
===================================================================
--- portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/Retrieval.java (rev 0)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/Retrieval.java 2011-10-03 16:20:33 UTC (rev 7615)
@@ -0,0 +1,53 @@
+package org.exoplatform.commons.cache.future;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.FutureTask;
+
+/** @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a> */
+class Retrieval<K, V, C> implements Callable<V>
+{
+
+ /** . */
+ private final C context;
+
+ /** . */
+ private final K key;
+
+ /** . */
+ private final FutureCache<K, V, C> cache;
+
+ /** . */
+ final FutureTask<V> future;
+
+ /** Avoid reentrancy. */
+ transient Thread current;
+
+ public Retrieval(C context, K key, FutureCache<K, V, C> cache)
+ {
+ this.key = key;
+ this.context = context;
+ this.future = new FutureTask<V>(this);
+ this.cache = cache;
+ this.current = null;
+ }
+
+ public V call() throws Exception
+ {
+ // Retrieve the value from the loader
+ V value = cache.loader.retrieve(context, key);
+
+ //
+ if (value != null)
+ {
+ // Cache it, it is made available to other threads (unless someone removes it)
+ cache.put(key, value);
+
+ // Return value
+ return value;
+ }
+ else
+ {
+ return null;
+ }
+ }
+}
13 years, 2 months
gatein SVN: r7614 - in portal/trunk/component/common/src: test/java/org/exoplatform/commons/cache/future and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2011-10-03 12:09:34 -0400 (Mon, 03 Oct 2011)
New Revision: 7614
Modified:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureCache.java
portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java
Log:
GTNPORTAL-2148 : Detect reentrancy in future cache to prevent self deadlock
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-10-03 16:02:25 UTC (rev 7613)
+++ portal/trunk/component/common/src/main/java/org/exoplatform/commons/cache/future/FutureCache.java 2011-10-03 16:09:34 UTC (rev 7614)
@@ -49,10 +49,10 @@
{
/** . */
- private final Loader<K, V, C> loader;
+ final Loader<K, V, C> loader;
/** . */
- private final ConcurrentMap<K, FutureTask<V>> futureEntries;
+ private final ConcurrentMap<K, Retrieval<K, V, C>> futureEntries;
/** . */
private final Logger log = LoggerFactory.getLogger(FutureCache.class);
@@ -60,7 +60,7 @@
public FutureCache(Loader<K, V, C> loader)
{
this.loader = loader;
- this.futureEntries = new ConcurrentHashMap<K, FutureTask<V>>();
+ this.futureEntries = new ConcurrentHashMap<K, Retrieval<K, V, C>>();
}
/**
@@ -99,65 +99,67 @@
if (value == null)
{
// Create our future
- FutureTask<V> future = new FutureTask<V>(new Callable<V>()
- {
- public V call() throws Exception
- {
- // Retrieve the value from the loader
- V value = loader.retrieve(context, key);
+ Retrieval<K, V, C> retrieval = new Retrieval<K, V, C>(context, key, this);
- //
- if (value != null)
- {
- // Cache it, it is made available to other threads (unless someone removes it)
- put(key, value);
-
- // Return value
- return value;
- }
- else
- {
- return null;
- }
- }
- });
-
// This boolean means we inserted in the local
boolean inserted = true;
//
try
{
- FutureTask<V> phantom = futureEntries.putIfAbsent(key, future);
+ Retrieval<K, V, C> phantom = futureEntries.putIfAbsent(key, retrieval);
// Use the value that could have been inserted by another thread
if (phantom != null)
{
- future = phantom;
+ retrieval = phantom;
inserted = false;
}
else
{
- future.run();
+ try
+ {
+ retrieval.current = Thread.currentThread();
+ retrieval.future.run();
+ }
+ catch (Exception e)
+ {
+ log.error("Retrieval of resource " + key + " threw an exception", e);
+ }
+ finally
+ {
+ retrieval.current = null;
+ }
}
// Returns the value
- value = future.get();
+ if (retrieval.current == Thread.currentThread())
+ {
+ throw new IllegalStateException("Reentrancy detected when obtaining key " + key + " with context " + context + " detected");
+ }
+ else
+ {
+ try
+ {
+ value = retrieval.future.get();
+ }
+ catch (ExecutionException e)
+ {
+ log.error("Computing of resource " + key + " threw an exception", e.getCause());
+ }
+ catch (InterruptedException e)
+ {
+ // We should handle interruped exception in some manner
+ log.error("Retrieval of resource " + key + " threw an exception", e);
+ }
+ }
}
- catch (ExecutionException e)
- {
- log.error("Computing of resource " + key + " threw an exception", e.getCause());
- }
- catch (Exception e)
- {
- log.error("Retrieval of resource " + key + " threw an exception", e);
- }
finally
{
// Clean up the per key map but only if our insertion succeeded and with our future
if (inserted)
{
- futureEntries.remove(key, future);
+ futureEntries.remove(key, retrieval);
}
}
}
Modified: portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java
===================================================================
--- portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java 2011-10-03 16:02:25 UTC (rev 7613)
+++ portal/trunk/component/common/src/test/java/org/exoplatform/commons/cache/future/GetTestCase.java 2011-10-03 16:09:34 UTC (rev 7614)
@@ -23,6 +23,7 @@
import junit.framework.TestCase;
import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
/**
* @author <a href="mailto:julien.viet@exoplatform.com">Julien Viet</a>
@@ -68,4 +69,32 @@
}, "foo"));
Assert.assertFalse(futureCache.data.containsKey("foo"));
}
+
+ public void testReentrancy()
+ {
+ final FutureMap<Callable<String>> futureCache = new FutureMap<Callable<String>>(new StringLoader());
+ String res = futureCache.get(new Callable<String>()
+ {
+ public String call() throws Exception
+ {
+ try
+ {
+ futureCache.get(new Callable<String>()
+ {
+ public String call() throws Exception
+ {
+ // Should not go there
+ throw new AssertionError();
+ }
+ }, "foo");
+ return "fail";
+ }
+ catch (IllegalStateException expected)
+ {
+ return "pass";
+ }
+ }
+ }, "foo");
+ assertEquals("pass", res);
+ }
}
13 years, 2 months