JBoss Portal SVN: r12650 - branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-01-26 14:32:22 -0500 (Mon, 26 Jan 2009)
New Revision: 12650
Modified:
branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml
Log:
remove unneeded Richfaces config
Modified: branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2009-01-26 19:31:37 UTC (rev 12649)
+++ branches/JBoss_Portal_Branch_2_7/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/web.xml 2009-01-26 19:32:22 UTC (rev 12650)
@@ -28,11 +28,6 @@
version="2.4">
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
- </context-param>
-
- <context-param>
<param-name>javax.portlet.faces.renderPolicy</param-name>
<param-value>ALWAYS_DELEGATE</param-value>
</context-param>
15 years, 8 months
JBoss Portal SVN: r12649 - branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-01-26 14:31:37 -0500 (Mon, 26 Jan 2009)
New Revision: 12649
Modified:
branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
Log:
remove unneeded Richfaces config
Modified: branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 18:00:43 UTC (rev 12648)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 19:31:37 UTC (rev 12649)
@@ -29,11 +29,6 @@
version="2.4">
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
- </context-param>
-
- <context-param>
<param-name>javax.portlet.faces.renderPolicy</param-name>
<param-value>ALWAYS_DELEGATE</param-value>
</context-param>
@@ -43,26 +38,6 @@
<param-value>true</param-value>
</context-param>
- <context-param>
- <param-name>org.ajax4jsf.RESOURCE_URI_PREFIX</param-name>
- <param-value>rfRes</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.LoadStyleStrategy</param-name>
- <param-value>NONE</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.richfaces.LoadScriptStrategy</param-name>
- <param-value>NONE</param-value>
- </context-param>
-
- <context-param>
- <param-name>org.ajax4jsf.COMPRESS_SCRIPT</param-name>
- <param-value>false</param-value>
- </context-param>
-
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
15 years, 8 months
JBoss Portal SVN: r12648 - branches/Enterprise_Portal_Platform_4_3/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-26 13:00:43 -0500 (Mon, 26 Jan 2009)
New Revision: 12648
Modified:
branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
Log:
Use identity 1.0.7
Modified: branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-01-26 17:47:28 UTC (rev 12647)
+++ branches/Enterprise_Portal_Platform_4_3/build/build-thirdparty.xml 2009-01-26 18:00:43 UTC (rev 12648)
@@ -45,7 +45,7 @@
<componentref name="jboss-portal/modules/web" version="1.2.3"/>
<componentref name="jboss-portal/modules/test" version="1.0.4"/>
<componentref name="jboss-portal/modules/portlet" version="2.0.5"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.6"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0.7"/>
<componentref name="jboss-portal/modules/cms" version="1.2.3"/>
<componentref name="antlr" version="2.7.6-brew"/>
<componentref name="apache-ant" version="1.6.5"/>
15 years, 8 months
JBoss Portal SVN: r12647 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-01-26 12:47:28 -0500 (Mon, 26 Jan 2009)
New Revision: 12647
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
Log:
Fix windowName namespace problem. remove comments
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-01-26 17:33:10 UTC (rev 12646)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-01-26 17:47:28 UTC (rev 12647)
@@ -382,18 +382,6 @@
assignedWindows.values.clear();
}
-// private String windowName;
-//
-// public String getWindowName()
-// {
-// return windowName;
-// }
-//
-// public void setWindowName(String windowName)
-// {
-// this.windowName = windowName;
-// }
-
/** Portlet event */
public void assignWindow(ActionEvent event)
{
15 years, 8 months
JBoss Portal SVN: r12646 - in branches/JBoss_Portal_Branch_2_7/core-admin/src: resources/portal-admin-war/WEB-INF and 1 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2009-01-26 12:33:10 -0500 (Mon, 26 Jan 2009)
New Revision: 12646
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml
Log:
Fix windowName namespace problem. Make page independent from bridge or JSF impl
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-01-26 17:19:31 UTC (rev 12645)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/common/PageManagerBean.java 2009-01-26 17:33:10 UTC (rev 12646)
@@ -50,6 +50,7 @@
import javax.faces.event.AbortProcessingException;
import javax.faces.event.ActionEvent;
import javax.faces.model.SelectItem;
+import javax.faces.component.UIInput;
import javax.xml.namespace.QName;
import java.util.ArrayList;
import java.util.Collection;
@@ -117,9 +118,21 @@
/** . */
public Map selectedRenderParameters;
+ UIInput windowName = null;
+
+ public UIInput getWindowName()
+ {
+ return windowName;
+ }
+
+ public void setWindowName(UIInput windowName)
+ {
+ this.windowName = windowName;
+ }
+
public String getNamespace()
{
- return FacesContext.getCurrentInstance().getExternalContext().encodeNamespace("") + VIEW_ROOT;
+ return windowName.getClientId(FacesContext.getCurrentInstance());
}
public List getContentTypeItems()
@@ -322,7 +335,7 @@
tmp.setDeclaredProperty(ThemeConstants.PORTAL_PROP_ORDER, "" + i);
}
- this.windowName = "";
+ this.windowName.setValue("");
}
catch (DuplicatePortalObjectException unexpected)
{
@@ -369,18 +382,18 @@
assignedWindows.values.clear();
}
- private String windowName;
+// private String windowName;
+//
+// public String getWindowName()
+// {
+// return windowName;
+// }
+//
+// public void setWindowName(String windowName)
+// {
+// this.windowName = windowName;
+// }
- public String getWindowName()
- {
- return windowName;
- }
-
- public void setWindowName(String windowName)
- {
- this.windowName = windowName;
- }
-
/** Portlet event */
public void assignWindow(ActionEvent event)
{
@@ -393,7 +406,7 @@
String[] windowNames = ((String[])renderParams.get("windowName"));
if (windowNames != null && windowNames.length > 0)
{
- setWindowName(windowNames[0]);
+ windowName.setValue(windowNames[0]);
}
}
else if (event instanceof PortletEventEvent)
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-01-26 17:19:31 UTC (rev 12645)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-01-26 17:33:10 UTC (rev 12646)
@@ -29,11 +29,6 @@
version="2.4">
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
- </context-param>
-
- <context-param>
<param-name>javax.portlet.faces.renderPolicy</param-name>
<param-value>ALWAYS_DELEGATE</param-value>
</context-param>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2009-01-26 17:19:31 UTC (rev 12645)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/jsf/common/editPageLayout.xhtml 2009-01-26 17:33:10 UTC (rev 12646)
@@ -24,7 +24,7 @@
<h:form id="windowForm">
<label for="windowName">
<span class="portlet-form-field-label admin-label">#{bundle.COMMON_WINDOW_NAME}:</span>
- <h:inputText id="windowName" value="#{pageManager.windowName}"
+ <h:inputText id="windowName" binding="#{pageManager.windowName}"
styleClass="portlet-form-input-field id-window-name"/>
</label>
<h:message for="windowName" errorClass="portlet-msg-error"/>
@@ -86,7 +86,7 @@
<tr>
<td valign="top">
<h:commandButton
- onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}:windowForm:windowName').value"
+ onclick="document.getElementById('blah').value=document.getElementById('#{pageManager.namespace}').value"
value="#{bundle.COMMON_ADD}" id="a_#{regionName}"
actionListener="#{pageManager.assignWindows}"
styleClass="portlet-form-button layout-button"/>
15 years, 8 months
JBoss Portal SVN: r12645 - in modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso: josso and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-26 12:19:31 -0500 (Mon, 26 Jan 2009)
New Revision: 12645
Modified:
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
Log:
fix the logic bug pointed to by the security team
Modified: modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 16:57:08 UTC (rev 12644)
+++ modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 17:19:31 UTC (rev 12645)
@@ -126,7 +126,7 @@
{
//Check and make sure the user account is enabled
Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED);
- if(enabled != null || enabled.booleanValue())
+ if(enabled != null && enabled.booleanValue())
{
//Check and make sure user has proper role setup
if(this.havingRole != null && this.havingRole.trim().length()>0)
Modified: modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
===================================================================
--- modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 16:57:08 UTC (rev 12644)
+++ modules/identity/tags/JBP_IDENTITY_1_0_7/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 17:19:31 UTC (rev 12645)
@@ -190,7 +190,7 @@
{
//Check and make sure the user account is enabled
Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED);
- if(enabled != null || enabled.booleanValue())
+ if(enabled != null && enabled.booleanValue())
{
//Now perform validation
status = user.validatePassword(password);
15 years, 8 months
JBoss Portal SVN: r12644 - in modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso: josso and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-26 11:57:08 -0500 (Mon, 26 Jan 2009)
New Revision: 12644
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
Log:
* fix the logic bug pointed to by the security team
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 16:43:23 UTC (rev 12643)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 16:57:08 UTC (rev 12644)
@@ -126,7 +126,7 @@
{
//Check and make sure the user account is enabled
Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED);
- if(enabled != null || enabled.booleanValue())
+ if(enabled != null && enabled.booleanValue())
{
//Check and make sure user has proper role setup
if(this.havingRole != null && this.havingRole.trim().length()>0)
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 16:43:23 UTC (rev 12643)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/sso/src/main/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 16:57:08 UTC (rev 12644)
@@ -190,7 +190,7 @@
{
//Check and make sure the user account is enabled
Boolean enabled = (Boolean)this.profileModule.getProperty(user, User.INFO_USER_ENABLED);
- if(enabled != null || enabled.booleanValue())
+ if(enabled != null && enabled.booleanValue())
{
//Now perform validation
status = user.validatePassword(password);
15 years, 8 months
JBoss Portal SVN: r12643 - in modules/presentation/trunk: build and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-26 11:43:23 -0500 (Mon, 26 Jan 2009)
New Revision: 12643
Modified:
modules/presentation/trunk/ajax/pom.xml
modules/presentation/trunk/build/pom.xml
modules/presentation/trunk/classic/pom.xml
modules/presentation/trunk/portal/pom.xml
Log:
- Updated pom files with more recent versions of modules.
- Commented out remoting which doesn't seem to be needed to compile or tests (plus it's imported by some module).
Modified: modules/presentation/trunk/ajax/pom.xml
===================================================================
--- modules/presentation/trunk/ajax/pom.xml 2009-01-26 16:42:58 UTC (rev 12642)
+++ modules/presentation/trunk/ajax/pom.xml 2009-01-26 16:43:23 UTC (rev 12643)
@@ -6,7 +6,7 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<artifactId>presentation-ajax</artifactId>
<packaging>jar</packaging>
@@ -19,7 +19,7 @@
<artifactId>presentation-presentation</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -44,7 +44,7 @@
<groupId>org.jboss.portal.common</groupId>
<artifactId>common-portal</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>common-mc</artifactId>
@@ -86,11 +86,11 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
- </dependencies>
+ </dependencies>
<profiles>
<profile>
@@ -151,19 +151,22 @@
<phase>package</phase>
<configuration>
<tasks>
- <echo>maven.dependency.com.google.gwt.gwt-user.jar.path: ${maven.dependency.com.google.gwt.gwt-user.jar.path}</echo>
+ <echo>maven.dependency.com.google.gwt.gwt-user.jar.path:
+ ${maven.dependency.com.google.gwt.gwt-user.jar.path}
+ </echo>
<java
fork="true"
classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="${basedir}/src/main/java"/>
<pathelement location="${maven.dependency.com.google.gwt.gwt-user.jar.path}"/>
- <pathelement location="${settings.localRepository}/com/google/gwt/gwt-dev/${version.gwt}/gwt-dev-${version.gwt}-${gwt.os}.jar"/>
+ <pathelement
+ location="${settings.localRepository}/com/google/gwt/gwt-dev/${version.gwt}/gwt-dev-${version.gwt}-${gwt.os}.jar"/>
</classpath>
<arg line="-out ${basedir}/target/gwt-client/"/>
<arg line="org.jboss.portal.presentation.ajax.Presentation"/>
</java>
- </tasks>
+ </tasks>
</configuration>
<goals>
<goal>run</goal>
@@ -180,13 +183,13 @@
</descriptors>
</configuration>
<executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
Modified: modules/presentation/trunk/build/pom.xml
===================================================================
--- modules/presentation/trunk/build/pom.xml 2009-01-26 16:42:58 UTC (rev 12642)
+++ modules/presentation/trunk/build/pom.xml 2009-01-26 16:43:23 UTC (rev 12643)
@@ -9,41 +9,41 @@
the property
-->
<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.jboss.portal</groupId>
- <artifactId>jboss-portal-parent</artifactId>
- <version>1.0.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.jboss.portal.presentation</groupId>
- <artifactId>module-parent</artifactId>
- <version>1.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>JBoss Portal Presentation Framework - Parent Module</name>
- <url>http://www.jboss.com/products/jbossmc</url>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <parent>
+ <groupId>org.jboss.portal</groupId>
+ <artifactId>jboss-portal-parent</artifactId>
+ <version>1.0.0</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.portal.presentation</groupId>
+ <artifactId>module-parent</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>JBoss Portal Presentation Framework - Parent Module</name>
+ <url>http://www.jboss.com/products/jbossmc</url>
- <properties>
- <version.javax.servlet>2.4</version.javax.servlet>
- <version.apache-log4j>1.2.8</version.apache-log4j>
- <version.junit>3.8.1</version.junit>
- <version.httpunit>1.6</version.httpunit>
- <version.gwt>1.5.3</version.gwt>
+ <properties>
+ <version.javax.servlet>2.4</version.javax.servlet>
+ <version.apache-log4j>1.2.8</version.apache-log4j>
+ <version.junit>3.8.1</version.junit>
+ <version.httpunit>1.6</version.httpunit>
+ <version.gwt>1.5.3</version.gwt>
- <version.portlet-api>2.0</version.portlet-api>
+ <version.portlet-api>2.0</version.portlet-api>
- <version.jboss.portal.common>1.2-SNAPSHOT</version.jboss.portal.common>
- <version.jboss.portal.portlet>2.1.0-SNAPSHOT</version.jboss.portal.portlet>
- <version.jboss.portal.web>1.2.0</version.jboss.portal.web>
- <version.jboss.unit>1.2.0.Beta2</version.jboss.unit>
-
- <version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
- <version.jboss.common.core>2.0.4.GA</version.jboss.common.core>
- <version.jboss.remoting>2.2.1.GA</version.jboss.remoting>
-
- <!-- your local appserver installation -->
- <jboss.home>/home/soshah/appServers/jboss-4.2.1.GA</jboss.home>
- <portal.deploy.dir>presentation</portal.deploy.dir>
+ <version.jboss.portal.common>trunk-SNAPSHOT</version.jboss.portal.common>
+ <version.jboss.portal.portlet>2.0.5</version.jboss.portal.portlet>
+ <version.jboss.portal.web>1.2.3</version.jboss.portal.web>
+ <version.jboss.unit>1.2.2</version.jboss.unit>
+
+ <version.jboss.microcontainer>2.0.2.GA</version.jboss.microcontainer>
+ <version.jboss.common.core>2.2.10.GA</version.jboss.common.core>
+ <!--<version.jboss.remoting>2.5.0.SP2</version.jboss.remoting> -->
+
+ <!-- your local appserver installation -->
+ <jboss.home>/home/soshah/appServers/jboss-4.2.1.GA</jboss.home>
+ <portal.deploy.dir>presentation</portal.deploy.dir>
</properties>
<repositories>
@@ -79,7 +79,7 @@
</snapshots>
</pluginRepository>
</pluginRepositories>
-
+
<dependencyManagement>
<!-- The parent pom manages the inter-dependencies of the modules. -->
<dependencies>
@@ -136,7 +136,7 @@
<artifactId>common-portal</artifactId>
<version>${version.jboss.portal.common}</version>
</dependency>
-
+
<dependency>
<groupId>org.jboss.portal.common</groupId>
<artifactId>common-mc</artifactId>
@@ -216,16 +216,16 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
<version>${version.jboss.common.core}</version>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
<version>${version.jboss.remoting}</version>
- </dependency>
+ </dependency> -->
</dependencies>
</dependencyManagement>
</project>
Modified: modules/presentation/trunk/classic/pom.xml
===================================================================
--- modules/presentation/trunk/classic/pom.xml 2009-01-26 16:42:58 UTC (rev 12642)
+++ modules/presentation/trunk/classic/pom.xml 2009-01-26 16:43:23 UTC (rev 12643)
@@ -6,7 +6,7 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<artifactId>presentation-classic</artifactId>
<packaging>jar</packaging>
@@ -36,8 +36,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-common</artifactId>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-common</artifactId>
</dependency>
<dependency>
@@ -86,18 +86,18 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
- <dependency>
+ <!--<dependency>
<groupId>jboss</groupId>
<artifactId>jboss-remoting</artifactId>
- </dependency>
+ </dependency>-->
</dependencies>
-
+
<build>
- <plugins>
+ <plugins>
</plugins>
</build>
</project>
Modified: modules/presentation/trunk/portal/pom.xml
===================================================================
--- modules/presentation/trunk/portal/pom.xml 2009-01-26 16:42:58 UTC (rev 12642)
+++ modules/presentation/trunk/portal/pom.xml 2009-01-26 16:43:23 UTC (rev 12643)
@@ -6,7 +6,7 @@
<version>1.0.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
-
+
<modelVersion>4.0.0</modelVersion>
<artifactId>presentation-portal</artifactId>
<packaging>jar</packaging>
@@ -55,8 +55,8 @@
</dependency>
<dependency>
- <groupId>org.jboss.portal.common</groupId>
- <artifactId>common-common</artifactId>
+ <groupId>org.jboss.portal.common</groupId>
+ <artifactId>common-common</artifactId>
</dependency>
<dependency>
@@ -106,7 +106,7 @@
</dependency>
<dependency>
- <groupId>jboss</groupId>
+ <groupId>org.jboss</groupId>
<artifactId>jboss-common-core</artifactId>
</dependency>
@@ -168,16 +168,16 @@
</descriptors>
</configuration>
<executions>
- <execution>
- <id>make-assembly</id>
- <phase>package</phase>
- <goals>
- <goal>attached</goal>
- </goals>
- </execution>
+ <execution>
+ <id>make-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ </execution>
</executions>
</plugin>
</plugins>
</build>
-
+
</project>
15 years, 8 months
JBoss Portal SVN: r12642 - modules/identity/trunk/build.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-26 11:42:58 -0500 (Mon, 26 Jan 2009)
New Revision: 12642
Modified:
modules/identity/trunk/build/pom.xml
Log:
upgrading common and test to latest version
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2009-01-26 16:39:48 UTC (rev 12641)
+++ modules/identity/trunk/build/pom.xml 2009-01-26 16:42:58 UTC (rev 12642)
@@ -28,8 +28,8 @@
<version.junit>3.8.1</version.junit>
<version.cargo>0.9-portal</version.cargo>
<version.ant>1.6.5</version.ant>
- <version.jboss.portal.common>1.2.0</version.jboss.portal.common>
- <version.jboss.portal.test>1.2.1</version.jboss.portal.test>
+ <version.jboss.portal.common>1.2.3</version.jboss.portal.common>
+ <version.jboss.portal.test>1.2.2</version.jboss.portal.test>
<version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer>
<version.sun.opends>1.0.0-BUILD04</version.sun.opends>
<version.jboss.jbossas.core-libs>4.0.4.GA</version.jboss.jbossas.core-libs>
15 years, 8 months
JBoss Portal SVN: r12641 - in modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation: model and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-26 11:39:48 -0500 (Mon, 26 Jan 2009)
New Revision: 12641
Modified:
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/ProtocolAction.java
Log:
- Some javadoc updates.
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java 2009-01-26 16:28:32 UTC (rev 12640)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/client/PresentationClient.java 2009-01-26 16:39:48 UTC (rev 12641)
@@ -22,16 +22,17 @@
******************************************************************************/
package org.jboss.portal.presentation.client;
+import org.jboss.portal.common.servlet.URLFormat;
import org.jboss.portal.presentation.protocol.ProtocolAction;
import org.jboss.portal.presentation.state.navigational.NavigationalStateContext;
import org.jboss.portal.web.ServletContextDispatcher;
-import org.jboss.portal.common.servlet.URLFormat;
import java.io.IOException;
import java.io.Writer;
/**
- * The contract that defines the services that the client provides to the server during a presentation server invocation.
+ * The contract that defines the services that the client provides to the server during a presentation server
+ * invocation.
*
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -40,7 +41,7 @@
{
/**
- * Renders the provided action as an hyperlink.
+ * Renders the provided action as a hyperlink.
*
* @param action the action to render
* @param format the url format
@@ -50,13 +51,13 @@
String renderURL(ProtocolAction action, URLFormat format) throws IllegalArgumentException;
/**
- * Renders the provided action as an hyperlink.
+ * Renders the provided action as a hyperlink.
*
* @param writer the writer
* @param action the action to render
* @param format the url format
* @throws IllegalArgumentException if the action is null or cannot be rendered
- * @throws IOException any IOException thrown by the writer
+ * @throws IOException any IOException thrown by the writer
*/
void renderURL(Writer writer, ProtocolAction action, URLFormat format) throws IOException;
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java 2009-01-26 16:28:32 UTC (rev 12640)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UINode.java 2009-01-26 16:39:48 UTC (rev 12641)
@@ -27,7 +27,7 @@
import java.util.Collection;
/**
- * The node interface provides a pull style api for interacting with an ui object.
+ * The node interface provides a pull style API for interacting with a UI object.
*
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -36,15 +36,15 @@
{
/**
- * Returns the related ui object.
+ * Returns the related UI object.
*
- * @return the ui object
+ * @return the UI object
*/
UIObject getObject();
/**
- * Returns the parent node or null if it cannot be loaded (because it is the root or
- * because the viewport scope does not go beyond)
+ * Returns the parent node or null if it cannot be loaded (because it is the root or because the viewport scope does
+ * not go beyond)
*
* @return the parent node
*/
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java 2009-01-26 16:28:32 UTC (rev 12640)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/UIObjectContext.java 2009-01-26 16:39:48 UTC (rev 12641)
@@ -28,7 +28,7 @@
import java.util.Map;
/**
- * The context of a a ui object with respect to the viewport.
+ * The context of a UI object with respect to the viewport.
*
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java 2009-01-26 16:28:32 UTC (rev 12640)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/model/ViewPortScope.java 2009-01-26 16:39:48 UTC (rev 12641)
@@ -25,9 +25,9 @@
import org.jboss.portal.presentation.state.structural.StructuralObject;
/**
- * Defines the scope of a viewport. This interface is separated from the viewport context in order to
- * really affirm the split between the concern between the scope implementation that is used by the viewport
- * to populate the viewport context during a refresh operation.
+ * Defines the scope of a viewport. This interface is separated from the viewport context in order to really affirm the
+ * split between the concern between the scope implementation that is used by the viewport to populate the viewport
+ * context during a refresh operation.
*
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
* @version $Revision: 630 $
@@ -42,16 +42,16 @@
String getRootId();
/**
- * Returns how the object should be traversed.
+ * Decides how the specified object should be traversed.
*
* @param object the object
- * @return true if it should be visited
+ * @return an {@link org.jboss.portal.presentation.model.ObjectTraversalType} representing how the specified object
+ * should be traversed
*/
ObjectTraversalType enterObject(StructuralObject object);
/**
- * Callback to signal that an object visit is terminated. It can be used by the scope to maintain a data
- * structure of the traversed model.
+ * Signals that the traversal of the specified object is done. Used to maintain proper traversal state.
*
* @param object the object
*/
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/ProtocolAction.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/ProtocolAction.java 2009-01-26 16:28:32 UTC (rev 12640)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/protocol/ProtocolAction.java 2009-01-26 16:39:48 UTC (rev 12641)
@@ -29,5 +29,5 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
*/
public abstract class ProtocolAction
-{
+{
}
15 years, 8 months