gatein SVN: r1743 - portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-16 07:56:26 -0500 (Tue, 16 Feb 2010)
New Revision: 1743
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java
Log:
- Log a warning instead of throwing an exception if WSRP is started several times.
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-02-16 12:43:47 UTC (rev 1742)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ExoKernelIntegration.java 2010-02-16 12:56:26 UTC (rev 1743)
@@ -27,6 +27,8 @@
import org.exoplatform.container.ExoContainerContext;
import org.exoplatform.container.configuration.ConfigurationManager;
import org.exoplatform.container.xml.InitParams;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.pc.api.PortletInvoker;
import org.gatein.pc.federation.FederatingPortletInvoker;
import org.gatein.pc.portlet.container.ContainerPortletInvoker;
@@ -60,6 +62,8 @@
*/
public class ExoKernelIntegration implements Startable
{
+ private static final Logger log = LoggerFactory.getLogger(ExoKernelIntegration.class);
+
private static final String CLASSPATH = "classpath:/";
private static final String PRODUCER_CONFIG_LOCATION = "producerConfigLocation";
private static final String CONSUMERS_CONFIG_LOCATION = "consumersConfigLocation";
@@ -105,7 +109,13 @@
}
else
{
- throw new IllegalStateException("The WSRP service can only be started in the default portal context.");
+ log.warn("The WSRP service can only be started in the default portal context. WSRP was not started for '"
+ + context.getName() + "'");
+
+ producerConfigLocation = null;
+ consumersConfigLocation = null;
+ configurationIS = null;
+ bypass = true;
}
}
14 years, 10 months
gatein SVN: r1742 - in components/pc/trunk/federation/src: main/java/org/gatein/pc/federation/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2010-02-16 07:43:47 -0500 (Tue, 16 Feb 2010)
New Revision: 1742
Modified:
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/NullInvokerHandler.java
components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
Log:
- Added callingInvoker parameter to NullInvokerHandler.resolvePortletInvokerFor method so that the handler can call back to the calling invoker if needed.
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/NullInvokerHandler.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/NullInvokerHandler.java 2010-02-16 12:28:36 UTC (rev 1741)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/NullInvokerHandler.java 2010-02-16 12:43:47 UTC (rev 1742)
@@ -36,11 +36,13 @@
{
NullInvokerHandler DEFAULT_HANDLER = new NullInvokerHandler()
{
- public FederatedPortletInvoker resolvePortletInvokerFor(String compoundPortletId, String invokerId) throws NoSuchPortletException
+ public FederatedPortletInvoker resolvePortletInvokerFor(String compoundPortletId, String invokerId,
+ FederatingPortletInvoker callingInvoker) throws NoSuchPortletException
{
throw new NoSuchPortletException(compoundPortletId);
}
};
- FederatedPortletInvoker resolvePortletInvokerFor(String compoundPortletId, String invokerId) throws NoSuchPortletException;
+ FederatedPortletInvoker resolvePortletInvokerFor(String compoundPortletId, String invokerId,
+ FederatingPortletInvoker callingInvoker) throws NoSuchPortletException;
}
Modified: components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java
===================================================================
--- components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-02-16 12:28:36 UTC (rev 1741)
+++ components/pc/trunk/federation/src/main/java/org/gatein/pc/federation/impl/FederatingPortletInvokerService.java 2010-02-16 12:43:47 UTC (rev 1742)
@@ -274,7 +274,7 @@
FederatedPortletInvoker federated = registry.get(invokerId);
if (federated == null)
{
- return nullHandler.resolvePortletInvokerFor(compoundPortletId, invokerId);
+ return nullHandler.resolvePortletInvokerFor(compoundPortletId, invokerId, this);
}
//
Modified: components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java
===================================================================
--- components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2010-02-16 12:28:36 UTC (rev 1741)
+++ components/pc/trunk/federation/src/test/java/org/gatein/pc/federation/FederatingPortletInvokerTestCase.java 2010-02-16 12:43:47 UTC (rev 1742)
@@ -205,8 +205,9 @@
federatingInvoker.setNullInvokerHandler(new NullInvokerHandler()
{
- public FederatedPortletInvoker resolvePortletInvokerFor(String compoundPortletId, String invokerId) throws NoSuchPortletException
+ public FederatedPortletInvoker resolvePortletInvokerFor(String compoundPortletId, String invokerId, FederatingPortletInvoker callingInvoker) throws NoSuchPortletException
{
+ assertEquals(federatingInvoker, callingInvoker);
return remote;
}
});
14 years, 10 months
gatein SVN: r1740 - portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:50:21 -0500 (Tue, 16 Feb 2010)
New Revision: 1740
Modified:
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
Log:
CR1
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_en.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -35,7 +35,7 @@
UIHomePagePortlet.Label.Title=Try GateIn 3.0 with one of these user accounts:
UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 5</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.GuideText=For more information, please contact us.
UIHomePagePortlet.Label.IntroText=GateIn is the new generation of Open Source portal, jointly led by Red Hat and eXo Platform who partner to gather the best portal experts and communities around a robust and intuitive portal that brings rich administration functionalities to IT systems.
UIHomePagePortlet.Label.Administrator=Administrator
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_es.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -35,7 +35,7 @@
UIHomePagePortlet.Label.Title=Prueba GateIn 3.0 con uno de los siguientes usuarios:
UIHomePagePortlet.Label.Intro=La nueva versi\u00f3n viene con un interfaz de usuario revolucionario<br/>Layouts Cl\u00e1sico y Escritorio WebOS <br/> Funcionalidad Drag and Drop. Asistente de Creaci\u00f3n de P\u00e1gina<br/>Y mucho m\u00e1s...
-UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn 3.0 Beta 4</div>
+UIHomePagePortlet.Label.Slogan=Lo mejor de eXo y JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=Usuario:
UIHomePagePortlet.Label.Password=Contrase\u00f1a:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_it.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -35,7 +35,7 @@
UIHomePagePortlet.Label.Title=Prova GateIn 3.0 con uno di questi account utente:
UIHomePagePortlet.Label.Intro=La nuova versione nasce con una moderna interfaccia utente<br/>Layout Classici e WebOS Desktop<br/> Funzionalit\u00E0 di Drag and Drop. Wizard di creazione della pagina<br/>E oltre...
-UIHomePagePortlet.Label.Slogan=Il meglio di eXo e JBoss Portal<div>GateIn 3.0 Beta 5</div>
+UIHomePagePortlet.Label.Slogan=Il meglio di eXo e JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=Nome utente:
UIHomePagePortlet.Label.Password=Password:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ja.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -41,7 +41,7 @@
UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 5</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=\u30e6\u30fc\u30b6\u30fc\u540d:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ko.xml 2010-02-16 11:50:21 UTC (rev 1740)
@@ -26,7 +26,7 @@
<Label>
<Title>사용자 계정들 중 하나와 함께 GateIn 3.0을 시도하십시오.</Title>
<Intro>새로운 버전에 혁신적인 사용자 인터페이스가 추가됩니다. <br/>표준 및 WebOS 데스크탑 레이아웃<br/> 드래그 앤 드롭 기능들. 페이지 생성 마법사<br/>기타 부가 기능.</Intro>
- <Slogan>최고의 eXo 및 JBoss Portal<div>GateIn 3.0 Beta 5</div></Slogan>
+ <Slogan>최고의 eXo 및 JBoss Portal<div>GateIn 3.0 CR1</div></Slogan>
<Username>사용자이름:</Username>
<Password>비밀번호:</Password>
</Label>
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ne.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -35,7 +35,7 @@
UIHomePagePortlet.Label.Title=\u092f\u0940 \u092e\u0927\u094d\u092f\u0947 \u0915\u0941\u0928\u0948 \u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0916\u093e\u0924\u093e\u0939\u0930\u0941\u0932\u0947 GateIn 3.0\u092e\u093e \u092a\u094d\u0930\u092f\u093e\u0938 \u0917\u0930\u094d\u0928\u0941\u0939\u094b\u0938\u094d
UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 4</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=\u092a\u094d\u0930\u092f\u094b\u0917\u0915\u0930\u094d\u0924\u093e \u0928\u093e\u092e:
UIHomePagePortlet.Label.Password=\u092a\u093e\u0938\u094d\u0935\u094b\u0930\u094d\u0921:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_nl.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -35,7 +35,7 @@
UIHomePagePortlet.Label.Title=Probeer GateIn 3.0 met \u00E9\u00E9n van deze gebruikersaccounts:
UIHomePagePortlet.Label.Intro=De nieuwe versie komt met een revolutionaire gebruikersinterface<br/>Klassieke en WebOS desktop lay-outs<br/> Drag and drop mogelijkheden. Pagina creatie wizard<br/>En nog veel meer ...
-UIHomePagePortlet.Label.Slogan=Het beste van eXo en JBoss Portal<div>GateIn 3.0 Beta 4</div>
+UIHomePagePortlet.Label.Slogan=Het beste van eXo en JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=Gebruikersnaam:
UIHomePagePortlet.Label.Password=Paswoord:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_ru.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -16,6 +16,6 @@
UIHomePagePortlet.Label.Title=Используйте GateIn 3.0 с одной из учётных записей:
UIHomePagePortlet.Label.Intro=Новая версия представляет революционно новый пользовательский интерфейс<br/>Класический и WebOS макеты<br/> Поддержка перетаскивания. Мастера создания страниц<br/>И многое другое...
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 5</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=Имя:
UIHomePagePortlet.Label.Password=Пароль:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_uk.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -17,6 +17,6 @@
UIHomePagePortlet.Label.Title=Спробуй GateIn 3.0 з користувачем серед таких облікових записів:
UIHomePagePortlet.Label.Intro=Нова версія з прогресивним інтерфейсом користувача<br/>схема класичного та WebOS робочого столу<br/> Можливість "Перетягни-відпусти". Wizard-створювач сторінок<br/>Та багато іншого...
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 5</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.Username=Ім'я користувача:
UIHomePagePortlet.Label.Password=Пароль:
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_vi.properties 2010-02-16 11:50:21 UTC (rev 1740)
@@ -35,7 +35,7 @@
UIHomePagePortlet.Label.Title=Dùng thử GateIn 3.0 với một trong những tài khoản sau:
UIHomePagePortlet.Label.Intro=The new version comes with a revolutionary user interface<br/>Classic and WebOS Desktop Layouts<br/> Drag and Drop Features. Create Page Wizard<br/>And many more...
-UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 Beta 5</div>
+UIHomePagePortlet.Label.Slogan=The Best of eXo and JBoss Portal<div>GateIn 3.0 CR1</div>
UIHomePagePortlet.Label.GuideText=Để biết thêm thông tin xin hãy liên lạc với chúng tôi.
UIHomePagePortlet.Label.IntroText=GateIn là cổng thông tin thế hệ mới kết hợp giữa Red Hat và eXo Platform, tập trung những chuyên gia về cổng thông tin và cộng đồng tốt nhất, mang lại cho các hệ thống thông tin những tính năng đầy đủ nhất.
UIHomePagePortlet.Label.Administrator=Quản trị
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh.xml 2010-02-16 11:50:21 UTC (rev 1740)
@@ -26,7 +26,7 @@
<Label>
<Title>用一个用户帐户尝试GateIn 3.0：</Title>
<Intro>新版本增加了新的用户界面<br/>经典和WebOS桌面布局<br/>拖放功能,创建页向导<br/>等等。。。</Intro>
- <Slogan>eXo和JBoss Portal最好的门户平台<div>GateIn 3.0 Beta 4</div></Slogan>
+ <Slogan>eXo和JBoss Portal最好的门户平台<div>GateIn 3.0 CR1</div></Slogan>
<Username>用户名：</Username>
<Password>密码：</Password>
</Label>
Modified: portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml
===================================================================
--- portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml 2010-02-16 11:38:14 UTC (rev 1739)
+++ portal/trunk/portlet/web/src/main/webapp/WEB-INF/classes/locale/portlet/web/GroovyPortlet_zh_TW.xml 2010-02-16 11:50:21 UTC (rev 1740)
@@ -25,7 +25,7 @@
<Label>
<Title>讓你感受全新體驗的 JBoss GateIn 3.0：</Title>
<Intro>新版本增加了新的Web 2.0界面<br/>經典和WebOS桌面佈局<br/>拖放功能,頁面導覽<br/>等等。 。 。</Intro>
-<Slogan>eXo和JBoss Portal最好的Portal平台<div>GateIn 3.0</div></Slogan>
+<Slogan>eXo和JBoss Portal最好的Portal平台<div>GateIn 3.0 CR1</div></Slogan>
<Username>用戶名：</Username>
<Password>密碼：</Password>
</Label>
14 years, 10 months
gatein SVN: r1739 - in portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp: state/producer/registrations/mapping and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:38:14 -0500 (Tue, 16 Feb 2010)
New Revision: 1739
Modified:
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ActivatingFederatingPortletInvoker.java
portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java
Log:
Remove non-UTF8 characters
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ActivatingFederatingPortletInvoker.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ActivatingFederatingPortletInvoker.java 2010-02-16 11:37:29 UTC (rev 1738)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/ActivatingFederatingPortletInvoker.java 2010-02-16 11:38:14 UTC (rev 1739)
@@ -261,7 +261,7 @@
String invokerId = compoundPortletId.substring(0, pos);
FederatedPortletInvoker federated = registry.get(invokerId);
- // if we didn't find the invoker, ask the ConsumerRegistry�
+ // if we didn't find the invoker, ask the ConsumerRegistry
if (federated == null)
{
WSRPConsumer consumer = consumerRegistry.getConsumer(invokerId);
Modified: portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java
===================================================================
--- portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-02-16 11:37:29 UTC (rev 1738)
+++ portal/trunk/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/registrations/mapping/RegistrationPropertiesMapping.java 2010-02-16 11:38:14 UTC (rev 1739)
@@ -42,7 +42,7 @@
{
public static final String NODE_NAME = "wsrp:registrationproperties";
- /** Need to ignore JCR properties for now until scoping mechanism exists on @Properties� */
+ /** Need to ignore JCR properties for now until scoping mechanism exists on @Properties */
private static final Set<String> propertiesBlackList = Tools.set("jcr:uuid", "jcr:primaryType");
@Properties
14 years, 10 months
gatein SVN: r1738 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:37:29 -0500 (Tue, 16 Feb 2010)
New Revision: 1738
Modified:
portal/trunk/pom.xml
Log:
Need to rollback, WSRP won't compile anymore
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-02-16 11:23:53 UTC (rev 1737)
+++ portal/trunk/pom.xml 2010-02-16 11:37:29 UTC (rev 1738)
@@ -46,7 +46,7 @@
<org.shindig.version>SNAPSHOT-r790473</org.shindig.version>
<org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version>
- <org.gatein.pc.version>2.1.0-CR03</org.gatein.pc.version>
+ <org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.Beta5</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta07</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.0-CR02</org.gatein.mop.version>
14 years, 10 months
gatein SVN: r1737 - in portal/trunk: server/tomcat/patch/src/main/tomcat/bin and 2 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:23:53 -0500 (Tue, 16 Feb 2010)
New Revision: 1737
Modified:
portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
Log:
Externalizing configuration didn't work well because of the extension mechanism
Modified: portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-16 11:22:37 UTC (rev 1736)
+++ portal/trunk/component/common/src/main/java/conf/configuration-jboss.properties 2010-02-16 11:23:53 UTC (rev 1737)
@@ -28,11 +28,6 @@
gatein.jcr.datasource.name=java:jdbcjcr
gatein.jcr.datasource.dialect=auto
-gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr
-gatein.jcr.datasource.username=sa
-gatein.jcr.datasource.password=
-gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver
-
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
@@ -40,9 +35,4 @@
# IDM
gatein.idm.datasource.name=java:jdbcidm
-gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
-gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm
-gatein.idm.datasource.username=sa
-gatein.idm.datasource.password=
-gatein.idm.datasource.driver=org.hsqldb.jdbcDriver
Modified: portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-16 11:22:37 UTC (rev 1736)
+++ portal/trunk/component/common/src/main/java/conf/configuration-tomcat.properties 2010-02-16 11:23:53 UTC (rev 1737)
@@ -18,7 +18,7 @@
#
# Data
-gatein.data.dir=../temp
+gatein.data.dir=../gatein/data
# DB
gatein.db.data.dir=${gatein.data.dir}/db
@@ -28,11 +28,6 @@
gatein.jcr.datasource.name=jdbcjcr
gatein.jcr.datasource.dialect=auto
-gatein.jcr.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr
-gatein.jcr.datasource.username=sa
-gatein.jcr.datasource.password=
-gatein.jcr.datasource.driver=org.hsqldb.jdbcDriver
-
gatein.jcr.data.dir=${gatein.data.dir}/jcr
gatein.jcr.storage.data.dir=${gatein.jcr.data.dir}/values
gatein.jcr.index.data.dir=${gatein.jcr.data.dir}/lucene
@@ -40,9 +35,3 @@
# IDM
gatein.idm.datasource.name=jdbcidm
-gatein.idm.datasource.dialect=org.hibernate.dialect.HSQLDialect
-
-gatein.idm.datasource.url=jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm
-gatein.idm.datasource.username=sa
-gatein.idm.datasource.password=
-gatein.idm.datasource.driver=org.hsqldb.jdbcDriver
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-16 11:22:37 UTC (rev 1736)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein-dev.sh 2010-02-16 11:23:53 UTC (rev 1737)
@@ -24,7 +24,7 @@
# Sets some variables
LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=true -Dexo.properties.url=../conf/gatein/configuration.properties"
+EXO_OPTS="-Dexo.product.developing=true"
EXO_CONFIG_OPTS="-Xshare:auto -Xms128m -Xmx512m -Dorg.exoplatform.container.configuration.debug"
JPDA_TRANSPORT=dt_socket
Modified: portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh
===================================================================
--- portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-16 11:22:37 UTC (rev 1736)
+++ portal/trunk/server/tomcat/patch/src/main/tomcat/bin/gatein.sh 2010-02-16 11:23:53 UTC (rev 1737)
@@ -27,7 +27,7 @@
# Sets some variables
LOG_OPTS="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.SimpleLog"
SECURITY_OPTS="-Djava.security.auth.login.config=../conf/jaas.conf"
-EXO_OPTS="-Dexo.product.developing=false -Dexo.properties.url=../conf/gatein/configuration.properties"
+EXO_OPTS="-Dexo.product.developing=false"
JAVA_OPTS="-Xshare:auto -Xms128m -Xmx512m $JAVA_OPTS $LOG_OPTS $SECURITY_OPTS $EXO_OPTS"
export JAVA_OPTS
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-16 11:22:37 UTC (rev 1736)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2010-02-16 11:23:53 UTC (rev 1737)
@@ -148,10 +148,10 @@
<properties-param>
<name>ref-addresses</name>
<description>ref-addresses</description>
- <property name="driverClassName" value="${gatein.jcr.datasource.driver}"/>
- <property name="url" value="${gatein.jcr.datasource.url}${container.name.suffix}"/>
- <property name="username" value="${gatein.jcr.datasource.username}"/>
- <property name="password" value="${gatein.jcr.datasource.password}"/>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcjcr${container.name.suffix}"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
</properties-param>
</init-params>
</component-plugin>
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-16 11:22:37 UTC (rev 1736)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml 2010-02-16 11:23:53 UTC (rev 1737)
@@ -42,7 +42,10 @@
<property name="hibernate.cglib.use_reflection_optimizer" value="true"/>
<property name="hibernate.connection.datasource" value="${gatein.idm.datasource.name}${container.name.suffix}"/>
<property name="hibernate.connection.autocommit" value="true"/>
- <property name="hibernate.dialect" value="${gatein.idm.datasource.dialect}"/>
+ <!--
+ Should be automatically detected. Force otherwise
+ <property name="hibernate.dialect" value="org.hibernate.dialect.XXXDialect"/>
+ -->
</properties-param>
</init-params>
</component>
@@ -197,10 +200,10 @@
<properties-param>
<name>ref-addresses</name>
<description>ref-addresses</description>
- <property name="driverClassName" value="${gatein.idm.datasource.driver}"/>
- <property name="url" value="${gatein.idm.datasource.url}${container.name.suffix}"/>
- <property name="username" value="${gatein.idm.datasource.username}"/>
- <property name="password" value="${gatein.idm.datasource.password}"/>
+ <property name="driverClassName" value="org.hsqldb.jdbcDriver"/>
+ <property name="url" value="jdbc:hsqldb:file:${gatein.db.data.dir}/data/jdbcidm${container.name.suffix}"/>
+ <property name="username" value="sa"/>
+ <property name="password" value=""/>
</properties-param>
</init-params>
</component-plugin>
14 years, 10 months
gatein SVN: r1736 - portal/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:22:37 -0500 (Tue, 16 Feb 2010)
New Revision: 1736
Modified:
portal/trunk/pom.xml
Log:
Use PC 2.1.0-CR03
Modified: portal/trunk/pom.xml
===================================================================
--- portal/trunk/pom.xml 2010-02-16 11:21:48 UTC (rev 1735)
+++ portal/trunk/pom.xml 2010-02-16 11:22:37 UTC (rev 1736)
@@ -46,7 +46,7 @@
<org.shindig.version>SNAPSHOT-r790473</org.shindig.version>
<org.gatein.common.version>2.0.0-CR03</org.gatein.common.version>
<org.gatein.wci.version>2.0.0-CR02</org.gatein.wci.version>
- <org.gatein.pc.version>2.1.0-CR02</org.gatein.pc.version>
+ <org.gatein.pc.version>2.1.0-CR03</org.gatein.pc.version>
<org.picketlink.idm>1.1.0.Beta5</org.picketlink.idm>
<org.gatein.wsrp.version>1.0.0-Beta07</org.gatein.wsrp.version>
<org.gatein.mop.version>1.0.0-CR02</org.gatein.mop.version>
14 years, 10 months
gatein SVN: r1735 - portal/trunk/packaging/product/src/main/javascript.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:21:48 -0500 (Tue, 16 Feb 2010)
New Revision: 1735
Modified:
portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js
Log:
Remove c3p0 from packaging
Modified: portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js
===================================================================
--- portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-02-16 11:21:27 UTC (rev 1734)
+++ portal/trunk/packaging/product/src/main/javascript/portal.packaging.product.js 2010-02-16 11:21:48 UTC (rev 1735)
@@ -54,6 +54,8 @@
/* cleanup duplicated lib */
product.removeDependency(new Project("commons-httpclient", "commons-httpclient", "jar", "3.0"));
product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1"));
+ product.removeDependency(new Project("commons-collections", "commons-collections", "jar", "3.1"));
+ product.removeDependency(new Project("c3p0", "c3p0", "jar", "0.9.1.2"));
product.module = portal ;
product.dependencyModule = [ kernel, core, ws, eXoJcr];
14 years, 10 months
gatein SVN: r1734 - in portal/trunk: packaging/pkg and 1 other directory.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 06:21:27 -0500 (Tue, 16 Feb 2010)
New Revision: 1734
Modified:
portal/trunk/component/common/src/main/java/conf/configuration.xml
portal/trunk/packaging/pkg/pom.xml
Log:
- Use configuration file from $TOMCAT_HOME/gatein/conf/configuration.properties
- Explode 02portal.war in JBoss
Modified: portal/trunk/component/common/src/main/java/conf/configuration.xml
===================================================================
--- portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-02-16 11:02:56 UTC (rev 1733)
+++ portal/trunk/component/common/src/main/java/conf/configuration.xml 2010-02-16 11:21:27 UTC (rev 1734)
@@ -31,7 +31,7 @@
<init-params>
<value-param profiles="tomcat">
<name>properties.url</name>
- <value>jar:/conf/configuration-tomcat.properties</value>
+ <value>file://${catalina.base}/gatein/conf/configuration.properties</value>
</value-param>
<value-param profiles="jboss">
<name>properties.url</name>
Modified: portal/trunk/packaging/pkg/pom.xml
===================================================================
--- portal/trunk/packaging/pkg/pom.xml 2010-02-16 11:02:56 UTC (rev 1733)
+++ portal/trunk/packaging/pkg/pom.xml 2010-02-16 11:21:27 UTC (rev 1734)
@@ -37,7 +37,7 @@
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
<type>zip</type>
- <version>1.0.0-Beta06</version>
+ <version>1.0.0-Beta08</version>
</dependency>
<dependency>
14 years, 10 months