JBoss Portal SVN: r12640 - in modules/identity/trunk: sso/src/main/java/org/jboss/portal/identity/sso/cas and 1 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-01-26 11:28:32 -0500 (Mon, 26 Jan 2009)
New Revision: 12640
Modified:
modules/identity/trunk/build/pom.xml
modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
Log:
* fix the logic bug pointed to by the security team
* changing common dependency from snaphost to 1.2.0. module fails to compile without it
Modified: modules/identity/trunk/build/pom.xml
===================================================================
--- modules/identity/trunk/build/pom.xml 2009-01-26 15:56:19 UTC (rev 12639)
+++ modules/identity/trunk/build/pom.xml 2009-01-26 16:28:32 UTC (rev 12640)
@@ -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-SNAPSHOT</version.jboss.portal.common>
- <version.jboss.portal.test>1.2.0.Beta2</version.jboss.portal.test>
+ <version.jboss.portal.common>1.2.0</version.jboss.portal.common>
+ <version.jboss.portal.test>1.2.1</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>
Modified: modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java
===================================================================
--- modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 15:56:19 UTC (rev 12639)
+++ modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/cas/CASAuthenticationService.java 2009-01-26 16:28:32 UTC (rev 12640)
@@ -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/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java
===================================================================
--- modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 15:56:19 UTC (rev 12639)
+++ modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/sso/josso/JOSSOIdentityServiceImpl.java 2009-01-26 16:28:32 UTC (rev 12640)
@@ -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: r12639 - in branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium: cms and 1 other directories.
by portal-commits＠lists.jboss.org
Author: vrockai
Date: 2009-01-26 10:56:19 -0500 (Mon, 26 Jan 2009)
New Revision: 12639
Modified:
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
Log:
epp selenium fix
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/DashboardTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -34,6 +34,7 @@
private static final String SUB_LAYOUTSEL = "//form[contains(@id,'dashboardLayoutForm')]/input[@type='submit']";
private static final String SEL_THEME = "//select[contains(@id,'dashboardThemeForm:themeSelector')]";
private static final String SUB_THEMESEL = "//form[contains(@id,'dashboardThemeForm')]/input[@type='submit']";
+ private static final String SUB_UPDATE_LAYOUT = "//form[contains(@id,'dashboardLayoutForm')]/input[@type='submit']";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
@@ -75,7 +76,7 @@
Assert.assertTrue(selenium.isElementPresent("link="+pageName));
selenium.click("link="+pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
+ Assert.assertTrue(selenium.isTextPresent("Powered by JBoss"), "default footer message missing");
}
@Test(enabled = true, dependsOnMethods = { "testCreatePage" })
@@ -100,7 +101,7 @@
Assert.assertTrue(selenium.isElementPresent("link="+pageName));
selenium.click("link="+pageName);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Powered by JBoss Portal"));
+ Assert.assertTrue(selenium.isTextPresent("Powered by JBoss"),"default footer text is missing");
// then rename it
selenium.click(LNK_CONFIGURE_DASHBOARD);
@@ -153,7 +154,7 @@
selenium.select(SEL_LAYOUT, "label=generic");
- selenium.click("//input[@name='jbpnsabcsnpbj:_viewRoot:dashboardLayoutForm:j_id12']");
+ selenium.click(SUB_UPDATE_LAYOUT);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LNK_DASHBOARD);
@@ -310,7 +311,7 @@
// http://www.jboss.com/index.html?module=bb&op=viewtopic&t=143023
// https://jira.jboss.org/jira/browse/JBPORTAL-2177
- @Test(enabled = true)
+ @Test(enabled = false)
public void testBugResetPortletSetting() {
final String pageName = "page1";
final String pageNameNew = "page1a";
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/IdentityAdminTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -33,7 +33,7 @@
public static final String LINK_T_USRLIST_DIS = "//a[contains(@id,''search-user-form1:userlist:{0}:enable-user-link'')]";
public static final String LINK_T_USRLIST_EDIT = "//a[contains(@id,''search-user-form1:userlist:{0}:rename-link'')]";
- public static final String TABLE_ROLELIST = "//table[contains(@id,':_viewRoot:roles-form:userlist')]";
+ public static final String TABLE_ROLELIST = "//table[contains(@id,':roles-form:userlist')]";
public static final String LINK_T_ROLLIST_DEL = "//a[contains(@id,''roles-form:userlist:{0}:delete-role-link'')]";
public static final String LINK_T_ROLLIST_MEMBERS = "//a[contains(@id,''roles-form:userlist:{0}:view-role-link'')]";
@@ -43,11 +43,12 @@
public static final String ID_SUBMIT_CONF_CREATE_USER = "//input[contains(@id,'confirm-form:admin')]";
public static final String ID_SUBMIT_DELETE_ROLE = "//input[contains(@id,'delete-role-form:confirm')]";
- public static final String ID_SUBMIT_ROLE_CREATE = "//input[contains(@id,':_viewRoot:create-role-form:submit')]";
- public static final String ID_INPUT_ROLEDISNAME = "//input[contains(@id,':_viewRoot:create-role-form:roledisplayname')]";
- public static final String ID_INPUT_ROLENAME = "//input[contains(@id,':_viewRoot:create-role-form:rolename')]";
+ public static final String ID_SUBMIT_ROLE_CREATE = "//input[contains(@id,':create-role-form:submit')]";
+ public static final String ID_INPUT_ROLEDISNAME = "//input[contains(@id,':create-role-form:roledisplayname')]";
+ public static final String ID_INPUT_ROLENAME = "//input[contains(@id,':create-role-form:rolename')]";
- public static final String ID_BUT_ROLE_CREATE = "//a[contains(@id, ':_viewRoot:create-role-form:create-role-link')]";
+ public static final String ID_BUT_ROLE_CREATE = "//a[contains(@id, 'create-role-form:create-role-link')]";
+
public static final String ID_BUT_SUBMIT_DEL_USER = "//input[contains(@id,'delete-user-form:submit')]";
public static final String ID_SUBMIT_ASSIGN_ROLE = "//input[contains(@id,'assign-roles-form:submit')]";
public static final String ID_SUBMIT_USER_ROLE = "//input[contains(@id,'register-role-form:submit')]";
@@ -62,9 +63,9 @@
public static final String ID_LINK_USERTAB = "//a[contains(@id,'role-temp-form:manage-users')]";
public static final String ID_LINK_USERMAIN = "//a[contains(@id,'user-temp-form1:user-adm-link')]";
- public static final String ID_LINK_ROLETAB = "//a[contains(@id,'_viewRoot:user-temp-form:role-mgm-link')]";
+ public static final String ID_LINK_ROLETAB = "//a[contains(@id,':user-temp-form:role-mgm-link')]";
- public static final String ID_LINK_ROLEMAIN = "//a[contains(@id, ':_viewRoot:role-temp-form1:role-admin-link')]";
+ public static final String ID_LINK_ROLEMAIN = "//a[contains(@id, ':role-temp-form1:role-admin-link')]";
public static final String LINK_USERMANG_MAIN = "//a[contains(@id,'user-temp-form1:assign-role-link')]";
public static final String LINK_USERMANG_MAIN2 = "//a[contains(@id,'user-temp-form1:user-mgm-link')]";
public static final String ID_LINK_CREATE_USER = "//a[contains(@id,':user-form:create-user-link')]";
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/WSRPTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -49,9 +49,6 @@
private static final String LINK_T_CONS_DER="//a[contains(@id,''consumer-list-form:consumersList:{0}:register'')]";
private static final String LINK_T_CONS_DEL="//a[contains(@id,''consumer-list-form:consumersList:{0}:delete'')]";
-
-
-
public static String WSRP_CONSUMER_TABLE = "//table[contains(@id,':consumer-list-form:consumersList')]";
@BeforeMethod(groups = { "log" })
public void loginBeforeTest() {
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSArchiveUploadTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -38,7 +38,7 @@
logoutIfPossible();
login("admin", "admin");
// timeout hack
- //selenium.setSpeed("10000");
+ selenium.setSpeed("10000");
}
@AfterMethod(groups = { "log" })
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSFileTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -38,10 +38,10 @@
Assert.assertTrue(selenium.isElementPresent("link=default"));
selenium.click("link=default");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=images"));
- Assert.assertTrue(selenium.isElementPresent("link=private"));
- Assert.assertTrue(selenium.isElementPresent("link=index.html"));
- Assert.assertTrue(selenium.isElementPresent("link=project.html"));
+ Assert.assertTrue(selenium.isElementPresent("link=images"), "images folder is missing");
+ Assert.assertTrue(selenium.isElementPresent("link=private"), "private folder is missing");
+ Assert.assertTrue(selenium.isElementPresent("link=index.html"), "index.html is missing");
+ //Assert.assertTrue(selenium.isElementPresent("link=project.html"));
//Assert.assertTrue(selenium.isElementPresent("link=support.html"));
selenium.click("link=index.html");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -54,7 +54,7 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click("link=images");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isElementPresent("link=jbosslogo.png"));
+ Assert.assertTrue(selenium.isElementPresent("link=epp4.3.gif"));
}
@Test(enabled = true, description = "File properties checking.")
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/cms/CMSSecureTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -17,7 +17,7 @@
public class CMSSecureTestCase extends JBossPortalSeleniumTestCase {
private static final String LNK_EXPLORE = "//area[@href='/portal/content/default/epp.html']";
- private static final String LNK_CMS_EXPLORE = "Link=epp.html";
+ private static final String LNK_CMS_EXPLORE = "Link=private1.html";
private static final String LNK_SUPPORT_HTML = "//area[@href='/portal/content/default/project.html']";
private static final String LNK_CMS_SUPPORT_HTML = "Link=project.html";
private static final String LNK_MEMBERS = "link=Members";
@@ -294,16 +294,19 @@
@Test(enabled = true, dependsOnMethods = { "testSetRoleReadPer1" }, description = "Subpage permission test")
public void testSubpageSecurity() {
+
selenium.open("/portal/portal/default");
-
selenium.waitForPageToLoad(PAGE_LOAD);
+ login("admin","admin");
Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
- selenium.click(LNK_EXPLORE);
+ Assert.assertTrue(selenium.isElementPresent("//img[@alt='Enterprise Portal Platform 4.3']"));
+ //selenium.click(LNK_EXPLORE);
+
+ selenium.open("/portal/content/default/private/private1.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
-
+ Assert.assertTrue(selenium.isTextPresent("This is private 1 document"),"private page text missing");
+ Assert.assertFalse(selenium.isElementPresent("//img[@alt='Enterprise Portal Platform 4.3']"));
+ logout();
login("admin", "admin");
selenium.click(LNK_ADMIN);
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -311,6 +314,8 @@
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LNK_DEFAULT);
selenium.waitForPageToLoad(PAGE_LOAD);
+ selenium.click("link=private");
+ selenium.waitForPageToLoad(PAGE_LOAD);
selenium.click(LNK_CMS_EXPLORE);
selenium.waitForPageToLoad(PAGE_LOAD);
selenium.select(SEL_CMS_ACTION, "label=Secure");
@@ -326,13 +331,13 @@
logout();
Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertTrue(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
+ Assert.assertTrue(selenium.isElementPresent("//img[@alt='Enterprise Portal Platform 4.3']"));
selenium.open("/portal/portal/default");
selenium.waitForPageToLoad(PAGE_LOAD);
- selenium.click(LNK_EXPLORE);
+ selenium.open("/portal/content/default/private/private1.html");
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertFalse(selenium.isTextPresent("Enteprise Portal Platform"));
- Assert.assertFalse(selenium.isElementPresent("//img[@alt='JBoss Portal 2.7: Go Faster!']"));
+ Assert.assertFalse(selenium.isTextPresent("This is private 1 document"));
+ Assert.assertFalse(selenium.isElementPresent("//img[@alt='Enterprise Portal Platform 4.3']"));
}
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/AdminPortalTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -277,7 +277,6 @@
// TODO Auto-generated catch block
e.printStackTrace();
}
-
selenium.click("link=Who's online portlet");
selenium.waitForPageToLoad(PAGE_LOAD);
@@ -286,7 +285,7 @@
selenium.click(SUB_LAYOUT_ADD_CENTER);
selenium.waitForPageToLoad(PAGE_LOAD);
- Assert.assertTrue(selenium.isTextPresent(windowName));
+ Assert.assertTrue(selenium.isTextPresent(windowName), "created window name not found on the screen");
selenium.open("/portal/auth/portal/mimikry");
Assert.assertTrue(selenium.isTextPresent("Current users"));
Modified: branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-26 15:54:14 UTC (rev 12638)
+++ branches/Enterprise_Portal_Platform_4_3/testsuite/ui-tests/src/org/jboss/portal/test/selenium/portal/PortletInstancesTestCase.java 2009-01-26 15:56:19 UTC (rev 12639)
@@ -201,8 +201,8 @@
@Test(enabled = true)
public void testDeleteInstance() {
// cancel first
- String instance_name = "WeatherPortletInstance";
- //selenium.setSpeed("5000");
+ String instance_name = "RSS portlet Yahoo finance RHT";
+
int r = traversePortlets(instance_name,1);
Assert.assertTrue(selenium.isElementPresent(MessageFormat.format(LNK_INSTANCE_BUTTON, r)), instance_name+" portlet not found.");
15 years, 8 months
JBoss Portal SVN: r12638 - modules/common/trunk.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-26 10:54:14 -0500 (Mon, 26 Jan 2009)
New Revision: 12638
Modified:
modules/common/trunk/releaseLibs.sh
Log:
Added option to deploy to maven repository.
Modified: modules/common/trunk/releaseLibs.sh
===================================================================
--- modules/common/trunk/releaseLibs.sh 2009-01-26 15:46:06 UTC (rev 12637)
+++ modules/common/trunk/releaseLibs.sh 2009-01-26 15:54:14 UTC (rev 12638)
@@ -13,12 +13,16 @@
if [[ $1 == "repos" ]]; then
loc=$repos
echo "Releasing to repository. Don't forget to update component-info.xml with revision number."
+elif [[ $1 == "maven" ]]; then
+ echo "Releasing to Maven repository. You will need to have your credentials in settings.xml."
+ mvn deploy -Djboss.repository.root=https://snapshots.jboss.org/maven2/
+ exit 0
elif [[ $1 == "usage" ]]; then
- echo "Usage shown, nothing was done"
+ echo "Usage shown, nothing was done."
exit 0
else
loc=$thirdparty
- echo "Releasing to Portal thirdparty"
+ echo "Releasing to Portal thirdparty."
fi
15 years, 8 months
JBoss Portal SVN: r12637 - in modules: test/trunk and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-26 10:46:06 -0500 (Mon, 26 Jan 2009)
New Revision: 12637
Added:
modules/web/trunk/releaseLibs.sh
Modified:
modules/portlet/trunk/releaseLibs.sh
modules/test/trunk/releaseLibs.sh
Log:
Added option to deploy to maven repository.
Modified: modules/portlet/trunk/releaseLibs.sh
===================================================================
--- modules/portlet/trunk/releaseLibs.sh 2009-01-26 14:54:10 UTC (rev 12636)
+++ modules/portlet/trunk/releaseLibs.sh 2009-01-26 15:46:06 UTC (rev 12637)
@@ -13,6 +13,10 @@
if [[ $1 == "repos" ]]; then
loc=$repos
echo "Releasing to repository. Don't forget to update component-info.xml with revision number."
+elif [[ $1 == "maven" ]]; then
+ echo "Releasing to Maven repository. You will need to have your credentials in settings.xml."
+ mvn deploy -Djboss.repository.root=https://snapshots.jboss.org/maven2/
+ exit 0
elif [[ $1 == "usage" ]]; then
echo "Usage shown, nothing was done"
exit 0
Modified: modules/test/trunk/releaseLibs.sh
===================================================================
--- modules/test/trunk/releaseLibs.sh 2009-01-26 14:54:10 UTC (rev 12636)
+++ modules/test/trunk/releaseLibs.sh 2009-01-26 15:46:06 UTC (rev 12637)
@@ -13,6 +13,10 @@
if [[ $1 == "repos" ]]; then
loc=$repos
echo "Releasing to repository. Don't forget to update component-info.xml with revision number."
+elif [[ $1 == "maven" ]]; then
+ echo "Releasing to Maven repository. You will need to have your credentials in settings.xml."
+ mvn deploy -Djboss.repository.root=https://snapshots.jboss.org/maven2/
+ exit 0
elif [[ $1 == "usage" ]]; then
echo "Usage shown, nothing was done"
exit 0
Added: modules/web/trunk/releaseLibs.sh
===================================================================
--- modules/web/trunk/releaseLibs.sh (rev 0)
+++ modules/web/trunk/releaseLibs.sh 2009-01-26 15:46:06 UTC (rev 12637)
@@ -0,0 +1,29 @@
+repos=$HOME/Dev/portal-modules-repos/common/trunk-SNAPSHOT/lib
+thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/common/lib/
+
+echo "Copies current version of web libraries either to local repository copy or Portal thirdparty to test or release purpose"
+echo "Usage: '$0' to release to Portal thirdparty, '$0 repos' to release to repository local copy"
+echo "Set 'repos' variable to the snapshot lib directory for the common module of your local repository copy"
+echo "Set 'thirdparty' variable to the lib directory for the common module of your local JBoss Portal 2.7 thirparty directory"
+echo ""
+echo "repos currently set at: $repos"
+echo "thirdparty currently set at: $thirdparty"
+echo ""
+
+if [[ $1 == "repos" ]]; then
+ loc=$repos
+ echo "Releasing to repository. Don't forget to update component-info.xml with revision number."
+elif [[ $1 == "maven" ]]; then
+ echo "Releasing to Maven repository. You will need to have your credentials in settings.xml."
+ mvn deploy -Djboss.repository.root=https://snapshots.jboss.org/maven2/
+ exit 0
+elif [[ $1 == "usage" ]]; then
+ echo "Usage shown, nothing was done"
+ exit 0
+else
+ loc=$thirdparty
+ echo "Releasing to Portal thirdparty"
+fi
+
+
+cp web/target/web-web-1.2.0-SNAPSHOT.jar $loc/portal-web-lib.jar
\ No newline at end of file
Property changes on: modules/web/trunk/releaseLibs.sh
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:eol-style
+ native
15 years, 8 months
JBoss Portal SVN: r12636 - modules/identity/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-26 09:54:10 -0500 (Mon, 26 Jan 2009)
New Revision: 12636
Added:
modules/identity/tags/JBP_IDENTITY_1_0_7/
Log:
Tagging identity 1.0.7
Copied: modules/identity/tags/JBP_IDENTITY_1_0_7 (from rev 12635, modules/identity/branches/JBP_IDENTITY_BRANCH_1_0)
15 years, 8 months
JBoss Portal SVN: r12635 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-26 09:50:01 -0500 (Mon, 26 Jan 2009)
New Revision: 12635
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/build.xml
Log:
oups
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/build.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/build.xml 2009-01-26 14:45:27 UTC (rev 12634)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/build.xml 2009-01-26 14:50:01 UTC (rev 12635)
@@ -389,7 +389,7 @@
<path refid="jboss.portal/modules/test.classpath"/>
<path refid="jboss.portal/modules/common.classpath"/>
<!--<path refid="jboss.portal-jems.classpath"/>-->
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
</x-classpath>
</execute-tests>
@@ -455,7 +455,7 @@
<path refid="jboss.portal/modules/common.classpath"/>
<!--<path refid="jboss.portal-jems.classpath"/>-->
<path refid="sleepycat.sleepycat.classpath"/>
- <path refid="sun.jaf.classpath"/>
+ <path refid="glassfish.jaf.classpath"/>
</x-classpath>
</execute-tests>
<antcall target="undeploy-ldap"/>
15 years, 8 months
JBoss Portal SVN: r12634 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-01-26 09:45:27 -0500 (Mon, 26 Jan 2009)
New Revision: 12634
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml
Log:
minor
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml 2009-01-26 14:13:22 UTC (rev 12633)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build-thirdparty.xml 2009-01-26 14:45:27 UTC (rev 12634)
@@ -47,30 +47,29 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="1.1.0"/>
- <componentref name="jboss-portal/modules/test" version="1.0.1"/>
- <componentref name="apache-log4j" version="1.2.8"/>
- <componentref name="apache-logging" version="1.0.5.SP1-jboss"/>
- <componentref name="apache-xerces" version="2.7.1"/>
- <componentref name="apache-httpclient" version="3.0.1"/>
- <componentref name="junit" version="3.8.1"/>
- <componentref name="jboss/microcontainer" version="1.0.2"/>
- <componentref name="jboss/backport-concurrent" version="2.1.0.GA"/>
+ <componentref name="jboss-portal/modules/common" version="1.2.3"/>
+ <componentref name="jboss-portal/modules/test" version="1.0.4"/>
+ <componentref name="apache-log4j" version="1.2.14-brew"/>
+ <componentref name="apache-logging" version="1.1.0.jboss"/>
+ <componentref name="apache-xerces" version="2.7.1-brew"/>
+ <componentref name="apache-httpclient" version="3.0.1-brew"/>
+ <componentref name="junit" version="3.8.2-brew"/>
+ <componentref name="jboss/microcontainer" version="1.0.2-brew"/>
<componentref name="jboss/jbossxb" version="1.0.0.CR4"/>
<componentref name="jboss/test" version="1.0.0.CR1"/>
<componentref name="jbossas/core-libs" version="4.0.4.GA"/>
<componentref name="sleepycat" version="3.0.12"/>
- <componentref name="hibernate" version="3.2.0.CR2"/>
+ <componentref name="hibernate" version="3.2.4.SP1_CP04-brew"/>
<componentref name="sun-opends" version="snapshot"/>
- <componentref name="sun-servlet" version="2.4"/>
- <componentref name="sun-jaf" version="1.0.2"/>
+ <componentref name="sun-servlet" version="2.5-brew"/>
+ <componentref name="glassfish/jaf" version="1.1.0-brew"/>
- <componentref name="apache-collections" version="3.1"/>
+ <componentref name="apache-collections" version="3.1-brew"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="asm" version="1.5.3"/>
- <componentref name="cglib" version="2.1.3"/>
- <componentref name="hsqldb" version="1.8.0.2"/>
+ <componentref name="cglib" version="2.1.3dep-brew"/>
+ <componentref name="hsqldb" version="1.8.0.8.patch01-brew"/>
<componentref name="cas" version="3.0.7"/>
<componentref name="josso" version="1.5_jdk14"/>
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml 2009-01-26 14:13:22 UTC (rev 12633)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/build/build.xml 2009-01-26 14:45:27 UTC (rev 12634)
@@ -61,7 +61,7 @@
<property name="version.major" value="1"/>
<property name="version.minor" value="0"/>
- <property name="version.revision" value="3"/>
+ <property name="version.revision" value="x"/>
<property name="version.tag" value="SNAPSHOT"/>
<property name="version.name" value=""/>
15 years, 8 months
JBoss Portal SVN: r12633 - modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2009-01-26 09:13:22 -0500 (Mon, 26 Jan 2009)
New Revision: 12633
Modified:
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPExtLoginModule.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPLoginModule.java
modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java
Log:
JBPORTAL-2261 - fix how defaultAssignedRole was handled
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPExtLoginModule.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPExtLoginModule.java 2009-01-26 13:28:11 UTC (rev 12632)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPExtLoginModule.java 2009-01-26 14:13:22 UTC (rev 12633)
@@ -178,25 +178,37 @@
protected Group[] getRoleSets() throws LoginException
{
Group[] rolesGroup = super.getRoleSets();
- if (additionalRole != null)
+ try
{
- try
+ for (int i = 0; i < rolesGroup.length; i++)
{
- for (int i = 0; i < rolesGroup.length; i++)
+ Group group = rolesGroup[i];
+ if (group.getName().equals("Roles"))
{
- Group group = rolesGroup[i];
- if (group.getName().equals("Roles"))
+ if (additionalRole != null)
{
- group.addMember(createIdentity(additionalRole));
+ Principal role = createIdentity(additionalRole);
+ if (!group.isMember(role))
+ {
+ group.addMember(role);
+ }
}
+ if (defaultAssignedRole != null)
+ {
+ Principal role = createIdentity(defaultAssignedRole);
+ if (!group.isMember(role))
+ {
+ group.addMember(role);
+ }
+ }
}
}
- catch (Exception e)
- {
- //just a try
- log.error("Error when adding additional role: ", e);
- }
}
+ catch (Exception e)
+ {
+ //just a try
+ log.error("Error when adding additional role: ", e);
+ }
return rolesGroup;
}
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPLoginModule.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPLoginModule.java 2009-01-26 13:28:11 UTC (rev 12632)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLDAPLoginModule.java 2009-01-26 14:13:22 UTC (rev 12633)
@@ -176,25 +176,40 @@
protected Group[] getRoleSets() throws LoginException
{
Group[] rolesGroup = super.getRoleSets();
- if (additionalRole != null)
+
+ try
{
- try
+ for (int i = 0; i < rolesGroup.length; i++)
{
- for (int i = 0; i < rolesGroup.length; i++)
+ Group group = rolesGroup[i];
+ if (group.getName().equals("Roles"))
{
- Group group = rolesGroup[i];
- if (group.getName().equals("Roles"))
+ if (additionalRole != null)
{
- group.addMember(createIdentity(additionalRole));
+ Principal role = createIdentity(additionalRole);
+ if (!group.isMember(role))
+ {
+ group.addMember(role);
+ }
}
+ if (defaultAssignedRole != null)
+ {
+ Principal role = createIdentity(defaultAssignedRole);
+ if (!group.isMember(role))
+ {
+ group.addMember(role);
+ }
+ }
}
}
- catch (Exception e)
- {
- //just a try
- log.error("Error when adding additional role: ", e);
- }
}
+ catch (Exception e)
+ {
+ //just a try
+ log.error("Error when adding additional role: ", e);
+ }
+
+
return rolesGroup;
}
Modified: modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java
===================================================================
--- modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java 2009-01-26 13:28:11 UTC (rev 12632)
+++ modules/identity/branches/JBP_IDENTITY_BRANCH_1_0/identity/src/main/org/jboss/portal/identity/auth/SynchronizingLoginModule.java 2009-01-26 14:13:22 UTC (rev 12633)
@@ -207,6 +207,18 @@
log.error("Error when adding additional role: ", e);
}
}
+ if (defaultAssignedRole != null)
+ {
+ try
+ {
+ userRoles.addMember(createIdentity(defaultAssignedRole));
+ }
+ catch (Exception e)
+ {
+ //just a try
+ log.error("Error when adding additional role: ", e);
+ }
+ }
Group[] roleSets = {userRoles};
return roleSets;
@@ -353,7 +365,6 @@
try
{
rolesToAssign.add(getRoleModule().findRoleByName(defaultAssignedRole));
- userRoles.addMember(createIdentity(defaultAssignedRole));
}
catch(Exception e)
{
15 years, 8 months
JBoss Portal SVN: r12632 - in branches/JBoss_Portal_Branch_2_7: core-identity/src/resources/portal-identity-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-26 08:28:11 -0500 (Mon, 26 Jan 2009)
New Revision: 12632
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-identity/src/resources/portal-identity-war/WEB-INF/web.xml
Log:
- Set facelets.DEVELOPMENT to false.
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 13:27:40 UTC (rev 12631)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-01-26 13:28:11 UTC (rev 12632)
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -29,26 +29,26 @@
version="2.4">
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
- </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>
+ <context-param>
+ <param-name>javax.portlet.faces.renderPolicy</param-name>
+ <param-value>ALWAYS_DELEGATE</param-value>
+ </context-param>
<!-- JSF -->
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>false</param-value>
+ </context-param>
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
@@ -61,36 +61,36 @@
</context-param>
<!--<listener>-->
- <!--<listener-class>com.sun.faces.config.ConfigureListener</listener-class>-->
+ <!--<listener-class>com.sun.faces.config.ConfigureListener</listener-class>-->
<!--</listener>-->
<error-page>
- <exception-type>javax.servlet.ServletException</exception-type>
- <location>/faces/jsf/error.xhtml</location>
- </error-page>
- <error-page>
- <exception-type>javax.faces.application.ViewExpiredException</exception-type>
- <location>/jsf/error.xhtml</location>
- </error-page>
+ <exception-type>javax.servlet.ServletException</exception-type>
+ <location>/faces/jsf/error.xhtml</location>
+ </error-page>
+ <error-page>
+ <exception-type>javax.faces.application.ViewExpiredException</exception-type>
+ <location>/jsf/error.xhtml</location>
+ </error-page>
<error-page>
- <exception-type>javax.faces.FacesException</exception-type>
- <location>/jsf/error.xhtml</location>
- </error-page>
+ <exception-type>javax.faces.FacesException</exception-type>
+ <location>/jsf/error.xhtml</location>
+ </error-page>
- <servlet>
- <servlet-name>FacesServlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>FacesServlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>FacesServlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>FacesServlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>10</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
</web-app>
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 13:27:40 UTC (rev 12631)
+++ branches/JBoss_Portal_Branch_2_7/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 13:28:11 UTC (rev 12632)
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -66,7 +66,7 @@
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
@@ -97,15 +97,15 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
-
+
<!-- Captcha Servlet and Mapping -->
<servlet>
- <servlet-name>jcaptcha</servlet-name>
- <servlet-class>org.jboss.portal.core.identity.services.captcha.ImageCaptchaServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>jcaptcha</servlet-name>
- <url-pattern>/jcaptcha</url-pattern>
- </servlet-mapping>
+ <servlet-name>jcaptcha</servlet-name>
+ <servlet-class>org.jboss.portal.core.identity.services.captcha.ImageCaptchaServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>jcaptcha</servlet-name>
+ <url-pattern>/jcaptcha</url-pattern>
+ </servlet-mapping>
</web-app>
15 years, 8 months
JBoss Portal SVN: r12631 - in branches/Enterprise_Portal_Platform_4_3: core-identity/src/resources/portal-identity-war/WEB-INF and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-01-26 08:27:40 -0500 (Mon, 26 Jan 2009)
New Revision: 12631
Modified:
branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml
branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
Log:
- Set facelets.DEVELOPMENT to false.
Modified: branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-01-26 13:24:14 UTC (rev 12630)
+++ branches/Enterprise_Portal_Platform_4_3/core-admin/src/resources/portal-admin-war/WEB-INF/web.xml 2009-01-26 13:27:40 UTC (rev 12631)
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -29,26 +29,26 @@
version="2.4">
<context-param>
- <param-name>org.ajax4jsf.VIEW_HANDLERS</param-name>
- <param-value>org.jboss.portletbridge.application.FaceletPortletViewHandler</param-value>
- </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>
+ <context-param>
+ <param-name>javax.portlet.faces.renderPolicy</param-name>
+ <param-value>ALWAYS_DELEGATE</param-value>
+ </context-param>
<!-- JSF -->
<context-param>
- <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
- <param-value>.xhtml</param-value>
- </context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.xhtml</param-value>
+ </context-param>
- <context-param>
- <param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
- </context-param>
+ <context-param>
+ <param-name>facelets.DEVELOPMENT</param-name>
+ <param-value>false</param-value>
+ </context-param>
<context-param>
<param-name>javax.faces.STATE_SAVING_METHOD</param-name>
@@ -61,36 +61,36 @@
</context-param>
<!--<listener>-->
- <!--<listener-class>com.sun.faces.config.ConfigureListener</listener-class>-->
+ <!--<listener-class>com.sun.faces.config.ConfigureListener</listener-class>-->
<!--</listener>-->
<error-page>
- <exception-type>javax.servlet.ServletException</exception-type>
- <location>/faces/jsf/error.xhtml</location>
- </error-page>
- <error-page>
- <exception-type>javax.faces.application.ViewExpiredException</exception-type>
- <location>/jsf/error.xhtml</location>
- </error-page>
+ <exception-type>javax.servlet.ServletException</exception-type>
+ <location>/faces/jsf/error.xhtml</location>
+ </error-page>
+ <error-page>
+ <exception-type>javax.faces.application.ViewExpiredException</exception-type>
+ <location>/jsf/error.xhtml</location>
+ </error-page>
<error-page>
- <exception-type>javax.faces.FacesException</exception-type>
- <location>/jsf/error.xhtml</location>
- </error-page>
+ <exception-type>javax.faces.FacesException</exception-type>
+ <location>/jsf/error.xhtml</location>
+ </error-page>
- <servlet>
- <servlet-name>FacesServlet</servlet-name>
- <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>FacesServlet</servlet-name>
+ <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>FacesServlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>FacesServlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>10</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>10</session-timeout>
+ </session-config>
</web-app>
Modified: branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml
===================================================================
--- branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 13:24:14 UTC (rev 12630)
+++ branches/Enterprise_Portal_Platform_4_3/core-identity/src/resources/portal-identity-war/WEB-INF/web.xml 2009-01-26 13:27:40 UTC (rev 12631)
@@ -1,24 +1,24 @@
<?xml version="1.0"?>
<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ Copyright 2009, Red Hat Middleware, LLC, and individual
+ ~ contributors as indicated by the @authors tag. See the
+ ~ copyright.txt in the distribution for a full listing of
+ ~ individual contributors.
+ ~
+ ~ This is free software; you can redistribute it and/or modify it
+ ~ under the terms of the GNU Lesser General Public License as
+ ~ published by the Free Software Foundation; either version 2.1 of
+ ~ the License, or (at your option) any later version.
+ ~
+ ~ This software is distributed in the hope that it will be useful,
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ ~ Lesser General Public License for more details.
+ ~
+ ~ You should have received a copy of the GNU Lesser General Public
+ ~ License along with this software; if not, write to the Free
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
@@ -66,7 +66,7 @@
<!-- Facelet configuration -->
<context-param>
<param-name>facelets.DEVELOPMENT</param-name>
- <param-value>true</param-value>
+ <param-value>false</param-value>
</context-param>
<context-param>
<param-name>facelets.SKIP_COMMENTS</param-name>
@@ -97,15 +97,15 @@
<servlet-name>Faces Servlet</servlet-name>
<url-pattern>/faces/*</url-pattern>
</servlet-mapping>
-
+
<!-- Captcha Servlet and Mapping -->
<servlet>
- <servlet-name>jcaptcha</servlet-name>
- <servlet-class>org.jboss.portal.core.identity.services.captcha.ImageCaptchaServlet</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>jcaptcha</servlet-name>
- <url-pattern>/jcaptcha</url-pattern>
- </servlet-mapping>
+ <servlet-name>jcaptcha</servlet-name>
+ <servlet-class>org.jboss.portal.core.identity.services.captcha.ImageCaptchaServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>jcaptcha</servlet-name>
+ <url-pattern>/jcaptcha</url-pattern>
+ </servlet-mapping>
</web-app>
15 years, 8 months