JBoss Portal SVN: r8799 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF: jsp/weather and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:53:42 -0400 (Mon, 29 Oct 2007)
New Revision: 8799
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jsp/weather/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/xsl/weather/Rss.xsl
Log:
Reverted to version without optimized imports.
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/default-object.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jboss-portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jsp/weather/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jsp/weather/edit.jsp 2007-10-29 18:52:09 UTC (rev 8798)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jsp/weather/edit.jsp 2007-10-29 18:53:42 UTC (rev 8799)
@@ -30,8 +30,7 @@
<br/>
<font class="portlet-font">Change Weather Location:</font>
- <form method="post" action="
-<portlet:actionURL></portlet:actionURL>">
+ <form method="post" action=" <portlet:actionURL></portlet:actionURL>">
<font class="portlet-font">Zip Code:</font><br/>
<input class="portlet-form-input-field" type="text" value="" size="12" name="newzip">
<br/>
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/jsp/weather/edit.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet-instances.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-weather-samples-war/WEB-INF/xsl/weather/Rss.xsl
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
16 years, 6 months
JBoss Portal SVN: r8798 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF: jsp/news and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:52:09 -0400 (Mon, 29 Oct 2007)
New Revision: 8798
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jsp/news/edit.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/xsl/news/Rss1.xsl
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/xsl/news/Rss2.xsl
Log:
Reverted to version without optimized imports.
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/default-object.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jboss-portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jsp/news/edit.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jsp/news/edit.jsp 2007-10-29 18:51:35 UTC (rev 8797)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jsp/news/edit.jsp 2007-10-29 18:52:09 UTC (rev 8798)
@@ -30,8 +30,7 @@
<br/>
<font class="portlet-font">Change News Feed URL:</font>
- <form method="post" action="
-<portlet:actionURL></portlet:actionURL>">
+ <form method="post" action="<portlet:actionURL></portlet:actionURL>">
<input class="portlet-form-input-field" type="text"
value="<%= renderRequest.getPreferences().getValue("RssXml", "") %>" size="25" name="newurl">
<input class="portlet-form-button" type="submit" name="submit" value="submit">
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/jsp/news/edit.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet-instances.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/xsl/news/Rss1.xsl
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-news-samples-war/WEB-INF/xsl/news/Rss2.xsl
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
16 years, 6 months
JBoss Portal SVN: r8797 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF: classes and 1 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:51:35 -0400 (Mon, 29 Oct 2007)
New Revision: 8797
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portal-lib.tld
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
Log:
Reverted to version without optimized imports.
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource.properties
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jboss-portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp 2007-10-29 18:32:55 UTC (rev 8796)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp 2007-10-29 18:51:35 UTC (rev 8797)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/noUser.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2007-10-29 18:32:55 UTC (rev 8796)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp 2007-10-29 18:51:35 UTC (rev 8797)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/oneUser.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2007-10-29 18:32:55 UTC (rev 8796)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp 2007-10-29 18:51:35 UTC (rev 8797)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/jsp/users/users.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portal-lib.tld
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet-instances.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
16 years, 6 months
JBoss Portal SVN: r8796 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF: jsp/jsp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:32:55 -0400 (Mon, 29 Oct 2007)
New Revision: 8796
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
Log:
Reverted to version without optimized imports.
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet-instances.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
16 years, 6 months
JBoss Portal SVN: r8795 - in branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF: classes and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:31:24 -0400 (Mon, 29 Oct 2007)
New Revision: 8795
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource_fr.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource_it.properties
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-app.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/event/view.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/web.xml
Log:
Reverted to version without optimized imports.
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource.properties
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource_fr.properties
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/classes/NewsResource_it.properties
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/default-object.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-app.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jboss-portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/event/view.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/event/view.jsp 2007-10-29 18:27:42 UTC (rev 8794)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/event/view.jsp 2007-10-29 18:31:24 UTC (rev 8795)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/event/view.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/jsp/theme/wsrpSelectorTest.jsp
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet-instances.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
Property changes on: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-basic-samples-war/WEB-INF/web.xml
___________________________________________________________________
Name: svn:keywords
-
+ LastChangedDate LastChangedBy LastChangedRevision Id
16 years, 6 months
JBoss Portal SVN: r8794 - in branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms: editor and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:27:42 -0400 (Mon, 29 Oct 2007)
New Revision: 8794
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
Log:
Reverted to version without optimized imports.
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-10-29 18:24:53 UTC (rev 8793)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/exportarchive.jsp 2007-10-29 18:27:42 UTC (rev 8794)
@@ -1,3 +1,4 @@
+<%@ page import="java.util.Locale" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2007-10-29 18:24:53 UTC (rev 8793)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/folderlist.jsp 2007-10-29 18:27:42 UTC (rev 8794)
@@ -2,7 +2,6 @@
<%@ page import="org.jboss.portal.cms.util.NodeUtil" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.util.List" %>
-<%@ page import="java.util.Locale" %>
<%@ page import="java.util.StringTokenizer" %>
<%@ page isELIgnored="false" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-10-29 18:24:53 UTC (rev 8793)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/securenode.jsp 2007-10-29 18:27:42 UTC (rev 8794)
@@ -1,5 +1,7 @@
+<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page import="org.jboss.portal.identity.Role" %>
+<%@ page import="org.jboss.portal.identity.User" %>
<%@ page import="org.jboss.portal.cms.security.AuthorizationManager" %>
-<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
<%@ page import="java.util.Iterator" %>
<%@ page import="java.util.Set" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-10-29 18:24:53 UTC (rev 8793)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/upload.jsp 2007-10-29 18:27:42 UTC (rev 8794)
@@ -1,3 +1,4 @@
+<%@ page import="java.util.Locale" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-10-29 18:24:53 UTC (rev 8793)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/admin/uploadarchive.jsp 2007-10-29 18:27:42 UTC (rev 8794)
@@ -1,3 +1,4 @@
+<%@ page import="java.util.Locale" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2007-10-29 18:24:53 UTC (rev 8793)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/jsp/cms/editor/main.jsp 2007-10-29 18:27:42 UTC (rev 8794)
@@ -1,9 +1,12 @@
-<%@ page import="org.jboss.portal.cms.model.Content" %>
<%@ page import="org.jboss.portal.cms.model.File" %>
<%@ page import="org.jboss.portal.cms.model.Folder" %>
+<%@ page import="org.jboss.portal.cms.model.Content" %>
<%@ page import="org.jboss.portal.core.cms.ui.admin.CMSAdminConstants" %>
+<%@ page import="java.text.Format" %>
+<%@ page import="java.text.SimpleDateFormat" %>
<%@ page import="java.util.List" %>
<%@ page import="java.util.StringTokenizer" %>
+<%@ page import="javax.portlet.PortletURL" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
16 years, 6 months
JBoss Portal SVN: r8793 - in branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp: error and 2 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-29 14:24:53 -0400 (Mon, 29 Oct 2007)
New Revision: 8793
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp
Log:
Reverted to version without optimized imports.
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/index.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.api.node.PortalNode" %>
<%@ page import="org.jboss.portal.api.node.PortalNodeURL" %>
<%@ page import="java.util.HashMap" %>
<%@ page import="java.util.Iterator" %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/catalog/sitemap.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,7 +1,7 @@
+<%@ page import="org.jboss.portlet.JBossRenderResponse" %>
+<%@ page import="java.util.Iterator" %>
<%@ page import="org.jboss.portal.api.node.PortalNode" %>
<%@ page import="org.jboss.portal.api.node.PortalNodeURL" %>
-<%@ page import="org.jboss.portlet.JBossRenderResponse" %>
-<%@ page import="java.util.Iterator" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/page.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,3 +1,4 @@
+<%@ page import="java.lang.Throwable" %>
<%@ page import="org.jboss.portal.common.util.Exceptions" %>
<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/error/portal.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,3 +1,4 @@
+<%@ page import="java.lang.Throwable" %>
<%@ page import="org.jboss.portal.common.util.Exceptions" %>
<h2 class="portlet-msg-error"><%= request.getAttribute("org.jboss.portal.control.ERROR_TYPE") %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -3,7 +3,6 @@
<%
User user = (User)request.getAttribute("org.jboss.portal.header.USER");
-
PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
PortalURL defaultPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/tabs.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,8 +1,8 @@
-<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %>
+<%@ page import="java.util.Iterator" %>
<%@ page import="org.jboss.portal.api.node.PortalNode" %>
+<%@ page import="java.util.Locale" %>
<%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.Iterator" %>
-<%@ page import="java.util.Locale" %>
+<%@ page import="org.jboss.portal.api.PortalRuntimeContext" %>
<%
PortalNode root = (PortalNode)request.getAttribute("org.jboss.portal.api.PORTAL_NODE");
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/login.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/registerUser_admin.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2007-10-29 16:02:40 UTC (rev 8792)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/user/register_ty.jsp 2007-10-29 18:24:53 UTC (rev 8793)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.core.CoreConstants" %>
<%@ page language="java" extends="org.jboss.portal.core.servlet.jsp.PortalJsp" %>
<%@ taglib uri="/WEB-INF/portal-lib.tld" prefix="n" %>
<%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
16 years, 6 months
JBoss Portal SVN: r8792 - in branches/JBoss_Portal_Branch_2_6: core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-29 12:02:40 -0400 (Mon, 29 Oct 2007)
New Revision: 8792
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
Put back the removed imports
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-10-29 13:44:24 UTC (rev 8791)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2007-10-29 16:02:40 UTC (rev 8792)
@@ -1,7 +1,9 @@
<%@ page import="org.jboss.portal.api.PortalURL" %>
+<%@ page import="org.jboss.portal.identity.User" %>
<%
User user = (User)request.getAttribute("org.jboss.portal.header.USER");
+
PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
PortalURL defaultPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp 2007-10-29 13:44:24 UTC (rev 8791)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-jsp-samples-war/WEB-INF/jsp/jsp/view.jsp 2007-10-29 16:02:40 UTC (rev 8792)
@@ -1,3 +1,4 @@
+<%@ page import="org.jboss.portal.server.PortalConstants" %>
<%--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
~ JBoss, a division of Red Hat ~
~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
16 years, 6 months
JBoss Portal SVN: r8791 - in branches/JBoss_Portal_Branch_2_6: core-cms and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-29 09:44:24 -0400 (Mon, 29 Oct 2007)
New Revision: 8791
Modified:
branches/JBoss_Portal_Branch_2_6/cms/build.xml
branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
Log:
Put back jgroups lib which is only available in 'all'
Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-29 11:25:02 UTC (rev 8790)
+++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-29 13:44:24 UTC (rev 8791)
@@ -115,8 +115,8 @@
<!-- cms optimization integration -->
<path refid="jgroups.jgroups.classpath"/>
<path refid="sun.servlet.classpath"/>
- <!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <!-- jbpm integration -->
+ <path refid="jbpm.jaronly.classpath"/>
</path>
<path id="javac.classpath">
@@ -132,11 +132,11 @@
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-search.classpath"/>
<!-- fine grained security integration -->
- <path refid="jboss.portal-security.classpath"/>
+ <path refid="jboss.portal-security.classpath"/>
<!-- clustered testcases related -->
- <path refid="jboss.portal-api.classpath"/>
- <!-- workflow integration -->
- <path refid="jboss.portal-workflow.classpath"/>
+ <path refid="jboss.portal-api.classpath"/>
+ <!-- workflow integration -->
+ <path refid="jboss.portal-workflow.classpath"/>
</path>
@@ -202,9 +202,11 @@
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/>
<fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/>
-
+
<!-- cms optimization integration -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
+
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
</jar>
@@ -227,24 +229,26 @@
<fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/>
<fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
- <!-- cms optimization integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <!-- cms optimization integration -->
+ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
+
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
- <!-- add the jboss-service.xml and hibernate configuration -->
- <fileset dir="${build.resources}/test/cms/clustering/sar"/>
-
- <!-- add dependencies -->
- <!--
- <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/>
- <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/>
- <fileset dir="${jboss.portal-server.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/>
- <fileset dir="${jboss.portlet-api.lib}" includes="portal-api-lib.jar"/>
- <fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/>
- -->
- <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/>
+ <!-- add the jboss-service.xml and hibernate configuration -->
+ <fileset dir="${build.resources}/test/cms/clustering/sar"/>
+
+ <!-- add dependencies -->
+ <!--
+ <fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/>
+ <fileset dir="${jboss.portal-server.lib}" includes="portal-server-lib.jar"/>
+ <fileset dir="${jboss.portal-portlet.lib}" includes="portal-portlet-lib.jar"/>
+ <fileset dir="${jboss.portlet-api.lib}" includes="portal-api-lib.jar"/>
+ <fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/>
+ -->
+ <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/>
<fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/>
<fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/>
<fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/>
@@ -258,25 +262,23 @@
<target name="deploy-tests"
description="Deploy."
depends="output">
+
+ <!-- deploying the test datasources -->
+ <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml" todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/>
+ <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml" todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/>
- <!-- deploying the test datasources -->
- <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml"
- todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/>
- <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml"
- todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/>
-
<!-- install test sars needed for the testsuite framework -->
<!--
<copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
<copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
-->
-
- <!--
- <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
- <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
- -->
-
- <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/>
+
+ <!--
+ <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
+ <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
+ -->
+
+ <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/>
<copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-02/deploy"/>
</target>
@@ -284,16 +286,16 @@
description="UnDeploy."
depends="output">
<!-- install test sars needed for the testsuite framework -->
- <!--
- <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
- <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/>
- -->
- <!--
- <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/>
- <delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/>
- -->
-
- <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/>
+ <!--
+ <delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
+ <delete file="${jboss.home}/server/ports-02/deploy/test.sar"/>
+ -->
+ <!--
+ <delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/>
+ <delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/>
+ -->
+
+ <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/>
<delete file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/>
</target>
@@ -395,11 +397,11 @@
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
-->
- <!--
- prefer IPv4 when running test with jdk1.5 on linux.
- This supposedly is a java bug as per jgroups page.
- -->
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <!--
+ prefer IPv4 when running test with jdk1.5 on linux.
+ This supposedly is a java bug as per jgroups page.
+ -->
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
</x-sysproperty>
<x-test>
<!-- general cms setup related tests -->
@@ -425,15 +427,15 @@
<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/>
- <!-- cms fine grained security related tests -->
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/>
+ <!-- cms fine grained security related tests -->
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestWriteAccess"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/>
-
- <!-- cms workflow related tests -->
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/>
+
+ <!-- cms workflow related tests -->
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/>
</x-test>
<x-classpath>
@@ -477,11 +479,11 @@
<path refid="nekohtml.nekohtml.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jgroups.jgroups.classpath"/>
- <!-- fine grained security integration -->
- <path refid="jboss.portal/modules/identity.classpath"/>
+ <!-- fine grained security integration -->
+ <path refid="jboss.portal/modules/identity.classpath"/>
<path refid="jboss.portal-security.classpath"/>
- <!-- workflow integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <!-- workflow integration -->
+ <path refid="jbpm.jaronly.classpath"/>
<path refid="beanshell.beanshell.classpath"/>
<path refid="jboss.portal-workflow.classpath"/>
</x-classpath>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-10-29 11:25:02 UTC (rev 8790)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-10-29 13:44:24 UTC (rev 8791)
@@ -262,6 +262,7 @@
<!-- cms optimization integration - this contains a clustered cache enabled version -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
</copy>
16 years, 6 months
JBoss Portal SVN: r8790 - in branches/JBoss_Portal_Branch_2_6: core-cms and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-29 07:25:02 -0400 (Mon, 29 Oct 2007)
New Revision: 8790
Modified:
branches/JBoss_Portal_Branch_2_6/cms/build.xml
branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
Log:
Remove jboss-cache and jgroups from the binaries (Since they are part of JBoss AS)
Modified: branches/JBoss_Portal_Branch_2_6/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-29 10:12:00 UTC (rev 8789)
+++ branches/JBoss_Portal_Branch_2_6/cms/build.xml 2007-10-29 11:25:02 UTC (rev 8790)
@@ -205,9 +205,6 @@
<!-- cms optimization integration -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
- <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
- <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
-
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
</jar>
@@ -231,10 +228,7 @@
<fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
<!-- cms optimization integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
- <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
- <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
-
+ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
<!-- add the jboss-service.xml and hibernate configuration -->
@@ -264,16 +258,6 @@
<target name="deploy-tests"
description="Deploy."
depends="output">
- <!--
- upgrage the jbosscache/groups of the HA instances for the puropse of testing
-
- TODO: This is fine for this iteration. Eventually we need to integrate these libraries
- for bundling in the thirdparty mechanism. This will follow in the next iteration
- -->
- <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/ports-01/lib" overwrite="true"/>
- <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/ports-01/lib" overwrite="true"/>
- <copy file="${jboss.cache.lib}/jboss-cache.jar" todir="${jboss.home}/server/ports-02/lib" overwrite="true"/>
- <copy file="${jgroups.jgroups.lib}/jgroups.jar" todir="${jboss.home}/server/ports-02/lib" overwrite="true"/>
<!-- deploying the test datasources -->
<copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml"
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-10-29 10:12:00 UTC (rev 8789)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/build.xml 2007-10-29 11:25:02 UTC (rev 8790)
@@ -262,8 +262,6 @@
<!-- cms optimization integration - this contains a clustered cache enabled version -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
- <fileset dir="${jboss.cache.lib}" includes="jboss-cache.jar"/>
- <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
<fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
</copy>
16 years, 6 months