JBoss Portal SVN: r7006 - in docs/trunk: readmeFiles and 2 other directories.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 09:33:30 -0400 (Wed, 18 Apr 2007)
New Revision: 7006
Modified:
docs/trunk/quickstartuser/en/master.xml
docs/trunk/readmeFiles/jboss-portal-bin.README
docs/trunk/readmeFiles/jboss-portal-ha-bin.README
docs/trunk/readmeFiles/jboss-portal-src.README
docs/trunk/referenceGuide/en/master.xml
docs/trunk/userGuide/en/master.xml
Log:
updating version info in docs
Modified: docs/trunk/quickstartuser/en/master.xml
===================================================================
--- docs/trunk/quickstartuser/en/master.xml 2007-04-18 13:28:32 UTC (rev 7005)
+++ docs/trunk/quickstartuser/en/master.xml 2007-04-18 13:33:30 UTC (rev 7006)
@@ -11,12 +11,12 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6Beta1</title>
+ <title>JBoss Portal 2.6CR1</title>
<subtitle>Quickstart User Guide</subtitle>
- <releaseinfo>Release 2.6Beta1 "Ninja"</releaseinfo>
- <releaseinfo>February 2007</releaseinfo>
+ <releaseinfo>Release 2.6CR1 "Ninja"</releaseinfo>
+ <releaseinfo>April 2007</releaseinfo>
<author>
<firstname>Kevin</firstname>
Modified: docs/trunk/readmeFiles/jboss-portal-bin.README
===================================================================
--- docs/trunk/readmeFiles/jboss-portal-bin.README 2007-04-18 13:28:32 UTC (rev 7005)
+++ docs/trunk/readmeFiles/jboss-portal-bin.README 2007-04-18 13:33:30 UTC (rev 7006)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.0 Developer Release 1
+ JBoss Portal 2.6.0 Candidate Release 1
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/trunk/readmeFiles/jboss-portal-ha-bin.README
===================================================================
--- docs/trunk/readmeFiles/jboss-portal-ha-bin.README 2007-04-18 13:28:32 UTC (rev 7005)
+++ docs/trunk/readmeFiles/jboss-portal-ha-bin.README 2007-04-18 13:33:30 UTC (rev 7006)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.0 Developer Release 1
+ JBoss Portal 2.6.0 Candidate Release 1
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/trunk/readmeFiles/jboss-portal-src.README
===================================================================
--- docs/trunk/readmeFiles/jboss-portal-src.README 2007-04-18 13:28:32 UTC (rev 7005)
+++ docs/trunk/readmeFiles/jboss-portal-src.README 2007-04-18 13:33:30 UTC (rev 7006)
@@ -1,5 +1,5 @@
- JBoss Portal 2.6.0 Developer Release 1
+ JBoss Portal 2.6.0 Candidate Release 1
LGPL Licensed (See http://www.gnu.org/copyleft/lesser.html for details on the product usage)
JBoss Portal is the next generation open source content management system (CMS) and portal
Modified: docs/trunk/referenceGuide/en/master.xml
===================================================================
--- docs/trunk/referenceGuide/en/master.xml 2007-04-18 13:28:32 UTC (rev 7005)
+++ docs/trunk/referenceGuide/en/master.xml 2007-04-18 13:33:30 UTC (rev 7006)
@@ -28,16 +28,21 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6Beta1</title>
+ <title>JBoss Portal 2.6CR1</title>
<subtitle>Reference Guide</subtitle>
- <releaseinfo>Release 2.6Beta1 "Ninja"</releaseinfo>
- <releaseinfo>February 2007</releaseinfo>
+ <releaseinfo>Release 2.6CR1 "Ninja"</releaseinfo>
+ <releaseinfo>April 2007</releaseinfo>
<author>
<firstname>Thomas</firstname>
<surname>Heute</surname>
<email>theute(a)jboss.org</email>
</author>
<author>
+ <firstname>Julien</firstname>
+ <surname>Viet</surname>
+ <email>julien(a)jboss.org</email>
+ </author>
+ <author>
<firstname>Roy</firstname>
<surname>Russo</surname>
<email>roy(a)jboss.org</email>
Modified: docs/trunk/userGuide/en/master.xml
===================================================================
--- docs/trunk/userGuide/en/master.xml 2007-04-18 13:28:32 UTC (rev 7005)
+++ docs/trunk/userGuide/en/master.xml 2007-04-18 13:33:30 UTC (rev 7006)
@@ -13,10 +13,10 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6Beta1</title>
+ <title>JBoss Portal 2.6CR1</title>
<subtitle>User Guide</subtitle>
- <releaseinfo>Release 2.6Beta1 "Ninja"</releaseinfo>
- <releaseinfo>February 2007</releaseinfo>
+ <releaseinfo>Release 2.6CR1 "Ninja"</releaseinfo>
+ <releaseinfo>April 2007</releaseinfo>
<author>
<firstname>Roy</firstname>
<surname>Russo</surname>
17 years, 2 months
JBoss Portal SVN: r7005 - in trunk: test/src/main/org/jboss/portal/test/framework/driver/http and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 09:28:32 -0400 (Wed, 18 Apr 2007)
New Revision: 7005
Modified:
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
Log:
slight improvement of HTTPTestContext
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-04-18 13:22:03 UTC (rev 7004)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestContext.java 2007-04-18 13:28:32 UTC (rev 7005)
@@ -36,21 +36,24 @@
public class PortletTestContext
{
+ final String testName;
+
/** . */
final HttpTestContext httpTestContext;
- public PortletTestContext(HttpTestContext httpTestContext)
+ public PortletTestContext(String testName, HttpTestContext httpTestContext)
{
if (httpTestContext == null)
{
throw new IllegalArgumentException("No http test context to wrap");
}
+ this.testName = testName;
this.httpTestContext = httpTestContext;
}
public String getTestName()
{
- return httpTestContext.getTestName();
+ return testName;
}
public void setResponse(DriverResponse response)
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-04-18 13:22:03 UTC (rev 7004)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-04-18 13:28:32 UTC (rev 7005)
@@ -123,7 +123,7 @@
public void pushContext(String testId, HttpTestContext testContext)
{
- context = new PortletTestContext(testContext);
+ context = new PortletTestContext(testId, testContext);
}
public HttpTestContext popContext(String testId)
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-04-18 13:22:03 UTC (rev 7004)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-04-18 13:28:32 UTC (rev 7005)
@@ -74,9 +74,6 @@
throw new UnsupportedOperationException("Don't use this API");
}
- /** The test name. */
- private final String testName;
-
/** The test count. */
private int requestCount;
@@ -102,7 +99,6 @@
*/
public HttpTestContext(HttpTestContext that)
{
- this.testName = that.testName;
this.requestCount = that.requestCount;
this.archivePath = that.archivePath;
this.response = that.response;
@@ -117,7 +113,6 @@
String testName,
HttpTestContext that)
{
- this.testName = testName;
this.requestCount = that.requestCount;
this.archivePath = that.archivePath;
this.response = that.response;
@@ -134,7 +129,6 @@
String archivePath,
TestParametrization parametrization)
{
- this.testName = testName;
this.requestCount = requestCount;
this.archivePath = archivePath;
this.parametrization = parametrization;
@@ -152,16 +146,6 @@
}
/**
- * Return the test id.
- *
- * @return the test id
- */
- public String getTestName()
- {
- return testName;
- }
-
- /**
* Return the test count.
*
* @return the test count
@@ -276,19 +260,19 @@
testAgent.undeploy(url);
}
- public static boolean isCurrentTestName(String testName) throws IllegalStateException
- {
- if (testName == null)
- {
- throw new IllegalArgumentException();
- }
- return testName.equals(getCurrentContext().testName);
- }
+// public static boolean isCurrentTestName(String testName) throws IllegalStateException
+// {
+// if (testName == null)
+// {
+// throw new IllegalArgumentException();
+// }
+// return testName.equals(getCurrentContext().testName);
+// }
- public static String getCurrentTestName() throws IllegalStateException
- {
- return getCurrentContext().testName;
- }
+// public static String getCurrentTestName() throws IllegalStateException
+// {
+// return getCurrentContext().testName;
+// }
public static boolean isCurrentRequestCount(int count) throws IllegalStateException
{
@@ -321,6 +305,6 @@
public String toString()
{
- return "TestCaseContext[" + testName + "," + requestCount + "]";
+ return "TestCaseContext[" + requestCount + "]";
}
}
17 years, 2 months
JBoss Portal SVN: r7004 - in trunk/core-admin/src: main/org/jboss/portal/core/admin/ui/actions and 2 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-18 09:22:03 -0400 (Wed, 18 Apr 2007)
New Revision: 7004
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
Log:
Typed properties (Boolean + String)
Fix NPE on:
org.jboss.portal.core.admin.ui.dashboard.DashboardBean.renderRefresh(DashboardBean.java:167)
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java 2007-04-18 12:30:16 UTC (rev 7003)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertiesFilter.java 2007-04-18 13:22:03 UTC (rev 7004)
@@ -8,6 +8,7 @@
import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.theme.ThemeConstants;
+import org.jboss.portal.theme.impl.render.dynamic.DynaRenderOptions;
public class PropertiesFilter
{
@@ -40,6 +41,11 @@
{
propertyBean.setDisplayName(new LocalizedString("Default child name", Locale.ENGLISH));
}
+ else if (propertyBean.getName().equals(DynaRenderOptions.ASYNC_WINDOW_ENABLED))
+ {
+ propertyBean.setDisplayName(new LocalizedString("Asynchronous Windows Enabled", Locale.ENGLISH));
+ propertyBean.setType("java.lang.Boolean");
+ }
}
it = toRemove.iterator();
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2007-04-18 12:30:16 UTC (rev 7003)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyBean.java 2007-04-18 13:22:03 UTC (rev 7004)
@@ -33,180 +33,77 @@
public class PropertyBean implements Comparable
{
- /** . */
- private String name;
/** . */
- private boolean readOnly;
-
- /** . */
- private LocalizedString displayName;
-
- /** . */
private String value;
- /** . */
PropertiesBean container;
- private PortalObject portalObject;
-
- public PropertyBean()
- {
- name="toto";
- value="foo";
- }
+ private PropertyInfo info;
public PropertyBean(PropertyInfo info, String value)
{
- this.name = info.getName();
- this.portalObject = info.getPortalObject();
- this.readOnly = info.isReadOnly();
- this.displayName = info.getDisplayName();
+ this.info = info;
this.value = value;
}
+
+ private PortalObject getPortalObject()
+ {
+ return info.getPortalObject();
+ }
public String getName()
{
- return name;
+ return info.getName();
}
public boolean isReadOnly()
{
- return readOnly;
+ return info.isReadOnly();
}
- public void setReadOnly(boolean readOnly)
- {
- this.readOnly = readOnly;
- }
-
public LocalizedString getDisplayName()
{
- return displayName;
+ return info.getDisplayName();
}
public void setDisplayName(LocalizedString displayName)
{
- this.displayName = displayName;
+ info.setDisplayName(displayName);
}
- public String getValue()
+ public Object getValue()
{
- return value;
- }
-
- public void setValue(String value)
- {
- this.value = value;
- portalObject.setDeclaredProperty(name, value);
- }
-
-
- /*
- public List getIndices()
- {
- List list = new ArrayList(value.size());
- for (int i = 0;i < value.size();i++)
+ if (info.getType().equals("java.lang.Boolean"))
{
- list.add("index_" + i);
+ return new Boolean(value);
}
- return list;
- }
-
- public String getLine()
- {
- return line;
- }
-
- public void setLine(String line)
- {
- this.line = line;
- }
- */
-
- public void select()
- {
- if (container == null)
+ else
{
- throw new IllegalStateException("Not attached to a container");
+ return value;
}
- container.selectedIndex = container.entries.indexOf(this);
}
- /*
- public void deleteLine(ActionEvent event)
+ public void setValue(Object value)
{
- String s = event.getComponent().getId();
- int index = Integer.parseInt(s.substring(4));
- List list = new ArrayList(value.asStringList());
- list.remove(index);
- String[] strings = (String[])list.toArray(new String[list.size()]);
- value = new StringValue(strings);
- stale = true;
+ this.value = value.toString();
+ getPortalObject().setDeclaredProperty(getName(), value.toString());
}
- public void appendLine()
+ public int compareTo(Object o)
{
- List list = new ArrayList(value.asStringList());
- list.add(line);
- String[] strings = (String[])list.toArray(new String[list.size()]);
- value = new StringValue(strings);
- stale = true;
- line = null;
+ PropertyBean that = (PropertyBean)o;
+ return info.getName().compareTo(that.getName());
}
-
- public Class getType(Object propertyName) throws IllegalArgumentException
+ public String getType()
{
- if (propertyName instanceof String)
- {
- String s = (String)propertyName;
- if (s.startsWith("index_"))
- {
- return String.class;
- }
- }
- return null;
+ return info.getType();
}
- */
- /*
- public PropertyValue getValue(Object propertyName) throws IllegalArgumentException
+ public void setType(String type)
{
- if (propertyName instanceof String)
- {
- String s = (String)propertyName;
- if (s.startsWith("index_"))
- {
- int index = Integer.parseInt(s.substring(6));
- return new PropertyValue(value.asStringList().get(index));
- }
- }
- return null;
+ info.setType(type);
}
-
- public boolean setValue(Object propertyName, Object value) throws IllegalArgumentException
- {
- if (propertyName instanceof String)
- {
- String s = (String)propertyName;
- if (s.startsWith("index_"))
- {
- String[] tmp = this.value.asStringArray();
- int index = Integer.parseInt(s.substring(6));
- tmp[index] = (String)value;
- this.value = new StringValue(tmp);
- stale = true;
- return true;
- }
- }
- return false;
- }
-*/
- public int compareTo(Object o)
- {
- PropertyBean that = (PropertyBean)o;
- return name.compareTo(that.name);
- }
}
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java 2007-04-18 12:30:16 UTC (rev 7003)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PropertyInfo.java 2007-04-18 13:22:03 UTC (rev 7004)
@@ -36,6 +36,8 @@
/** . */
private boolean readOnly;
+
+ private String type;
/** . */
private LocalizedString displayName;
@@ -47,6 +49,7 @@
this.name = name;
this.readOnly = readOnly;
this.portalObject = portalObject;
+ this.type = "java.lang.String";
}
public LocalizedString getDisplayName()
@@ -84,4 +87,14 @@
return portalObject;
}
+ public String getType()
+ {
+ return type;
+ }
+
+ public void setType(String type)
+ {
+ this.type = type;
+ }
+
}
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2007-04-18 12:30:16 UTC (rev 7003)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2007-04-18 13:22:03 UTC (rev 7004)
@@ -123,7 +123,12 @@
if (! propertyName.equals(""))
{
- getPortalObjectManager().getSelectedObject().setDeclaredProperty(propertyName, getPropertyValue());
+ String value = getPropertyValue();
+ if (value == null)
+ {
+ value = "";
+ }
+ getPortalObjectManager().getSelectedObject().setDeclaredProperty(propertyName, value);
}
}
}
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-04-18 12:30:16 UTC (rev 7003)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/dashboard/DashboardBean.java 2007-04-18 13:22:03 UTC (rev 7004)
@@ -163,18 +163,21 @@
{
refresh();
- //
- selectedPageTheme = userPortal.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
- if (selectedPageTheme == null)
+ if (userPortal != null)
{
- selectedPageTheme = "";
- }
+ //
+ selectedPageTheme = userPortal.getDeclaredProperty(ThemeConstants.PORTAL_PROP_THEME);
+ if (selectedPageTheme == null)
+ {
+ selectedPageTheme = "";
+ }
- //
- selectedPageLayout = userPortal.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
- if (selectedPageLayout == null)
- {
- selectedPageLayout = "";
+ //
+ selectedPageLayout = userPortal.getDeclaredProperty(ThemeConstants.PORTAL_PROP_LAYOUT);
+ if (selectedPageLayout == null)
+ {
+ selectedPageLayout = "";
+ }
}
}
Modified: trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-04-18 12:30:16 UTC (rev 7003)
+++ trunk/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/common/editProperties.xhtml 2007-04-18 13:22:03 UTC (rev 7004)
@@ -25,7 +25,14 @@
<h:outputText>#{prop.name}</h:outputText>
</td>
<td>
- <h:inputText value="#{prop.value}"/>
+ <c:choose>
+ <c:when test="#{prop.type=='java.lang.Boolean'}">
+ <h:selectBooleanCheckbox value="#{prop.value}" />
+ </c:when>
+ <c:otherwise>
+ <h:inputText value="#{prop.value}" />
+ </c:otherwise>
+ </c:choose>
</td>
<td>
<h:commandLink action="#{propertyAction.removeProperty}">
@@ -45,7 +52,6 @@
<thead class="portlet-section-header" style="text-align:left;">
<tr>
<th>Property name</th>
- <th>Property value</th>
</tr>
</thead>
<tbody>
@@ -53,13 +59,9 @@
<td>
<h:selectOneMenu value="#{propertyAction.selectedProperty}">
<f:selectItems value="#{portalobjectmgr.properties}"/>
- </h:selectOneMenu><br />
- <h:outputText value="Other"/><h:inputText value="#{propertyAction.otherPropertyName}"
- validator="#{propertyAction.validatePropertyName}" />
+ </h:selectOneMenu>
+ <h:outputText value="Other:"/> <h:inputText value="#{propertyAction.otherPropertyName}" />
</td>
- <td>
- <h:inputText value="#{propertyAction.propertyValue}"/>
- </td>
</tr>
</tbody>
</table>
17 years, 2 months
JBoss Portal SVN: r7003 - trunk/core-admin/src/bin/portal-admin-war.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-18 08:30:16 -0400 (Wed, 18 Apr 2007)
New Revision: 7003
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
Log:
Should workaround the IE CSS bug to display tabs.
Thanks Martin Putz !
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-04-18 09:48:00 UTC (rev 7002)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-04-18 12:30:16 UTC (rev 7003)
@@ -47,7 +47,7 @@
.admin-ui ul.topnav {
margin-left: 0;
- padding: 3px 0;
+ padding: 4px 0px 3px;
border-bottom: 1px solid;
}
17 years, 2 months
JBoss Portal SVN: r7002 - in trunk: wsrp/src/main/org/jboss/portal/test/wsrp/handler and 1 other directory.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-18 05:48:00 -0400 (Wed, 18 Apr 2007)
New Revision: 7002
Modified:
trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java
Log:
Make it compile with Java 6
Modified: trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java
===================================================================
--- trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java 2007-04-18 09:35:11 UTC (rev 7001)
+++ trunk/jems/src/main/org/jboss/portal/jems/hibernate/ByteArrayBlob.java 2007-04-18 09:48:00 UTC (rev 7002)
@@ -83,6 +83,24 @@
return new ByteArrayInputStream(_bytes);
}
+ /*
+ * For JDK 1.6
+ * @see java.sql.Blob#getBinaryStream()
+ */
+ public InputStream getBinaryStream(long pos, long length)
+ {
+ throw new UnsupportedOperationException();
+ }
+
+ /*
+ * For JDK 1.6
+ * @see java.sql.Blob#free()
+ */
+ public void free()
+ {
+ throw new UnsupportedOperationException();
+ }
+
public int setBytes(long pos, byte[] bytes)
{
throw new UnsupportedOperationException();
@@ -138,4 +156,6 @@
return new ByteArrayBlob(binaryStream);
}
}
+
+
}
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java 2007-04-18 09:35:11 UTC (rev 7001)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/handler/MockSOAPMessage.java 2007-04-18 09:48:00 UTC (rev 7002)
@@ -25,6 +25,7 @@
import javax.xml.soap.AttachmentPart;
import javax.xml.soap.MimeHeaders;
+import javax.xml.soap.SOAPElement;
import javax.xml.soap.SOAPException;
import javax.xml.soap.SOAPMessage;
import javax.xml.soap.SOAPPart;
@@ -103,6 +104,14 @@
throw new UnsupportedOperationException();
}
+ /*
+ * For JDK 1.6
+ */
+ public AttachmentPart getAttachment(SOAPElement element)
+ {
+ throw new UnsupportedOperationException();
+ }
+
public Iterator getAttachments(MimeHeaders mimeHeaders)
{
throw new UnsupportedOperationException();
17 years, 2 months
JBoss Portal SVN: r7001 - in trunk/portlet/src/main/org/jboss/portal: test/portlet/jsr168/api/portalcontext and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 05:35:11 -0400 (Wed, 18 Apr 2007)
New Revision: 7001
Modified:
trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
Log:
make PortalContext.getPortalInfo() test pass
Modified: trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java 2007-04-18 09:29:34 UTC (rev 7000)
+++ trunk/portlet/src/main/org/jboss/portal/portlet/test/TestPortalContext.java 2007-04-18 09:35:11 UTC (rev 7001)
@@ -56,7 +56,7 @@
public String getInfo()
{
- return "Dummy/1.0";
+ return "JBossPortal/1.0";
}
public Set getWindowStates()
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-04-18 09:29:34 UTC (rev 7000)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/jsr168/api/portalcontext/PortalContextSequenceBuilder.java 2007-04-18 09:35:11 UTC (rev 7001)
@@ -117,7 +117,7 @@
String info = request.getPortalContext().getPortalInfo();
assertTrue(info.length() > 0);
- assertTrue(info.startsWith("JBoss Portal"));
+ assertTrue(info.startsWith("JBossPortal"));
return new EndTestResponse();
}
17 years, 2 months
JBoss Portal SVN: r7000 - trunk/portlet/src/main/org/jboss/portal/test/portlet/info.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 05:29:34 -0400 (Wed, 18 Apr 2007)
New Revision: 7000
Modified:
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
Log:
temporarily make the AbstractInfoTest an HttpTestCase in order to avoid the class cast exception
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-04-18 09:19:19 UTC (rev 6999)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-04-18 09:29:34 UTC (rev 7000)
@@ -33,12 +33,14 @@
import org.jboss.portal.common.test.driver.command.StartTestCommand;
import org.jboss.portal.common.test.info.TestItemInfo;
import org.jboss.portal.common.test.info.TestInfo;
+import org.jboss.portal.test.framework.driver.http.HttpTestDriver;
+import org.jboss.portal.test.framework.driver.http.HttpTestContext;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public abstract class AbstractInfoTest implements TestDriver
+public abstract class AbstractInfoTest implements HttpTestDriver
{
/** The test id. */
@@ -53,6 +55,9 @@
/** The controller. */
protected TestDriverContainer testDriverContainer;
+ /** Not really used for now, we need the concept of non http test context. */
+ private HttpTestContext testContext;
+
public AbstractInfoTest(String testCaseId)
{
if (testCaseId == null)
@@ -65,6 +70,16 @@
this.testInfo = new TestInfo(testCaseId);
}
+ public void pushContext(String testId, HttpTestContext testContext)
+ {
+ this.testContext = testContext;
+ }
+
+ public HttpTestContext popContext(String testId)
+ {
+ return testContext;
+ }
+
public PortletApplicationRegistry getRegistry()
{
return registry;
17 years, 2 months
JBoss Portal SVN: r6999 - trunk/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-18 05:19:19 -0400 (Wed, 18 Apr 2007)
New Revision: 6999
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
Log:
Removed DnD property, it can only be applied to dashboard anyway.
Modified: trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-04-18 09:15:27 UTC (rev 6998)
+++ trunk/core-admin/src/main/org/jboss/portal/core/admin/ui/PortalObjectManagerBean.java 2007-04-18 09:19:19 UTC (rev 6999)
@@ -538,7 +538,7 @@
public SelectItem[] getProperties()
{
List items = new ArrayList();
- items.add(new SelectItem(DynaRenderOptions.DND_ENABLED, "DnD enabled"));
+ // items.add(new SelectItem(DynaRenderOptions.DND_ENABLED, "DnD enabled"));
items.add(new SelectItem(DynaRenderOptions.ASYNC_WINDOW_ENABLED, "Asynchronous Windows Enabled"));
items.add(new SelectItem(ThemeConstants.PORTAL_PROP_ORDER, "Order"));
items.add(new SelectItem(PortalObject.PORTAL_PROP_DEFAULT_OBJECT_NAME, "Default child name"));
17 years, 2 months
JBoss Portal SVN: r6998 - in trunk: theme and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 05:15:27 -0400 (Wed, 18 Apr 2007)
New Revision: 6998
Modified:
trunk/testsuite/build.xml
trunk/theme/build.xml
Log:
disable theme tests for now
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2007-04-18 08:41:01 UTC (rev 6997)
+++ trunk/testsuite/build.xml 2007-04-18 09:15:27 UTC (rev 6998)
@@ -151,9 +151,11 @@
<antcall target="internal-test-module">
<param name="module" value="wsrp"/>
</antcall>
+<!--
<antcall target="internal-test-module">
<param name="module" value="theme"/>
</antcall>
+-->
<antcall target="internal-test-module">
<param name="module" value="core"/>
</antcall>
@@ -203,8 +205,10 @@
<fileset dir="../identity" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/>
<fileset dir="../wsrp" includes="*.log"/>
<fileset dir="../wsrp" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/>
+<!--
<fileset dir="../theme" includes="*.log"/>
<fileset dir="../theme" includes="output/tests/TEST-*.xml,output/tests/TEST-*.txt"/>
+-->
</delete>
<!-- remove testsuite output dir -->
<delete includeEmptyDirs="true" quiet="true">
Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml 2007-04-18 08:41:01 UTC (rev 6997)
+++ trunk/theme/build.xml 2007-04-18 09:15:27 UTC (rev 6998)
@@ -250,25 +250,10 @@
</target>
<target name="tests" depends="init">
+ <!--
<property name="build.testlog" value="${module.output}/log"/>
<execute-tests>
<x-test>
- <!-- theme tests -->
-<!--
- <test todir="${test.reports}" name="org.jboss.portal.test.theme.TestLayoutServiceImpl"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.theme.TestThemeServiceImpl"/>
--->
-
- <!-- theme metadata tests -->
-<!--
- <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestPortalLayoutMetaData"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestPortalThemeMetaData"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestRenderSetMetaData"/>
--->
-
- <!-- render tests -->
- <!--<test todir="${test.reports}" name="org.jboss.portal.test.theme.render.TestRenderContext"/>-->
- <!--<test todir="${test.reports}" name="org.jboss.portal.test.theme.render.TestRenderedMarkup"/>-->
</x-test>
<x-classpath>
<path refid="oswego.concurrent.classpath"/>
@@ -295,6 +280,7 @@
<pathelement location="${build.lib}/portal-theme-test-lib.jar"/>
</x-classpath>
</execute-tests>
+ -->
<!--
JSUnit TestRunner URL: http://localhost:8080/theme-test/jsunit/testRunner.html
testPage URL: http://localhost:8080/theme-test/testtheme
17 years, 2 months
JBoss Portal SVN: r6997 - in trunk: widget and 1 other directory.
by portal-commits@lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 04:41:01 -0400 (Wed, 18 Apr 2007)
New Revision: 6997
Modified:
trunk/core-admin/build.xml
trunk/widget/build.xml
Log:
build the widget.war both as exploded and normal
Modified: trunk/core-admin/build.xml
===================================================================
--- trunk/core-admin/build.xml 2007-04-18 08:40:28 UTC (rev 6996)
+++ trunk/core-admin/build.xml 2007-04-18 08:41:01 UTC (rev 6997)
@@ -205,7 +205,6 @@
<fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
</copy>
-
<copy todir="${build.resources}/portal-admin.sar/portal-admin.war">
<fileset dir="${build.resources}/portal-admin-war"/>
<fileset dir="${source.bin}/portal-admin-war"/>
@@ -213,13 +212,12 @@
</target>
-
- <!-- Build the jboss-portal.sar -->
<target name="output" depends="artifacts">
- <!-- Build archives -->
+
<implode
dir="${build.resources}/portal-admin.sar"
tofile="${build.lib}/portal-admin.sar"/>
+
</target>
<!-- ================================================================== -->
Modified: trunk/widget/build.xml
===================================================================
--- trunk/widget/build.xml 2007-04-18 08:40:28 UTC (rev 6996)
+++ trunk/widget/build.xml 2007-04-18 08:41:01 UTC (rev 6997)
@@ -111,6 +111,7 @@
<!-- Configure defaults & build tools -->
<call target="configure-defaults"/>
<call target="configure-tools"/>
+ <call target="configure-explode"/>
<!--+=======================================+-->
<!--| Define module specific elements here. |-->
@@ -120,6 +121,22 @@
</target>
+ <target name="configure-explode">
+
+ <path id="explode.task.classpath">
+ <pathelement location="${project.tools}/lib/explode.jar"/>
+ <path refid="apache.ant.classpath"/>
+ </path>
+
+ <taskdef name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
+ <taskdef name="implode"
+ classname="org.jboss.portal.common.ant.Implode"
+ classpathref="explode.task.classpath"/>
+
+ </target>
+
<!--+====================================================================+-->
<!--| Compile |-->
<!--| |-->
@@ -144,7 +161,7 @@
<!--| modules. |-->
<!--+====================================================================+-->
- <target name="output"
+ <target name="artifacts"
description="Generate all target output."
depends="compile">
@@ -155,26 +172,26 @@
</jar>
<!-- widget.war -->
- <mkdir dir="${build.resources}/widget-war/WEB-INF/lib"/>
- <copy todir="${build.resources}/widget-war/WEB-INF/lib">
+ <copy todir="${build.resources}/widget.war">
+ <fileset dir="${build.resources}/widget-war"/>
+ </copy>
+ <copy todir="${build.resources}/widget.war/WEB-INF/lib">
<fileset dir="${build.lib}" includes="widget-lib.jar"/>
</copy>
- <jar jarfile="${build.lib}/widget.war">
- <fileset dir="${build.resources}/widget-war"/>
- </jar>
- <!-- widget-invoker.sar -->
-<!--
- <mkdir dir="${build.resources}/widget-invoker-sar/lib"/>
- <copy todir="${build.resources}/widget-invoker-sar/lib">
- <fileset dir="${build.lib}" includes="widget-invoker-lib.jar"/>
- </copy>
- <jar jarfile="${build.lib}/widget-invoker.sar">
- <fileset dir="${build.resources}/widget-invoker-sar"/>
- </jar>
--->
</target>
+
+ <target name="output"
+ description="Generate all target output."
+ depends="artifacts">
+
+ <implode
+ dir="${build.resources}/widget-war"
+ tofile="${build.lib}/widget.war"/>
+
+ </target>
+
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
17 years, 2 months