JBoss Portal SVN: r12143 - in branches/JBoss_Portal_Branch_2_6: core-cms/src/main/org/jboss/portal/core/cms/ui/admin and 1 other directory.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-10-23 01:30:32 -0400 (Thu, 23 Oct 2008)
New Revision: 12143
Modified:
branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
Log:
minor bug fix. should go with the 2.6.7 tag along with the earlier commit
Modified: branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java 2008-10-23 03:16:20 UTC (rev 12142)
+++ branches/JBoss_Portal_Branch_2_6/cms/src/main/org/jboss/portal/cms/CMSException.java 2008-10-23 05:30:32 UTC (rev 12143)
@@ -54,7 +54,7 @@
{
boolean pathFormatFailure = false;
- if(this.getMessage().indexOf("is not a legal path element")!=-1)
+ if(this.getMessage().indexOf("is not a legal path element")!=-1 || this.getMessage().indexOf("is not a valid path")!=-1)
{
pathFormatFailure = true;
}
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-23 03:16:20 UTC (rev 12142)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/ui/admin/CMSAdminPortlet.java 2008-10-23 05:30:32 UTC (rev 12143)
@@ -157,14 +157,9 @@
throws PortletException, IOException, UnavailableException
{
//SetUp the properly localized Date Formatter to be used by the View JSPs
- Format dateFormat = (Format)rReq.getPortletSession().getAttribute(CMSAdminConstants.DATE_FORMAT);
- if(dateFormat == null)
- {
- ResourceBundle bundle = this.getPortletConfig().getResourceBundle(rReq.getLocale());
- String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN);
- dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale());
- rReq.getPortletSession().setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat);
- }
+ ResourceBundle bundle = this.getPortletConfig().getResourceBundle(rReq.getLocale());
+ String datePattern = bundle.getString(CMSAdminConstants.CMS_DATE_PATTERN);
+ Format dateFormat = new SimpleDateFormat(datePattern, rReq.getLocale());
rReq.setAttribute(CMSAdminConstants.DATE_FORMAT, dateFormat);
17 years, 6 months
JBoss Portal SVN: r12142 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2008-10-22 23:16:20 -0400 (Wed, 22 Oct 2008)
New Revision: 12142
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
Log:
fixing the Hibernate Cache Provider for the CMS service
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2008-10-22 18:16:28 UTC (rev 12141)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-sar/conf/hibernate/cms/hibernate.cfg.xml 2008-10-23 03:16:20 UTC (rev 12142)
@@ -37,8 +37,8 @@
<!--
| Uncomment in clustered mode : use transactional replicated cache
@portal.single.xml.close@
- <property name="cache.provider_class">org.jboss.portal.jems.hibernate.JMXTreeCacheProvider</property>
- <property name="cache.object_name">portal:service=TreeCacheProvider,type=hibernate</property>
+ <property name="cache.provider_class">org.jboss.hibernate.jbc.cacheprovider.JmxBoundTreeCacheProvider</property>
+ <property name="treecache.mbean.object_name">portal:service=TreeCache,type=hibernate</property>
@portal.single.xml.open@
-->
17 years, 6 months
JBoss Portal SVN: r12141 - in branches/JBoss_Portal_Branch_2_7: core and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 14:16:28 -0400 (Wed, 22 Oct 2008)
New Revision: 12141
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_7/core/.classpath
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml
Log:
Minor fixings
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-10-22 16:04:07 UTC (rev 12140)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-10-22 18:16:28 UTC (rev 12141)
@@ -41,11 +41,11 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
- <componentref name="jboss-portal/modules/web" version="1.2.1"/>
+ <componentref name="jboss-portal/modules/common" version="1.2.2"/>
+ <componentref name="jboss-portal/modules/web" version="1.2.2"/>
<componentref name="jboss-portal/modules/test" version="1.0.3"/>
- <componentref name="jboss-portal/modules/portlet" version="2.0.3"/>
- <componentref name="jboss-portal/modules/identity" version="1.0.4"/>
+ <componentref name="jboss-portal/modules/portlet" version="2.0.4"/>
+ <componentref name="jboss-portal/modules/identity" version="1.0.5"/>
<componentref name="jboss-portal/modules/cms" version="1.2.0"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
Modified: branches/JBoss_Portal_Branch_2_7/core/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-10-22 16:04:07 UTC (rev 12140)
+++ branches/JBoss_Portal_Branch_2_7/core/.classpath 2008-10-22 18:16:28 UTC (rev 12141)
@@ -33,7 +33,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/server"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
- <classpathentry combineaccessrules="false" kind="src" path="/cms"/>
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry combineaccessrules="false" kind="src" path="/registration"/>
<classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141)
@@ -42,7 +42,7 @@
<title>Portlet Content Portlet</title>
<keywords>management,admin</keywords>
</portlet-info>
- <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event>
+ <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">x:select</qname></supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
<user-attribute>
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141)
@@ -75,7 +75,7 @@
<keywords>management,admin</keywords>
</portlet-info>
- <supported-processing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-processing-event>
+ <supported-processing-event><qname xmlns:x="urn:jboss:portal:content">x:select</qname></supported-processing-event>
</portlet>
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/resources/portal-cms-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141)
@@ -63,7 +63,6 @@
<value>false</value>
</preference>
</portlet-preferences>
- <supported-publishing-event><qname xmlns:x="urn:jboss:portal:content">select</qname></supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
@@ -87,25 +86,6 @@
<title>CMS Administration</title>
</portlet-info>
</portlet>
-
- <!-- portlet>
- <description>CMS Content Editor</description>
- <portlet-name>CMSContentEditorPortlet</portlet-name>
- <display-name>CMS Content Editor</display-name>
-
- <portlet-class>org.jboss.portal.core.cms.ui.admin.CMSContentEditorPortlet</portlet-class>
- <supports>
- <mime-type>text/html</mime-type>
- <portlet-mode>VIEW</portlet-mode>
- </supports>
- <supported-locale>en</supported-locale>
- <supported-locale>fr</supported-locale>
- <supported-locale>es</supported-locale>
- <resource-bundle>Resource</resource-bundle>
- <portlet-info>
- <title>CMS Content Type</title>
- </portlet-info>
- </portlet-->
<filter>
<filter-name>JBoss Portlet Filter</filter-name>
@@ -120,11 +100,6 @@
<portlet-name>CMSAdminPortlet</portlet-name>
</filter-mapping>
- <event-definition>
- <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
- <value-type>java.lang.String</value-type>
- </event-definition>
-
<public-render-parameter>
<identifier>uri</identifier>
<qname xmlns:c="urn:jboss:portal:content">c:uri</qname>
Modified: branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-22 16:04:07 UTC (rev 12140)
+++ branches/JBoss_Portal_Branch_2_7/core-samples/src/resources/portal-basic-samples-war/WEB-INF/portlet.xml 2008-10-22 18:16:28 UTC (rev 12141)
@@ -325,7 +325,7 @@
<keywords>sample,test</keywords>
</portlet-info>
<supported-publishing-event>
- <qname xmlns:x="urn:jboss:portal:content">select</qname>
+ <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
</supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
17 years, 6 months
JBoss Portal SVN: r12140 - in tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img: jbp-icon-set and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 12:04:07 -0400 (Wed, 22 Oct 2008)
New Revision: 12140
Added:
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
Removed:
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Activate.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Configure.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deactivate.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Delete.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
Log:
Core WSRP icons were missing
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Activate.gif
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Configure.gif
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deactivate.gif
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif)
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif)
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif)
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif)
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif)
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif)
===================================================================
(Binary files differ)
Deleted: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
===================================================================
(Binary files differ)
Copied: tags/JBoss_Portal_2_6_7/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif (from rev 12139, branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif)
===================================================================
(Binary files differ)
17 years, 6 months
JBoss Portal SVN: r12139 - in branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img: jbp-icon-set and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 12:01:56 -0400 (Wed, 22 Oct 2008)
New Revision: 12139
Added:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
Removed:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Activate.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Configure.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deactivate.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Delete.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
Log:
Moved pics referenced by new stylesheet
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Activate.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Configure.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deactivate.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Delete.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Deregister.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Refresh.gif
===================================================================
(Binary files differ)
Deleted: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/actionIcon_Register.gif
===================================================================
(Binary files differ)
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/activate.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deactivate.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/delete2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/deregister.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/refresh.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/register.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/bin/portal-wsrp-admin-war/img/jbp-icon-set/settings.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
17 years, 6 months
JBoss Portal SVN: r12138 - in modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test: tck and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 10:57:39 -0400 (Wed, 22 Oct 2008)
New Revision: 12138
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java
modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java
Log:
Use correct names
Modified: modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-10-22 14:51:41 UTC (rev 12137)
+++ modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-10-22 14:57:39 UTC (rev 12138)
@@ -38,6 +38,7 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.web.IllegalRequestException;
import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.mc.bootstrap.WebBootstrap;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -70,7 +71,7 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker");
+ this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.stateControllerContext = new StateControllerContextImpl(this);
this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext);
Modified: modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2008-10-22 14:51:41 UTC (rev 12137)
+++ modules/portlet/tags/JBP_PORTLET_2_0_4/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2008-10-22 14:57:39 UTC (rev 12138)
@@ -36,6 +36,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.web.IllegalRequestException;
import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.mc.bootstrap.WebBootstrap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -70,7 +71,7 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker");
+ this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this));
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext);
17 years, 6 months
JBoss Portal SVN: r12137 - in modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test: tck and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 10:51:41 -0400 (Wed, 22 Oct 2008)
New Revision: 12137
Modified:
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java
modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java
Log:
Fixes service naming
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-10-22 13:45:26 UTC (rev 12136)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/controller/PortletControllerContextImpl.java 2008-10-22 14:51:41 UTC (rev 12137)
@@ -38,6 +38,7 @@
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
import org.jboss.portal.web.IllegalRequestException;
import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.mc.bootstrap.WebBootstrap;
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
@@ -70,7 +71,7 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker");
+ this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.stateControllerContext = new StateControllerContextImpl(this);
this.serialization = new PortletPageNavigationalStateSerialization(stateControllerContext);
Modified: modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java
===================================================================
--- modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2008-10-22 13:45:26 UTC (rev 12136)
+++ modules/portlet/trunk/test/src/main/java/org/jboss/portal/portlet/test/tck/TCKPortletControllerContext.java 2008-10-22 14:51:41 UTC (rev 12137)
@@ -36,6 +36,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.web.IllegalRequestException;
import org.jboss.portal.common.io.Serialization;
+import org.jboss.portal.common.mc.bootstrap.WebBootstrap;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -70,7 +71,7 @@
super(req, resp);
//
- this.portletInvoker = (PortletInvoker)servletContext.getAttribute("ConsumerPortletInvoker");
+ this.portletInvoker = (PortletInvoker)servletContext.getAttribute(WebBootstrap.BEAN_PREFIX + "ConsumerPortletInvoker");
this.stateControllerContext = new TCKStateControllerContext(new StateControllerContextImpl(this));
this.eventControllerContext = new EventControllerContextImpl(portletInvoker);
this.serialization = new TCKPageNavigationalStateSerialization(stateControllerContext);
17 years, 6 months
JBoss Portal SVN: r12136 - modules/web/tags/JBP_WEB_1_2_2/web/src/test/java/org/jboss/portal/test/web.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 09:45:26 -0400 (Wed, 22 Oct 2008)
New Revision: 12136
Modified:
modules/web/tags/JBP_WEB_1_2_2/web/src/test/java/org/jboss/portal/test/web/TestServlet.java
Log:
Fix
Modified: modules/web/tags/JBP_WEB_1_2_2/web/src/test/java/org/jboss/portal/test/web/TestServlet.java
===================================================================
--- modules/web/tags/JBP_WEB_1_2_2/web/src/test/java/org/jboss/portal/test/web/TestServlet.java 2008-10-22 13:42:13 UTC (rev 12135)
+++ modules/web/tags/JBP_WEB_1_2_2/web/src/test/java/org/jboss/portal/test/web/TestServlet.java 2008-10-22 13:45:26 UTC (rev 12136)
@@ -28,13 +28,11 @@
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.Failure;
import org.jboss.unit.info.TestInfo;
+import org.jboss.portal.common.mc.bootstrap.WebBootstrap;
import org.jboss.portal.web.endpoint.EndPointServlet;
import org.jboss.portal.web.WebRequest;
import org.jboss.portal.web.WebResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import java.io.IOException;
import java.io.Serializable;
@@ -58,7 +56,7 @@
super.init();
//
- testSuite = (CompositeTestDriver)getServletContext().getAttribute("TestSuite");
+ testSuite = (CompositeTestDriver)getServletContext().getAttribute(WebBootstrap.BEAN_PREFIX + "TestSuite");
// Init the test cases
for (String name : testSuite.getNames())
17 years, 6 months
JBoss Portal SVN: r12135 - modules/web/trunk/web/src/test/java/org/jboss/portal/test/web.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 09:42:13 -0400 (Wed, 22 Oct 2008)
New Revision: 12135
Modified:
modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java
modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java
Log:
I didn't really mean to commit that...
Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java
===================================================================
--- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java 2008-10-22 13:19:22 UTC (rev 12134)
+++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java 2008-10-22 13:42:13 UTC (rev 12135)
@@ -68,8 +68,6 @@
public DriverResponse invoke(TestId testId, DriverCommand driverCommand)
{
- System.out.println("FOOOBAR");
-
testServlet.currentTestCase = this;
//
Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java
===================================================================
--- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java 2008-10-22 13:19:22 UTC (rev 12134)
+++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java 2008-10-22 13:42:13 UTC (rev 12135)
@@ -55,7 +55,6 @@
{
super.init();
- System.out.println("FOOOOOOO");
//
testSuite = (CompositeTestDriver)getServletContext().getAttribute(WebBootstrap.BEAN_PREFIX + "TestSuite");
17 years, 6 months
JBoss Portal SVN: r12134 - in modules/web/trunk: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-10-22 09:19:22 -0400 (Wed, 22 Oct 2008)
New Revision: 12134
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/pom.xml
modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java
modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java
Log:
minor
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-10-22 10:54:07 UTC (rev 12133)
+++ modules/web/trunk/build/pom.xml 2008-10-22 13:19:22 UTC (rev 12134)
@@ -32,8 +32,8 @@
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0</version.jboss.portal.common>
- <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit>
+ <version.jboss.portal.common>1.2.2</version.jboss.portal.common>
+ <version.jboss.unit>1.2.1</version.jboss.unit>
<version.jboss-reflect>2.0.0.Beta12</version.jboss-reflect>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
Modified: modules/web/trunk/pom.xml
===================================================================
--- modules/web/trunk/pom.xml 2008-10-22 10:54:07 UTC (rev 12133)
+++ modules/web/trunk/pom.xml 2008-10-22 13:19:22 UTC (rev 12134)
@@ -42,4 +42,29 @@
</plugins>
</reporting>
+<build>
+<plugins>
+<plugin>
+<groupId>org.apache.maven.plugins</groupId>
+<artifactId>maven-surefire-plugin</artifactId>
+</plugin>
+<plugin>
+<groupId>org.apache.maven.plugins</groupId>
+<artifactId>maven-surefire-report-plugin</artifactId>
+<configuration>
+<!--<outputDirectory>/data/reports</outputDirectory>-->
+<aggregate>true</aggregate>
+</configuration>
+<executions>
+<execution>
+<phase>test</phase>
+<goals>
+<goal>report-only</goal>
+</goals>
+</execution>
+</executions>
+</plugin>
+</plugins>
+</build>
+
</project>
Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java
===================================================================
--- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java 2008-10-22 10:54:07 UTC (rev 12133)
+++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/ServletTestCase.java 2008-10-22 13:19:22 UTC (rev 12134)
@@ -68,6 +68,8 @@
public DriverResponse invoke(TestId testId, DriverCommand driverCommand)
{
+ System.out.println("FOOOBAR");
+
testServlet.currentTestCase = this;
//
Modified: modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java
===================================================================
--- modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java 2008-10-22 10:54:07 UTC (rev 12133)
+++ modules/web/trunk/web/src/test/java/org/jboss/portal/test/web/TestServlet.java 2008-10-22 13:19:22 UTC (rev 12134)
@@ -28,13 +28,11 @@
import org.jboss.unit.driver.response.FailureResponse;
import org.jboss.unit.Failure;
import org.jboss.unit.info.TestInfo;
+import org.jboss.portal.common.mc.bootstrap.WebBootstrap;
import org.jboss.portal.web.endpoint.EndPointServlet;
import org.jboss.portal.web.WebRequest;
import org.jboss.portal.web.WebResponse;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.servlet.ServletException;
import java.io.IOException;
import java.io.Serializable;
@@ -57,8 +55,9 @@
{
super.init();
+ System.out.println("FOOOOOOO");
//
- testSuite = (CompositeTestDriver)getServletContext().getAttribute("TestSuite");
+ testSuite = (CompositeTestDriver)getServletContext().getAttribute(WebBootstrap.BEAN_PREFIX + "TestSuite");
// Init the test cases
for (String name : testSuite.getNames())
17 years, 6 months