gatein SVN: r865 - tools/packager/branches/mc-integration.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-30 09:08:53 -0500 (Mon, 30 Nov 2009)
New Revision: 865
Modified:
tools/packager/branches/mc-integration/pom.xml
Log:
Merged from trunk up to r864
Modified: tools/packager/branches/mc-integration/pom.xml
===================================================================
--- tools/packager/branches/mc-integration/pom.xml 2009-11-30 13:35:35 UTC (rev 864)
+++ tools/packager/branches/mc-integration/pom.xml 2009-11-30 14:08:53 UTC (rev 865)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
- <version>1.0.0-Beta02-SNAPSHOT</version>
+ <version>1.0.0-Beta03-SNAPSHOT</version>
<name>GateIn Packager</name>
<packaging>pom</packaging>
<scm>
15 years
gatein SVN: r864 - in tools/packager: tags/1.0.0-Beta02 and 1 other directories.
by do-not-reply＠jboss.org
Author: dbaeli
Date: 2009-11-30 08:35:35 -0500 (Mon, 30 Nov 2009)
New Revision: 864
Modified:
tools/packager/tags/1.0.0-Beta01/
tools/packager/tags/1.0.0-Beta02/pom.xml
tools/packager/trunk/pom.xml
Log:
GTNPORTAL-286: Use packager instead of exopackage
* fix correct version numbers
Property changes on: tools/packager/tags/1.0.0-Beta01
___________________________________________________________________
Name: svn:ignore
+ target
Modified: tools/packager/tags/1.0.0-Beta02/pom.xml
===================================================================
--- tools/packager/tags/1.0.0-Beta02/pom.xml 2009-11-30 13:02:14 UTC (rev 863)
+++ tools/packager/tags/1.0.0-Beta02/pom.xml 2009-11-30 13:35:35 UTC (rev 864)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02</version>
<name>GateIn Packager</name>
<packaging>pom</packaging>
<scm>
Modified: tools/packager/trunk/pom.xml
===================================================================
--- tools/packager/trunk/pom.xml 2009-11-30 13:02:14 UTC (rev 863)
+++ tools/packager/trunk/pom.xml 2009-11-30 13:35:35 UTC (rev 864)
@@ -28,7 +28,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
- <version>1.0.0-Beta02-SNAPSHOT</version>
+ <version>1.0.0-Beta03-SNAPSHOT</version>
<name>GateIn Packager</name>
<packaging>pom</packaging>
<scm>
15 years
gatein SVN: r863 - components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-11-30 08:02:14 -0500 (Mon, 30 Nov 2009)
New Revision: 863
Modified:
components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java
Log:
- Always try to activate consumers loaded from XML.
Modified: components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java
===================================================================
--- components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java 2009-11-30 10:33:50 UTC (rev 862)
+++ components/wsrp/trunk/consumer/src/main/java/org/gatein/wsrp/consumer/registry/xml/XMLConsumerRegistry.java 2009-11-30 13:02:14 UTC (rev 863)
@@ -101,11 +101,8 @@
ProducerInfo producerInfo = consumer.getProducerInfo();
try
{
- // if the producer is marked as active, activate it fo' real! :)
- if (producerInfo.isActive())
- {
- activateConsumer(consumer);
- }
+ // try to activate the consumer
+ activateConsumer(consumer);
}
catch (Exception e)
{
15 years
gatein SVN: r862 - in components/sso/trunk: packaging/cas and 4 other directories.
by do-not-reply＠jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-11-30 05:33:50 -0500 (Mon, 30 Nov 2009)
New Revision: 862
Added:
components/sso/trunk/packaging/cas/src/main/config/gatein/gatein.ear/
components/sso/trunk/packaging/cas/src/main/config/gatein/gatein.ear/META-INF/
components/sso/trunk/packaging/cas/src/main/config/gatein/gatein.ear/META-INF/gatein-jboss-beans.xml
Removed:
components/sso/trunk/packaging/cas/src/main/config/gatein/jboss/
Modified:
components/sso/trunk/packaging/cas/pom.xml
components/sso/trunk/packaging/cas/src/main/config/gatein/portal.war/WEB-INF/web.xml
components/sso/trunk/pom.xml
Log:
fixing cas plugin after the final gatein-3.0.0-beta03 tag
Modified: components/sso/trunk/packaging/cas/pom.xml
===================================================================
--- components/sso/trunk/packaging/cas/pom.xml 2009-11-30 10:19:48 UTC (rev 861)
+++ components/sso/trunk/packaging/cas/pom.xml 2009-11-30 10:33:50 UTC (rev 862)
@@ -93,11 +93,11 @@
<copy file="${basedir}/target/gatein/02portal.war"
todir="${gatein.location}/deploy/gatein.ear"
overwrite="true"/>
+
+ <copy file="${basedir}/src/main/config/gatein/gatein.ear/META-INF/gatein-jboss-beans.xml"
+ tofile="${gatein.location}/deploy/gatein.ear/META-INF/gatein-jboss-beans.xml"
+ overwrite="true"/>
- <copy file="${basedir}/src/main/config/gatein/jboss/server/default/conf/login-config.xml"
- tofile="${gatein.location}/conf/login-config.xml"
- overwrite="true"/>
-
<!-- Deploy the Authentication Callback RESTful service -->
<copy file="${settings.localRepository}/org/gatein/sso/auth-callback/${project.version}/auth-callback-${project.version}.jar"
todir="${gatein.location}/deploy/gatein.ear/lib"
Added: components/sso/trunk/packaging/cas/src/main/config/gatein/gatein.ear/META-INF/gatein-jboss-beans.xml
===================================================================
--- components/sso/trunk/packaging/cas/src/main/config/gatein/gatein.ear/META-INF/gatein-jboss-beans.xml (rev 0)
+++ components/sso/trunk/packaging/cas/src/main/config/gatein/gatein.ear/META-INF/gatein-jboss-beans.xml 2009-11-30 10:33:50 UTC (rev 862)
@@ -0,0 +1,29 @@
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <application-policy xmlns="urn:jboss:security-beans:1.0" name="gatein-domain">
+ <!--
+ <authentication>
+ <login-module code="org.exoplatform.web.security.PortalLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ <login-module code="org.exoplatform.services.security.jaas.SharedStateLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ </authentication>
+ -->
+ <authentication>
+ <login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required"></login-module>
+ <login-module code="org.exoplatform.services.security.j2ee.JbossLoginModule" flag="required">
+ <module-option name="portalContainerName">portal</module-option>
+ <module-option name="realmName">gatein-domain</module-option>
+ </login-module>
+ </authentication>
+ </application-policy>
+
+</deployment>
Modified: components/sso/trunk/packaging/cas/src/main/config/gatein/portal.war/WEB-INF/web.xml
===================================================================
--- components/sso/trunk/packaging/cas/src/main/config/gatein/portal.war/WEB-INF/web.xml 2009-11-30 10:19:48 UTC (rev 861)
+++ components/sso/trunk/packaging/cas/src/main/config/gatein/portal.war/WEB-INF/web.xml 2009-11-30 10:33:50 UTC (rev 862)
@@ -295,7 +295,7 @@
</security-constraint>
<login-config>
<auth-method>FORM</auth-method>
- <realm-name>exo-domain</realm-name>
+ <realm-name>gatein-domain</realm-name>
<form-login-config>
<form-login-page>/initiatelogin</form-login-page>
<form-error-page>/errorlogin</form-error-page>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2009-11-30 10:19:48 UTC (rev 861)
+++ components/sso/trunk/pom.xml 2009-11-30 10:33:50 UTC (rev 862)
@@ -62,7 +62,7 @@
<!-- exo -->
<org.exoplatform.core.version>2.3.0-Beta02</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.0-Beta02</org.exoplatform.ws.version>
- <org.exoplatform.portal.version>3.0.0-Beta03-SNAPSHOT</org.exoplatform.portal.version>
+ <org.exoplatform.portal.version>3.0.0-Beta03</org.exoplatform.portal.version>
<!-- JAX-RS jsr-311 -->
<version.javax.ws.rs>1.0</version.javax.ws.rs>
15 years
gatein SVN: r861 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-30 05:19:48 -0500 (Mon, 30 Nov 2009)
New Revision: 861
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
Log:
GTNPORTAL-262 Error URL when create new page
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-30 09:52:38 UTC (rev 860)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageCreationWizard.java 2009-11-30 10:19:48 UTC (rev 861)
@@ -389,6 +389,14 @@
uiWizard.updateUIPortal(uiPortalApp, event);
JavascriptManager jsManager = event.getRequestContext().getJavascriptManager();
jsManager.addJavascript("eXo.portal.portalMode=" + UIPortalApplication.NORMAL_MODE + ";");
+
+ UIWizardPageSetInfo uiPageInfo = uiWizard.getChild(UIWizardPageSetInfo.class);
+ UIPageNodeSelector uiNodeSelector = uiPageInfo.getChild(UIPageNodeSelector.class);
+ PageNode selectedNode = uiNodeSelector.getSelectedPageNode();
+
+ String uri = Util.getPortalRequestContext().getPortalURI() + "\\" + selectedNode.getUri();
+ //Util.getPortalRequestContext().sendRedirect(uri);
+ jsManager.addJavascript("window.location = '" + uri + "'");
}
}
15 years
gatein SVN: r860 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal.
by do-not-reply＠jboss.org
Author: tam_nguyen
Date: 2009-11-30 04:52:38 -0500 (Mon, 30 Nov 2009)
New Revision: 860
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
Log:
GTNPORTAL-297 Always show public permission in access permission form of portal when limit number of access users
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-11-30 09:46:55 UTC (rev 859)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComposer.java 2009-11-30 09:52:38 UTC (rev 860)
@@ -287,6 +287,7 @@
UIMaskWorkspace uiMaskWS = uiApp.getChildById(UIPortalApplication.UI_MASK_WS_ID);
UIPortalForm portalForm = uiMaskWS.createUIComponent(UIPortalForm.class, null, "UIPortalForm");
portalForm.setPortalOwner(uiPortal.getOwner());
+ portalForm.setBindingBean();
if(PortalConfig.USER_TYPE.equals(uiPortal.getOwnerType())){
portalForm.removeChildById("PermissionSetting");
}
15 years
gatein SVN: r859 - in portal/trunk: web/portal/src/main/webapp/WEB-INF/classes/locale/portal and 1 other directory.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-30 04:46:55 -0500 (Mon, 30 Nov 2009)
New Revision: 859
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
Log:
GTNPORTAL-287 It should be able to paste a node to root node in navigation
(Add resource bundles)
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-30 08:52:51 UTC (rev 858)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-30 09:46:55 UTC (rev 859)
@@ -359,7 +359,7 @@
ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>();
navis.add(selectedNavigation);
selector.initNavigations(navis);
- selector.removeChild(UIRightClickPopupMenu.class);
+ //selector.removeChild(UIRightClickPopupMenu.class);
uiNavigationPopup.setUIComponent(pageManager);
uiNavigationPopup.setWindowSize(400, 400);
uiNavigationPopup.setRendered(true);
Modified: portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-30 08:52:51 UTC (rev 858)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UISiteManagement.java 2009-11-30 09:46:55 UTC (rev 859)
@@ -365,7 +365,7 @@
ArrayList<PageNavigation> navis = new ArrayList<PageNavigation>();
navis.add(selectedNavigation);
selector.initNavigations(navis);
- selector.removeChild(UIRightClickPopupMenu.class);
+ //selector.removeChild(UIRightClickPopupMenu.class);
uiNavigationPopup.setUIComponent(pageManager);
uiNavigationPopup.setWindowSize(400, 400);
event.getRequestContext().addUIComponentToUpdateByAjax(uiNavigationPopup.getParent());
Modified: portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties
===================================================================
--- portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-30 08:52:51 UTC (rev 858)
+++ portal/trunk/web/portal/src/main/webapp/WEB-INF/classes/locale/portal/webui_en.properties 2009-11-30 09:46:55 UTC (rev 859)
@@ -1065,6 +1065,8 @@
###############################################################################
# org.exoplatform.portal.webui.component.customization.UIPageNodeSelector #
###############################################################################
+UINavigationNodeSelectorPopupMenu.event.AddNode=Add new Node
+UINavigationNodeSelectorPopupMenu.event.PasteNode=Paste Node
NavigationNodePopupMenu.event.AddNode=Add new Node
NavigationNodePopupMenu.event.EditPageNode=Edit Node's Page
15 years
gatein SVN: r858 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-30 03:52:51 -0500 (Mon, 30 Nov 2009)
New Revision: 858
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
Log:
GTNPORTAL-215 TemplateRuntimeException (Not render gadget which not map to application)
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2009-11-30 08:45:26 UTC (rev 857)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/application/UIGadget.java 2009-11-30 08:52:51 UTC (rev 858)
@@ -25,9 +25,11 @@
import org.exoplatform.portal.config.DataStorage;
import org.exoplatform.portal.config.model.ApplicationState;
import org.exoplatform.portal.config.model.Properties;
+import org.exoplatform.portal.webui.container.UIContainer;
import org.exoplatform.portal.webui.util.Util;
import org.exoplatform.web.WebAppController;
import org.exoplatform.web.application.gadget.GadgetApplication;
+import org.exoplatform.webui.application.WebuiRequestContext;
import org.exoplatform.webui.config.annotation.ComponentConfig;
import org.exoplatform.webui.config.annotation.EventConfig;
import org.exoplatform.webui.core.UIComponent;
@@ -133,7 +135,7 @@
{
try
{
- DataStorage ds= getApplicationComponent(DataStorage.class);
+ DataStorage ds = getApplicationComponent(DataStorage.class);
String gadgetId = ds.getId(state);
//
@@ -211,6 +213,17 @@
}
}
+ @Override
+ public void processRender(WebuiRequestContext context) throws Exception
+ {
+ if (getApplication() == null)
+ {
+ this.setRendered(false);
+ return;
+ }
+ super.processRender(context);
+ }
+
/**
* Gets GadgetApplication by GadgedRegistryService
*
@@ -233,8 +246,11 @@
{
return null;
}
- application = GadgetUtil.toGadgetApplication(model);
- webController.addApplication(application);
+ if (model != null)
+ {
+ application = GadgetUtil.toGadgetApplication(model);
+ webController.addApplication(application);
+ }
}
return application;
}
15 years