JBoss Portal SVN: r13866 - modules/web/trunk/build.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-11 08:46:55 -0500 (Fri, 11 Dec 2009)
New Revision: 13866
Modified:
modules/web/trunk/build/pom.xml
Log:
Rollback upgrade
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
+++ modules/web/trunk/build/pom.xml 2009-12-11 13:46:55 UTC (rev 13866)
@@ -31,7 +31,7 @@
<version.jetty>6.1.7</version.jetty>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
- <version.jboss-remoting>2.2.2.SP8</version.jboss-remoting>
+ <version.jboss-remoting>2.2.2.SP1</version.jboss-remoting>
<version.jboss.portal.common>1.2.5</version.jboss.portal.common>
<version.jboss.unit>1.2.3</version.jboss.unit>
<version.jboss-reflect>2.0.0.Beta12</version.jboss-reflect>
14 years, 5 months
JBoss Portal SVN: r13865 - in modules/web/trunk: build and 1 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-11 06:57:52 -0500 (Fri, 11 Dec 2009)
New Revision: 13865
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/pom.xml
modules/web/trunk/web/pom.xml
Log:
Updates
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2009-12-11 10:57:38 UTC (rev 13864)
+++ modules/web/trunk/build/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.4-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -26,21 +26,20 @@
<properties>
<version.concurrent>1.3.4</version.concurrent>
- <version.sun.servlet>2.4</version.sun.servlet>
+ <version.sun.servlet>2.5</version.sun.servlet>
<version.apache.tomcat>6.0.16</version.apache.tomcat>
<version.jetty>6.1.7</version.jetty>
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
- <version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.2</version.jboss.portal.common>
- <version.jboss.unit>1.2.1</version.jboss.unit>
+ <version.jboss-remoting>2.2.2.SP8</version.jboss-remoting>
+ <version.jboss.portal.common>1.2.5</version.jboss.portal.common>
+ <version.jboss.unit>1.2.3</version.jboss.unit>
<version.jboss-reflect>2.0.0.Beta12</version.jboss-reflect>
- <version.log4j>1.2.14</version.log4j>
- <version.apache.commons-logging>1.1.1</version.apache.commons-logging>
+ <version.apache.commons-logging>1.1.0.jboss</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
<version.cargo>1.0-alpha-6</version.cargo>
- <version.junit>3.8.1</version.junit>
+ <version.junit>3.8.2-brew</version.junit>
<version.ant>1.7.0</version.ant>
</properties>
@@ -114,7 +113,7 @@
<version>${version.jboss.portal.common}</version>
</dependency>
<dependency>
- <groupId>sun-servlet</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>${version.sun.servlet}</version>
</dependency>
Modified: modules/web/trunk/pom.xml
===================================================================
--- modules/web/trunk/pom.xml 2009-12-11 10:57:38 UTC (rev 13864)
+++ modules/web/trunk/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Web Module</name>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.4-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2009-12-11 10:57:38 UTC (rev 13864)
+++ modules/web/trunk/web/pom.xml 2009-12-11 11:57:52 UTC (rev 13865)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.web</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>1.2.4-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -29,7 +29,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>sun-servlet</groupId>
+ <groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<scope>provided</scope>
</dependency>
14 years, 5 months
JBoss Portal SVN: r13864 - docs/enterprise/tags.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-11 05:57:38 -0500 (Fri, 11 Dec 2009)
New Revision: 13864
Removed:
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP03/
Log:
oups
14 years, 5 months
JBoss Portal SVN: r13863 - docs/enterprise/tags.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-11 05:22:50 -0500 (Fri, 11 Dec 2009)
New Revision: 13863
Added:
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP03/
Log:
Tagging docs
Copied: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP03 (from rev 13862, docs/enterprise/trunk)
14 years, 5 months
JBoss Portal SVN: r13862 - examples/tags.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-11 05:19:08 -0500 (Fri, 11 Dec 2009)
New Revision: 13862
Added:
examples/tags/Enterprise_Portal_Platform_4_3_GA_CP03/
Log:
Tagging examples
Copied: examples/tags/Enterprise_Portal_Platform_4_3_GA_CP03 (from rev 13861, examples/trunk)
14 years, 5 months
JBoss Portal SVN: r13861 - in modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity: src/main/java/org/jboss/portal/identity/helper and 1 other directory.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-12-10 19:44:49 -0500 (Thu, 10 Dec 2009)
New Revision: 13861
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/helper/IdentityTools.java
Log:
JBEPP-121 - CasAuthenticationValve forces login for requests matching the /sec pattern
Property changes on: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity
___________________________________________________________________
Name: svn:ignore
- output
target
test.properties
test.script
+ output
target
test.properties
test.script
.settings
.classpath
.project
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/helper/IdentityTools.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/helper/IdentityTools.java 2009-12-11 00:42:55 UTC (rev 13860)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/identity/src/main/java/org/jboss/portal/identity/helper/IdentityTools.java 2009-12-11 00:44:49 UTC (rev 13861)
@@ -51,24 +51,25 @@
{
SecurityConstraint constraint = constraints[i];
-
- SecurityCollection[] collections = constraint.findCollections();
-
- for (int j = 0; j < collections.length; j++)
+ if(constraint.getAuthConstraint())
{
- SecurityCollection collection = collections[j];
-
- String[] patterns = collection.findPatterns();
-
- for (int k = 0; k < patterns.length; k++)
- {
- String pattern = patterns[k];
-
- // Remove wildcards
- urls.add(pattern);
- }
+ SecurityCollection[] collections = constraint.findCollections();
+
+ for (int j = 0; j < collections.length; j++)
+ {
+ SecurityCollection collection = collections[j];
+
+ String[] patterns = collection.findPatterns();
+
+ for (int k = 0; k < patterns.length; k++)
+ {
+ String pattern = patterns[k];
+
+ // Remove wildcards
+ urls.add(pattern);
+ }
+ }
}
-
}
return urls;
14 years, 5 months
JBoss Portal SVN: r13860 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-12-10 19:42:55 -0500 (Thu, 10 Dec 2009)
New Revision: 13860
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso/
Log:
svn ignore
Property changes on: modules/identity/branches/JBP_IDENTITY_BRANCH_1_1/sso
___________________________________________________________________
Name: svn:ignore
- output
target
+ output
target
.settings
.classpath
.project
14 years, 5 months
JBoss Portal SVN: r13859 - in modules/identity: branches and 1 other directory.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-10 09:36:10 -0500 (Thu, 10 Dec 2009)
New Revision: 13859
Added:
modules/identity/branches/lucaConfigurableAdmins/
Removed:
modules/identity/trunk/
Log:
Rename dead trunk.
Branch_1_1 is the one that received all bug fixes
Copied: modules/identity/branches/lucaConfigurableAdmins (from rev 13858, modules/identity/trunk)
14 years, 5 months
JBoss Portal SVN: r13858 - in branches/Enterprise_Portal_Platform_4_3/core/src: main/org/jboss/portal/core/model/portal/command/view and 1 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-10 09:22:03 -0500 (Thu, 10 Dec 2009)
New Revision: 13858
Modified:
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
JBEPP-150: Let a user reset an alias-binding by not defining it in a URL
Defined by KeepPNState
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2009-12-10 13:53:03 UTC (rev 13857)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java 2009-12-10 14:22:03 UTC (rev 13858)
@@ -53,6 +53,8 @@
/** . */
private PortalObjectPathMapper mapper;
+ private boolean keepPNState = true;
+
public PortalObjectCommandFactory()
{
}
@@ -167,7 +169,7 @@
}
else
{
- cmd = new ViewPageCommand(id, queryParams);
+ cmd = new ViewPageCommand(id, queryParams, keepPNState);
}
}
}
@@ -175,4 +177,15 @@
//
return cmd;
}
+
+ public boolean isKeepPNState()
+ {
+ return keepPNState;
+ }
+
+ public void setKeepPNState(boolean keepPNState)
+ {
+ this.keepPNState = keepPNState;
+ }
+
}
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-12-10 13:53:03 UTC (rev 13857)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/main/org/jboss/portal/core/model/portal/command/view/ViewPageCommand.java 2009-12-10 14:22:03 UTC (rev 13858)
@@ -56,6 +56,8 @@
/** . */
private Map<String, String[]> parameters;
+
+ private boolean keepPNState = true;
public ViewPageCommand(PortalObjectId pageId, Map<String, String[]> parameters)
{
@@ -71,6 +73,12 @@
this.parameters = parameters;
}
+ public ViewPageCommand(PortalObjectId pageId, Map<String, String[]> parameters, boolean keepPNState)
+ {
+ this(pageId, parameters);
+ this.keepPNState = keepPNState;
+ }
+
public ViewPageCommand(PortalObjectId pageId)
{
this(pageId, EMPTY_PARAMETERS);
@@ -106,12 +114,15 @@
//
Map<QName, String[]> state = new HashMap<QName, String[]>();
- // Clone the previous state if needed
- if (previousPNS != null)
+ if (keepPNState)
{
- state.putAll(previousPNS.getParameters());
+ // Clone the previous state if needed
+ if (previousPNS != null)
+ {
+ state.putAll(previousPNS.getParameters());
+ }
}
-
+
//
for (Map.Entry<String, String[]> entry : parameters.entrySet())
{
Modified: branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-12-10 13:53:03 UTC (rev 13857)
+++ branches/Enterprise_Portal_Platform_4_3/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2009-12-10 14:22:03 UTC (rev 13858)
@@ -840,6 +840,7 @@
<depends optional-attribute-name="Mapper" proxy-type="attribute">
portal:service=PortalObjectPathMapper,type=Default
</depends>
+ <attribute name="KeepPNState">true</attribute>
</mbean>
<mbean code="org.jboss.portal.core.controller.command.mapper.CommandFactoryDelegate"
14 years, 5 months
JBoss Portal SVN: r13857 - docs/enterprise/trunk/Reference_Guide/en-US.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-12-10 08:53:03 -0500 (Thu, 10 Dec 2009)
New Revision: 13857
Modified:
docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml
Log:
JBEPP-151: Examples for <trans-attribute> element in the Reference Guide are incorrect
Modified: docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml
===================================================================
--- docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml 2009-12-10 13:46:43 UTC (rev 13856)
+++ docs/enterprise/trunk/Reference_Guide/en-US/XML_Descriptors.xml 2009-12-10 13:53:03 UTC (rev 13857)
@@ -88,7 +88,7 @@
invoked, a transaction may or may not exist before the portlet is invoked. The portal transaction is usually present in the local context. The default value is <computeroutput>NotSupported</computeroutput>, which means that the portal transaction is suspended for the duration of the portlet's invocation. Accepted values are <computeroutput>Required</computeroutput>, <computeroutput>Mandatory</computeroutput>, <computeroutput>Never</computeroutput>, <computeroutput>Supports</computeroutput>, <computeroutput>NotSupported</computeroutput>, and <computeroutput>RequiresNew</computeroutput>.
</para>
<para>
- The following is an example section from a <filename>WEB-INF/portlet.xml</filename> file, which uses the <computeroutput><portlet-name></computeroutput>, <computeroutput><remotable></computeroutput>, and <computeroutput><trans-attribute></computeroutput> elements:
+ The following is an example section from a <filename>WEB-INF/jboss-portlet.xml</filename> file, which uses the <computeroutput><portlet-name></computeroutput>, <computeroutput><remotable></computeroutput>, and <computeroutput><trans-attribute></computeroutput> elements:
</para>
<programlisting role="XML"><![CDATA[
<portlet>
14 years, 5 months