JBoss Portal SVN: r9337 - in tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal: widget/netvibes/provider and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-11 18:16:09 -0500 (Tue, 11 Dec 2007)
New Revision: 9337
Modified:
tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java
tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
Log:
Netvibes, don't break the contracts
Modified: tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java
===================================================================
--- tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2007-12-11 16:40:16 UTC (rev 9336)
+++ tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2007-12-11 23:16:09 UTC (rev 9337)
@@ -36,14 +36,14 @@
public void test01() throws Exception
{
NetvibesQuery q = new NetvibesQuery(0, 10, "14", "top", "foo");
- assertEquals("http://eco.netvibes.com/rss.php?synd=jboss&type=uwa&count=10&cat=14&sort=...", q.buildQueryURL().toString());
+ assertEquals("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=uwa&count=10&cat=...", q.buildQueryURL().toString());
}
public void test02() throws Exception
{
NetvibesQuery q = new NetvibesQuery(1, 11, "5", "foo", "bar");
- assertEquals("http://eco.netvibes.com/rss.php?synd=jboss&type=uwa&start=1&count=11&cat=...", q.buildQueryURL().toString());
+ assertEquals("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=uwa&start=1&count...", q.buildQueryURL().toString());
}
public void test03()
Modified: tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
===================================================================
--- tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2007-12-11 16:40:16 UTC (rev 9336)
+++ tags/JBoss_Portal_2_6_3/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2007-12-11 23:16:09 UTC (rev 9337)
@@ -133,7 +133,7 @@
public URL buildQueryURL() throws MalformedURLException
{
// Building url - and only allow UWA compatible widgets (type=uwa)
- StringBuffer buffer = new StringBuffer("http://eco.netvibes.com/rss.php?synd=jboss&type=" + type);
+ StringBuffer buffer = new StringBuffer("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=" + type);
if( start > 0 )
{
buffer.append("&start=").append(start);
16 years, 5 months
JBoss Portal SVN: r9336 - branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-12-11 11:40:16 -0500 (Tue, 11 Dec 2007)
New Revision: 9336
Modified:
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java
Log:
oops - test case update
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2007-12-11 15:13:42 UTC (rev 9335)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesQueryTestCase.java 2007-12-11 16:40:16 UTC (rev 9336)
@@ -36,14 +36,14 @@
public void test01() throws Exception
{
NetvibesQuery q = new NetvibesQuery(0, 10, "14", "top", "foo");
- assertEquals("http://eco.netvibes.com/rss.php?synd=jboss&type=uwa&count=10&cat=14&sort=...", q.buildQueryURL().toString());
+ assertEquals("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=uwa&count=10&cat=...", q.buildQueryURL().toString());
}
public void test02() throws Exception
{
NetvibesQuery q = new NetvibesQuery(1, 11, "5", "foo", "bar");
- assertEquals("http://eco.netvibes.com/rss.php?synd=jboss&type=uwa&start=1&count=11&cat=...", q.buildQueryURL().toString());
+ assertEquals("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=uwa&start=1&count...", q.buildQueryURL().toString());
}
public void test03()
16 years, 5 months
JBoss Portal SVN: r9335 - branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider.
by portal-commits＠lists.jboss.org
Author: emuckenhuber
Date: 2007-12-11 10:13:42 -0500 (Tue, 11 Dec 2007)
New Revision: 9335
Modified:
branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
Log:
use partner rss to get the correct information
Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2007-12-11 07:42:08 UTC (rev 9334)
+++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesQuery.java 2007-12-11 15:13:42 UTC (rev 9335)
@@ -133,7 +133,7 @@
public URL buildQueryURL() throws MalformedURLException
{
// Building url - and only allow UWA compatible widgets (type=uwa)
- StringBuffer buffer = new StringBuffer("http://eco.netvibes.com/rss.php?synd=jboss&type=" + type);
+ StringBuffer buffer = new StringBuffer("http://eco.netvibes.com/rss-partner.php?synd=jboss&type=" + type);
if( start > 0 )
{
buffer.append("&start=").append(start);
16 years, 5 months
JBoss Portal SVN: r9334 - demo/trunk/conf/core-cms/default-content/default.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-11 02:42:08 -0500 (Tue, 11 Dec 2007)
New Revision: 9334
Modified:
demo/trunk/conf/core-cms/default-content/default/login.html
demo/trunk/conf/core-cms/default-content/default/widgets.html
Log:
minor
Modified: demo/trunk/conf/core-cms/default-content/default/login.html
===================================================================
--- demo/trunk/conf/core-cms/default-content/default/login.html 2007-12-11 02:10:11 UTC (rev 9333)
+++ demo/trunk/conf/core-cms/default-content/default/login.html 2007-12-11 07:42:08 UTC (rev 9334)
@@ -1,3 +1,4 @@
+<div style="padding: 0pt 10px">
<h3>Credentials</h3>
<p>To access the portal as a simple user, please use:
<ul>
@@ -8,3 +9,4 @@
<p>To access the portal with <b>full administrator rights</b>, please <b>register</b>.
The data are not kept and for your own security please do not use a real email address or
any valuable password.</p>
+</div>
\ No newline at end of file
Modified: demo/trunk/conf/core-cms/default-content/default/widgets.html
===================================================================
--- demo/trunk/conf/core-cms/default-content/default/widgets.html 2007-12-11 02:10:11 UTC (rev 9333)
+++ demo/trunk/conf/core-cms/default-content/default/widgets.html 2007-12-11 07:42:08 UTC (rev 9334)
@@ -1,3 +1,5 @@
+<div style="padding: 0pt 10px">
<h3>Widgets integration</h3>
<p>Here you will find several widgets either from <a target="_blank" href="http://www.google.com/ig">iGoogle</a> or <a target="_blank" href="http://eco.netvibes.com">Netvibes (UWA widgets only)</a>.
-Also please note that those widgets come from various people around the world and may or may not work.</p>
\ No newline at end of file
+Also please note that those widgets come from various people around the world and may or may not work.</p>
+</div>
\ No newline at end of file
16 years, 5 months
JBoss Portal SVN: r9333 - in branches/JBoss_Portal_Branch_2_6/wsrp/src: resources/portal-wsrp-sar/xsd and 1 other directory.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-12-10 21:10:11 -0500 (Mon, 10 Dec 2007)
New Revision: 9333
Modified:
branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
Log:
- Use a resolver to retrieve xml.xsd instead of retrieving it over the wire.
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2007-12-10 16:57:16 UTC (rev 9332)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerConfigurationServiceImpl.java 2007-12-11 02:10:11 UTC (rev 9333)
@@ -37,6 +37,7 @@
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
import org.jboss.xb.binding.XercesXsMarshaller;
+import org.jboss.xb.binding.sunday.unmarshalling.DefaultSchemaResolver;
import javax.management.MBeanServer;
import javax.management.ObjectName;
@@ -62,10 +63,19 @@
private String configLocation;
private ProducerConfiguration configuration;
-
private File dataDir;
private File config;
+ private static DefaultSchemaResolver RESOLVER;
+
+ static
+ {
+ RESOLVER = new DefaultSchemaResolver();
+ RESOLVER.setCacheResolvedSchemas(true);
+ RESOLVER.addSchemaLocation("http://www.w3.org/XML/1998/namespace", "xsd/xml.xsd");
+ RESOLVER.addSchemaLocation("urn:jboss:portal:wsrp:producer:v2_6", "xsd/jboss-wsrp-producer_2_6.xsd");
+ }
+
public String getConfigLocation()
{
return configLocation;
@@ -99,11 +109,6 @@
reloadConfiguration();
}
- protected void stopService() throws Exception
- {
- saveConfiguration();
- }
-
public void reloadConfiguration() throws Exception
{
URL configURL = getConfigLocationURL();
@@ -179,6 +184,8 @@
// create an instance of XML Schema marshaller
XercesXsMarshaller marshaller = new XercesXsMarshaller();
+ marshaller.setSchemaResolver(RESOLVER);
+
// we need to specify what elements are top most (roots) providing namespace URI, prefix and local name
marshaller.addRootElement("urn:jboss:portal:wsrp:producer:v2_6", "", "producer-configuration");
@@ -187,7 +194,7 @@
// add schema location by declaring xsi namespace and adding xsi:schemaLocation attribute
marshaller.declareNamespace("xsi", "http://www.w3.org/2001/XMLSchema-instance");
- marshaller.addAttribute("xsi", "schemaLocation", "string", "urn:jboss:portal:wsrp:producer:v2_6 xsd/jboss-wsrp-producer_2_6.xsd");
+ marshaller.addAttribute("xsi", "schemaLocation", "string", "urn:jboss:portal:wsrp:producer:v2_6");
// create an instance of Object Model Provider
ObjectModelProvider provider = new ProducerConfigurationProvider();
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2007-12-10 16:57:16 UTC (rev 9332)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/src/resources/portal-wsrp-sar/xsd/jboss-wsrp-producer_2_6.xsd 2007-12-11 02:10:11 UTC (rev 9333)
@@ -28,7 +28,7 @@
xmlns:xml="http://www.w3.org/XML/1998/namespace"
xmlns:wpc="urn:jboss:portal:wsrp:producer:v2_6">
- <xs:import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>
+ <xs:import namespace="http://www.w3.org/XML/1998/namespace"/>
<xs:element name="producer-configuration">
<xs:complexType>
16 years, 5 months
JBoss Portal SVN: r9332 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/impl/portlet/info and 5 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-10 11:57:16 -0500 (Mon, 10 Dec 2007)
New Revision: 9332
Modified:
branches/JBoss_Portal_Branch_2_6/build/distrib.xml
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java
Log:
Sync with 2.6.3
- Remove vertical bar on index page
- Adding a server interceptor to stick the portal context path into the request
- Fix the modal login window so that it works with other portal context path
- delete relationship before deleting a customization
- JBPORTAL-1839 - problem with deployment of clustered portal
Modified: branches/JBoss_Portal_Branch_2_6/build/distrib.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/build/distrib.xml 2007-12-10 16:57:16 UTC (rev 9332)
@@ -2,7 +2,7 @@
<property name="source.dir" value="../../jboss-portal-2.6"/>
<property name="docs.dir" value="${source.dir}-docs"/>
- <property name="release.version" value="2.6.3.SNAPSHOT"/>
+ <property name="release.version" value="2.6.SNAPSHOT"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 16:57:16 UTC (rev 9332)
@@ -47,7 +47,15 @@
public PortletIconInfo getPortletIconInfo()
{
- return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon());
+ if (portletInfoMetaData.getPortletIcon() != null)
+ {
+ return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon());
+ }
+ else
+ {
+ return null;
+ }
+
}
}
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/test/core/model/instance/BackwardCompatibilityInstanceTestCase.java 2007-12-10 16:57:16 UTC (rev 9332)
@@ -48,6 +48,7 @@
import org.hibernate.tool.hbm2ddl.SchemaUpdate;
import org.jboss.portal.common.junit.TransactionAssert;
import org.jboss.portal.common.value.StringValue;
+import org.jboss.portal.common.i18n.LocalizedString;
import org.jboss.portal.core.impl.model.instance.InstanceContainerImpl;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.portlet.invocation.PortletInvocation;
@@ -195,7 +196,9 @@
session.beginTransaction();
Query query = session.createQuery("From PersistentInstanceDefinition");
Instance instance = (Instance)query.uniqueResult();
- assertEquals(null, instance.getDisplayName().getDefaultValue());
+ assertNotNull(instance);
+ LocalizedString lString = instance.getDisplayName();
+ assertEquals(null, lString.getDefaultValue());
}
public PortletInvokerSupport getPortletContainer()
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/InstanceManagerBean.java 2007-12-10 16:57:16 UTC (rev 9332)
@@ -369,14 +369,17 @@
{
String id = (String)ae.getComponent().getAttributes().get("instanceId");
- //
- instanceContainer.destroyDefinition(id);
+ if (id != null)
+ {
+ //
+ instanceContainer.destroyDefinition(id);
- //
- selectedId = null;
- selectedPrefs = null;
- selectedFrom = 0;
- selectedPlugin = null;
+ //
+ selectedId = null;
+ selectedPrefs = null;
+ selectedFrom = 0;
+ selectedPlugin = null;
+ }
}
catch (NoSuchInstanceException e)
{
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/portlet.xml 2007-12-10 16:57:16 UTC (rev 9332)
@@ -54,7 +54,7 @@
<name>default-view</name>
<value>/WEB-INF/jsf/dashboard/dashboard.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
+ <expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2007-12-10 16:57:16 UTC (rev 9332)
@@ -9,13 +9,10 @@
}
#welcomegreybox {
- padding: 15px;
margin-bottom: 30px;
}
#welcomegreyboxTD {
- border-left: 1px solid #d5d5d5;
- padding-left: 15px;
}
#welcomegreybox h3 {
@@ -33,7 +30,7 @@
publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help
enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license
combined with a flexible and scalable underling platform.</p>
-
+<br />
<div id="welcomegreybox">
<table width="100%">
<tr>
Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-12-10 16:32:14 UTC (rev 9331)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-war/WEB-INF/portlet.xml 2007-12-10 16:57:16 UTC (rev 9332)
@@ -37,7 +37,7 @@
<name>default-view</name>
<value>/WEB-INF/jsf/index.xhtml</value>
</init-param>
- <expiration-cache>-1</expiration-cache>
+ <expiration-cache>0</expiration-cache>
<supports>
<mime-type>text/html</mime-type>
<portlet-mode>VIEW</portlet-mode>
16 years, 5 months
JBoss Portal SVN: r9331 - tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-10 11:32:14 -0500 (Mon, 10 Dec 2007)
New Revision: 9331
Modified:
tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java
Log:
Doh !
Modified: tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java
===================================================================
--- tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 15:57:53 UTC (rev 9330)
+++ tags/JBoss_Portal_2_6_3/core/src/main/org/jboss/portal/core/impl/portlet/info/PortletInfoInfoImpl.java 2007-12-10 16:32:14 UTC (rev 9331)
@@ -47,7 +47,15 @@
public PortletIconInfo getPortletIconInfo()
{
- return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon());
+ if (portletInfoMetaData.getPortletIcon() != null)
+ {
+ return new PortletIconInfoImpl(portletApplicationContext, portletInfoMetaData.getPortletIcon());
+ }
+ else
+ {
+ return null;
+ }
+
}
}
16 years, 5 months
JBoss Portal SVN: r9330 - demo/trunk.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-10 10:57:53 -0500 (Mon, 10 Dec 2007)
New Revision: 9330
Modified:
demo/trunk/Readme.txt
Log:
Minor
Modified: demo/trunk/Readme.txt
===================================================================
--- demo/trunk/Readme.txt 2007-12-10 15:46:17 UTC (rev 9329)
+++ demo/trunk/Readme.txt 2007-12-10 15:57:53 UTC (rev 9330)
@@ -17,5 +17,8 @@
4 - Update the link
demoportal$ ln -s jboss-portal-x.y.z jboss
-5 - Start the server again
+5 - Modify the admin password in:
+jboss/server/default/deploy/jboss-portal.sar/conf/hibernate/user/setup.txt
+
+6 - Start the server again
theute$ sudo /etc/init.d/demoportal start
\ No newline at end of file
16 years, 5 months
JBoss Portal SVN: r9329 - in demo/trunk: conf and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-12-10 10:46:17 -0500 (Mon, 10 Dec 2007)
New Revision: 9329
Modified:
demo/trunk/build.xml
demo/trunk/conf/default-object.xml
demo/trunk/portlets/jbosswiki/wiki-common.jar
Log:
Demo update (Wiki changes)
Modified: demo/trunk/build.xml
===================================================================
--- demo/trunk/build.xml 2007-12-10 13:30:26 UTC (rev 9328)
+++ demo/trunk/build.xml 2007-12-10 15:46:17 UTC (rev 9329)
@@ -110,6 +110,7 @@
<copy todir="${destination.dir}/${portal.name.dir}/server/default/deploy">
<fileset dir="${tmp.dir}/jbosswiki"/>
</copy>
+ <delete file="${destination.dir}/${portal.name.dir}/server/default/deploy/wiki.ear/wiki.war/WEB-INF/wiki-object.xml"/>
</target>
<target name="default-cms-content">
Modified: demo/trunk/conf/default-object.xml
===================================================================
--- demo/trunk/conf/default-object.xml 2007-12-10 13:30:26 UTC (rev 9328)
+++ demo/trunk/conf/default-object.xml 2007-12-10 15:46:17 UTC (rev 9329)
@@ -290,6 +290,22 @@
<height>0</height>
</window>
</page>
+ <page>
+ <page-name>Wiki</page-name>
+ <window>
+ <window-name>JBossWikiWindow</window-name>
+ <instance-ref>WikiPortletInstance</instance-ref>
+ <properties>
+ <property>
+ <name>theme.renderSetId</name>
+ <value>emptyRenderer</value>
+ </property>
+ </properties>
+ <region>center</region>
+ <initial-window-state>maximized</initial-window-state>
+ <height>0</height>
+ </window>
+ </page>
</portal>
</deployment>
<deployment>
Modified: demo/trunk/portlets/jbosswiki/wiki-common.jar
===================================================================
(Binary files differ)
16 years, 5 months
JBoss Portal SVN: r9328 - branches/JBoss_Portal_Branch_2_6/widget.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2007-12-10 08:30:26 -0500 (Mon, 10 Dec 2007)
New Revision: 9328
Modified:
branches/JBoss_Portal_Branch_2_6/widget/.classpath
Log:
module-common don't exist..... I removed it
Modified: branches/JBoss_Portal_Branch_2_6/widget/.classpath
===================================================================
--- branches/JBoss_Portal_Branch_2_6/widget/.classpath 2007-12-09 22:39:42 UTC (rev 9327)
+++ branches/JBoss_Portal_Branch_2_6/widget/.classpath 2007-12-10 13:30:26 UTC (rev 9328)
@@ -7,7 +7,6 @@
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/portlet/lib/portal-portlet-jsr168api-lib.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/module-common"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
16 years, 5 months