gatein SVN: r855 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page.
by do-not-reply＠jboss.org
Author: hoang_to
Date: 2009-11-30 03:23:47 -0500 (Mon, 30 Nov 2009)
New Revision: 855
Modified:
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
Log:
GTNPORTAL-251: Nothing changes when set show max window in edit node 's page
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-11-30 03:59:32 UTC (rev 854)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/webui/page/UIPageActionListener.java 2009-11-30 08:23:47 UTC (rev 855)
@@ -48,7 +48,10 @@
import java.util.ArrayList;
import java.util.List;
-/** Created by The eXo Platform SAS Author : Tran The Trong trongtt(a)gmail.com Jun 14, 2006 */
+/**
+ * Created by The eXo Platform SAS Author : Tran The Trong trongtt(a)gmail.com Jun
+ * 14, 2006
+ */
public class UIPageActionListener
{
@@ -64,7 +67,8 @@
{
UserPortalConfigService configService = uiPortalApp.getApplicationComponent(UserPortalConfigService.class);
String remoteUser = Util.getPortalRequestContext().getRemoteUser();
- UserPortalConfig portalConfig = configService.getUserPortalConfig(Util.getPortalRequestContext().getPortalOwner(), remoteUser);
+ UserPortalConfig portalConfig =
+ configService.getUserPortalConfig(Util.getPortalRequestContext().getPortalOwner(), remoteUser);
uiPortal.getChildren().clear();
PortalDataMapper.toUIPortal(uiPortal, portalConfig);
uiPortalApp.setModeState(UIPortalApplication.NORMAL_MODE);
@@ -155,8 +159,7 @@
// TODO tam.nguyen: filter navigation, select navigation up to user
if (selectedNode == null)
{
- filter:
- for (PageNavigation nav : navigations)
+ filter : for (PageNavigation nav : navigations)
{
for (PageNode child : nav.getNodes())
{
@@ -239,8 +242,9 @@
}
/**
- * Update the layout of UIPortal if both ownerType and ownerId of navigation are changed
- *
+ * Update the layout of UIPortal if both ownerType and ownerId of
+ * navigation are changed
+ *
* @param uiPortal
* @param formerNav
* @param newNav
@@ -248,7 +252,7 @@
* @throws Exception
*/
private void updateLayout(UIPortal uiPortal, PageNavigation formerNav, PageNavigation newNav,
- UIPortalApplication uiPortalApp) throws Exception
+ UIPortalApplication uiPortalApp) throws Exception
{
if (formerNav == null || newNav == null)
{
@@ -269,20 +273,33 @@
Container container = pConfig.getPortalLayout();
if (container != null)
{
+ /** Keep track of show max window property * */
+ boolean showMaxWindow = false;
+ try
+ {
+ PageNode selectedNode = uiPortal.getSelectedNode();
+ Page displayedPage = storage.getPage(selectedNode.getPageReference());
+ showMaxWindow = displayedPage.isShowMaxWindow();
+ }
+ catch (Exception ex)
+ {
+
+ }
UserPortalConfig portalConfig = uiPortalApp.getUserPortalConfig();
portalConfig.setPortal(pConfig);
- rebuildUIPortal(uiPortal, portalConfig);
+ rebuildUIPortal(uiPortal, portalConfig, showMaxWindow);
}
}
/**
* Rebuild UIPortal with updated UserPortalConfig
- *
+ *
* @param uiPortal
* @param portalConfig
* @throws Exception
*/
- private void rebuildUIPortal(UIPortal uiPortal, UserPortalConfig portalConfig) throws Exception
+ private void rebuildUIPortal(UIPortal uiPortal, UserPortalConfig portalConfig, boolean showMaxWindow)
+ throws Exception
{
PageNode backupSelectedNode = uiPortal.getSelectedNode();
PageNavigation backupSelectedNavigation = uiPortal.getSelectedNavigation();
@@ -292,40 +309,61 @@
uiPortal.setSelectedNode(backupSelectedNode);
uiPortal.setSelectedNavigation(backupSelectedNavigation);
uiPortal.setSelectedPaths(backupSelectedPaths);
+
+ /** Update the show-max-window property on UIPage * */
+ UIPageBody uiPageBody = uiPortal.findFirstComponentOfType(UIPageBody.class);
+ UIPage uiPage = (UIPage)uiPageBody.getUIComponent();
+ uiPage.setShowMaxWindow(showMaxWindow);
+
+ if(showMaxWindow){
+ //To maximized the UIPage
+ uiPortal.setMaximizedUIComponent(uiPage);
+ }else{
+ //To un-maximized the UIPage
+ UIComponent showedMaxComponent = uiPortal.getMaximizedUIComponent();
+ if(showedMaxComponent instanceof UIPage){
+ uiPortal.setMaximizedUIComponent(null);
+ }
+ }
}
}
//
- // static public class DeleteWidgetActionListener extends EventListener<UIPage> {
- // public void execute(Event<UIPage> event) throws Exception {
- // WebuiRequestContext pContext = event.getRequestContext();
- // String id = pContext.getRequestParameter(UIComponent.OBJECTID);
- // UIPage uiPage = event.getSource();
- // List<UIWidget> uiWidgets = new ArrayList<UIWidget>();
- // uiPage.findComponentOfType(uiWidgets, UIWidget.class);
- // for(UIWidget uiWidget : uiWidgets) {
- // if(uiWidget.getApplicationInstanceUniqueId().equals(id)) {
- // uiPage.getChildren().remove(uiWidget);
- // String userName = pContext.getRemoteUser() ;
- // if(userName != null && userName.trim().length() > 0) {
- // UserWidgetStorage widgetDataService = uiPage.getApplicationComponent(UserWidgetStorage.class) ;
- // widgetDataService.delete(userName, uiWidget.getApplicationName(), uiWidget.getApplicationInstanceUniqueId()) ;
- // }
- // if(uiPage.isModifiable()) {
- // Page page = PortalDataMapper.toPageModel(uiPage);
- // UserPortalConfigService configService = uiPage.getApplicationComponent(UserPortalConfigService.class);
- // if(page.getChildren() == null) page.setChildren(new ArrayList<Object>());
- // configService.update(page);
- // }
- // break;
- // }
- // }
- // PortalRequestContext pcontext = (PortalRequestContext)event.getRequestContext();
- // pcontext.setFullRender(false);
- // pcontext.setResponseComplete(true) ;
- // pcontext.getWriter().write(EventListener.RESULT_OK) ;
- // }
- // }
+ // static public class DeleteWidgetActionListener extends
+ // EventListener<UIPage> {
+ // public void execute(Event<UIPage> event) throws Exception {
+ // WebuiRequestContext pContext = event.getRequestContext();
+ // String id = pContext.getRequestParameter(UIComponent.OBJECTID);
+ // UIPage uiPage = event.getSource();
+ // List<UIWidget> uiWidgets = new ArrayList<UIWidget>();
+ // uiPage.findComponentOfType(uiWidgets, UIWidget.class);
+ // for(UIWidget uiWidget : uiWidgets) {
+ // if(uiWidget.getApplicationInstanceUniqueId().equals(id)) {
+ // uiPage.getChildren().remove(uiWidget);
+ // String userName = pContext.getRemoteUser() ;
+ // if(userName != null && userName.trim().length() > 0) {
+ // UserWidgetStorage widgetDataService =
+ // uiPage.getApplicationComponent(UserWidgetStorage.class) ;
+ // widgetDataService.delete(userName, uiWidget.getApplicationName(),
+ // uiWidget.getApplicationInstanceUniqueId()) ;
+ // }
+ // if(uiPage.isModifiable()) {
+ // Page page = PortalDataMapper.toPageModel(uiPage);
+ // UserPortalConfigService configService =
+ // uiPage.getApplicationComponent(UserPortalConfigService.class);
+ // if(page.getChildren() == null) page.setChildren(new ArrayList<Object>());
+ // configService.update(page);
+ // }
+ // break;
+ // }
+ // }
+ // PortalRequestContext pcontext =
+ // (PortalRequestContext)event.getRequestContext();
+ // pcontext.setFullRender(false);
+ // pcontext.setResponseComplete(true) ;
+ // pcontext.getWriter().write(EventListener.RESULT_OK) ;
+ // }
+ // }
//
static public class DeleteGadgetActionListener extends EventListener<UIPage>
{
@@ -344,10 +382,13 @@
String userName = pContext.getRemoteUser();
if (userName != null && userName.trim().length() > 0)
{
- // Julien : commented as normally removing the gadget should remove the state associated with it
+ // Julien : commented as normally removing the gadget should
+ // remove the state associated with it
// in the MOP
- // UserGadgetStorage widgetDataService = uiPage.getApplicationComponent(UserGadgetStorage.class) ;
- // widgetDataService.delete(userName, uiWidget.getApplicationName(), uiWidget.getId()) ;
+ // UserGadgetStorage widgetDataService =
+ // uiPage.getApplicationComponent(UserGadgetStorage.class) ;
+ // widgetDataService.delete(userName,
+ // uiWidget.getApplicationName(), uiWidget.getId()) ;
}
if (uiPage.isModifiable())
{
15 years
gatein SVN: r854 - portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component.
by do-not-reply＠jboss.org
Author: liem_nguyen
Date: 2009-11-29 22:59:32 -0500 (Sun, 29 Nov 2009)
New Revision: 854
Modified:
portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java
Log:
GTNPORTAL-287 It should be able to paste a node to root node in navigation
(For Group Navigation)
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-29 20:10:13 UTC (rev 853)
+++ portal/trunk/portlet/exoadmin/src/main/java/org/exoplatform/navigation/webui/component/UIGroupNavigationManagement.java 2009-11-30 03:59:32 UTC (rev 854)
@@ -212,7 +212,7 @@
list.add(navigation);
selector.initNavigations(list);
selector.loadNavigationByNavId(navId, uicomp.navigations);
- selector.removeChild(UIRightClickPopupMenu.class);
+ //selector.removeChild(UIRightClickPopupMenu.class);
popUp.setUIComponent(pageManager);
popUp.setWindowSize(400, 400);
popUp.setShowMask(true);
15 years
gatein SVN: r853 - portal/branches/mc-integration/packaging/pkg.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-29 15:10:13 -0500 (Sun, 29 Nov 2009)
New Revision: 853
Modified:
portal/branches/mc-integration/packaging/pkg/pom.xml
Log:
Profiles for deploying integration tests
Modified: portal/branches/mc-integration/packaging/pkg/pom.xml
===================================================================
--- portal/branches/mc-integration/packaging/pkg/pom.xml 2009-11-29 20:07:04 UTC (rev 852)
+++ portal/branches/mc-integration/packaging/pkg/pom.xml 2009-11-29 20:10:13 UTC (rev 853)
@@ -37,7 +37,7 @@
<groupId>org.gatein.tools</groupId>
<artifactId>packager</artifactId>
<type>zip</type>
- <version>1.0.0-Beta02</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -335,5 +335,208 @@
</plugins>
</build>
</profile>
+ <profile>
+ <id>pkg-tomcat-tests</id>
+ <build>
+ <finalName>GateIn-${project.version}</finalName>
+ <plugins>
+ <!-- Ensure your environment is correctly setup -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-check-environment-ready</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.directory.dependencies</property>
+ <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
+ </requireProperty>
+ <requireProperty>
+ <property>exo.projects.app.tomcat.version</property>
+ <message>"You must define the property exo.projects.app.tomcat.version to give the name of the directory where is stored tomcat"</message>
+ </requireProperty>
+ <requireFilesExist>
+ <files>
+ <file>${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}/</file>
+ </files>
+ <message>"The following Tomcat directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message>
+ </requireFilesExist>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- run exo build -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-packaging</id>
+ <phase>package</phase>
+ <configuration>
+ <executable>java</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <arguments>
+ <argument>-Dexo.package.home=${basedir}/target/packager</argument>
+ <argument>-Dexo.current.dir=${basedir}</argument>
+ <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument>
+ <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument>
+ <argument>-Dexo.working.dir=${gatein.working.dir}/</argument>
+ <!--argument>-Dexo.src.dir=NONE</argument-->
+ <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
+ <argument>-Dexo.m2.repos=file:${settings.localRepository}</argument>
+ <argument>-Dclean.server=${exo.projects.app.tomcat.version}</argument>
+ <argument>-Dexo.m2.home=${maven.home}</argument>
+ <argument>-Xshare:auto</argument>
+ <argument>-Xms128m</argument>
+ <argument>-Xmx512m</argument>
+ <argument>-classpath</argument>
+ <argument>${basedir}/target/packager/lib/js.jar</argument>
+ <argument>org.mozilla.javascript.tools.shell.Main</argument>
+ <argument>${basedir}/target/packager/javascript/eXo/eXo.js</argument>
+ <argument>exobuild</argument>
+ <argument>--product=portal</argument>
+ <argument>--deploy=tomcat</argument>
+ <argument>--integration-test</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+<!--
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>tomcat-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/tomcat-zip.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+-->
+ </plugins>
+ </build>
+
+ </profile>
+ <profile>
+ <id>pkg-jbossas-tests</id>
+ <build>
+ <finalName>GateIn-${project.version}</finalName>
+ <plugins>
+ <!-- Ensure your environment is correctly setup -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jbossas-check-environment-ready</id>
+ <goals>
+ <goal>enforce</goal>
+ </goals>
+ <configuration>
+ <rules>
+ <requireProperty>
+ <property>exo.projects.directory.dependencies</property>
+ <message>"You must define the property exo.projects.directory.dependencies to give the path to the directory where you store your applications servers"</message>
+ </requireProperty>
+ <requireProperty>
+ <property>exo.projects.app.jboss.version</property>
+ <message>"You must define the property exo.projects.app.jboss.version to give the name of the directory where is stored JBossAS"</message>
+ </requireProperty>
+ <requireFilesExist>
+ <files>
+ <file>${exo.projects.directory.dependencies}/${exo.projects.app.jboss.version}/</file>
+ </files>
+ <message>"The following JBossAS directory doesn't exist : ${exo.projects.directory.dependencies}/${exo.projects.app.tomcat.version}"</message>
+ </requireFilesExist>
+ </rules>
+ <fail>true</fail>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <!-- run exo buils -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jbossas-packaging</id>
+ <phase>package</phase>
+ <configuration>
+ <executable>java</executable>
+ <workingDirectory>${basedir}</workingDirectory>
+ <arguments>
+ <argument>-Dexo.package.home=${basedir}/target/packager</argument>
+ <argument>-Dexo.current.dir=${basedir}</argument>
+ <argument>-Dexo.base.dir=${exo.projects.directory.base}</argument>
+ <argument>-Dexo.conf.dir=${basedir}/target/packager-conf</argument>
+ <argument>-Dexo.working.dir=${gatein.working.dir}</argument>
+ <!--argument>-Dexo.src.dir=NONE</argument-->
+ <argument>-Dexo.dep.dir=${exo.projects.directory.dependencies}</argument><!-- to get the server ref install -->
+ <argument>-Dexo.m2.repos=file:${settings.localRepository},http://maven2.exoplatform.org/rest/maven2,http://repository.jboss.org/maven2</argument>
+ <argument>-Dclean.server=${exo.projects.app.jboss.version}</argument>
+ <argument>-Dexo.m2.home=${maven.home}</argument>
+ <argument>-Xshare:auto</argument>
+ <argument>-Xms128m</argument>
+ <argument>-Xmx512m</argument>
+ <argument>-classpath</argument>
+ <argument>${basedir}/target/packager/lib/js.jar</argument>
+ <argument>org.mozilla.javascript.tools.shell.Main</argument>
+ <argument>${basedir}/target/packager/javascript/eXo/eXo.js</argument>
+ <argument>exobuild</argument>
+ <argument>--product=portal</argument>
+ <argument>--deploy=jbossear</argument>
+ <argument>--integration-test</argument>
+ </arguments>
+ </configuration>
+ <goals>
+ <goal>exec</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+<!--
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>jbossas-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/jbossear-zip.xml</descriptor>
+ </descriptors>
+ <attach>false</attach>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+-->
+ </plugins>
+ </build>
+ </profile>
</profiles>
</project>
15 years
gatein SVN: r852 - portal/branches/mc-integration.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-29 15:07:04 -0500 (Sun, 29 Nov 2009)
New Revision: 852
Modified:
portal/branches/mc-integration/pom.xml
Log:
mc-int bootstrap in GenericHttpListener
Modified: portal/branches/mc-integration/pom.xml
===================================================================
--- portal/branches/mc-integration/pom.xml 2009-11-29 20:06:11 UTC (rev 851)
+++ portal/branches/mc-integration/pom.xml 2009-11-29 20:07:04 UTC (rev 852)
@@ -37,7 +37,7 @@
<name>GateIn - Portal</name>
<properties>
- <org.exoplatform.kernel.version>2.2.0-Beta04</org.exoplatform.kernel.version>
+ <org.exoplatform.kernel.version>2.2.0-Beta05-SNAPSHOT</org.exoplatform.kernel.version>
<org.exoplatform.core.version>2.3.0-Beta04</org.exoplatform.core.version>
<org.exoplatform.ws.version>2.1.0-Beta04</org.exoplatform.ws.version>
<org.exoplatform.jcr.version>1.12.0-Beta04</org.exoplatform.jcr.version>
15 years
gatein SVN: r851 - in portal/branches/mc-integration/component/web: src/main/java/org/exoplatform/web and 1 other directory.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-29 15:06:11 -0500 (Sun, 29 Nov 2009)
New Revision: 851
Modified:
portal/branches/mc-integration/component/web/pom.xml
portal/branches/mc-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java
Log:
mc-int bootstrap in GenericHttpListener
Modified: portal/branches/mc-integration/component/web/pom.xml
===================================================================
--- portal/branches/mc-integration/component/web/pom.xml 2009-11-29 20:02:27 UTC (rev 850)
+++ portal/branches/mc-integration/component/web/pom.xml 2009-11-29 20:06:11 UTC (rev 851)
@@ -37,6 +37,12 @@
<dependencies>
<dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ <version>${org.exoplatform.kernel.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>org.exoplatform.core</groupId>
<artifactId>exo.core.component.organization.api</artifactId>
<version>${org.exoplatform.core.version}</version>
Modified: portal/branches/mc-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java
===================================================================
--- portal/branches/mc-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java 2009-11-29 20:02:27 UTC (rev 850)
+++ portal/branches/mc-integration/component/web/src/main/java/org/exoplatform/web/GenericHttpListener.java 2009-11-29 20:06:11 UTC (rev 851)
@@ -24,6 +24,7 @@
import org.exoplatform.container.PortalContainer;
import org.exoplatform.container.RootContainer;
import org.exoplatform.container.RootContainer.PortalContainerPostInitTask;
+import org.exoplatform.container.util.EnvSpecific;
import org.exoplatform.container.web.AbstractHttpSessionListener;
import org.exoplatform.services.listener.ListenerService;
import org.exoplatform.services.log.ExoLogger;
@@ -180,7 +181,17 @@
}
}
};
- RootContainer.getInstance().addInitTask(event.getServletContext(), task);
+ ServletContext ctx = event.getServletContext();
+ try
+ {
+ EnvSpecific.initThreadEnv(ctx);
+ RootContainer.getInstance().addInitTask(event.getServletContext(), task);
+ }
+ finally
+ {
+ EnvSpecific.cleanupThreadEnv(ctx);
+ }
+
}
/**
15 years
gatein SVN: r850 - in tools/packager/branches/mc-integration/src/main/javascript/eXo: projects and 1 other directories.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-29 15:02:27 -0500 (Sun, 29 Nov 2009)
New Revision: 850
Modified:
tools/packager/branches/mc-integration/src/main/javascript/eXo/command/exobuild.js
tools/packager/branches/mc-integration/src/main/javascript/eXo/projects/Product.js
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js
tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js
Log:
Added mc-integration deployment for jbossas, and --integration-test option to deploy tests
Modified: tools/packager/branches/mc-integration/src/main/javascript/eXo/command/exobuild.js
===================================================================
--- tools/packager/branches/mc-integration/src/main/javascript/eXo/command/exobuild.js 2009-11-29 16:53:22 UTC (rev 849)
+++ tools/packager/branches/mc-integration/src/main/javascript/eXo/command/exobuild.js 2009-11-29 20:02:27 UTC (rev 850)
@@ -84,6 +84,7 @@
+ " * --enable-workflow=engine + .\n"
+ " (Since DMS 2.3) Specify the workflow engine to bundle with the product. The possible values are bonita or jbpm.\n"
+ " This option is only used for products that use workflow. Default engine is bonita\n"
+ + " * --integration-test This option is used when preparing special server deployment for running integration tests - extra libs and apps are deployed\n"
+ " * --help To print this help. Also you can use option: '-help' or 'help' or '?' \n");
}
@@ -189,6 +190,7 @@
var enableWorkflow = false;
var tasks = new java.util.ArrayList();
var noInternet = false;
+var integrationTests = false;
var args = arguments;
@@ -252,6 +254,8 @@
enableWorkflow = true;
} else if (arg == "--nointernet") {
noInternet = true;
+ } else if (arg == "--integration-test") {
+ integrationTests = true;
} else if (arg == "--help" || arg == "-help" || arg == "help" || arg == "?") {
exobuildInstructions();
java.lang.System.exit(1);
@@ -335,6 +339,8 @@
while (serv.hasNext()) {
server = serv.next();
server.pluginVersion = product.serverPluginVersion;
+ if (integrationTests)
+ product.integrationTests = true;
tasks.add(product.DeployTask(product, server, eXo.env.m2Repos));
if (database != null) {
tasks.add(database.DeployTask(product, server, eXo.env.m2Repos));
Modified: tools/packager/branches/mc-integration/src/main/javascript/eXo/projects/Product.js
===================================================================
--- tools/packager/branches/mc-integration/src/main/javascript/eXo/projects/Product.js 2009-11-29 16:53:22 UTC (rev 849)
+++ tools/packager/branches/mc-integration/src/main/javascript/eXo/projects/Product.js 2009-11-29 20:02:27 UTC (rev 850)
@@ -9,6 +9,7 @@
this.module = null;
this.useWorkflow = false;
+ this.integrationTests = false;
this.useContentValidation = false;
this.dependencyModule = null;
this.serverPluginVersion = "trunk";
Modified: tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js
===================================================================
--- tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js 2009-11-29 16:53:22 UTC (rev 849)
+++ tools/packager/branches/mc-integration/src/main/javascript/eXo/server/JbossEar.js 2009-11-29 20:02:27 UTC (rev 850)
@@ -76,6 +76,19 @@
// product.removeDependency(new Project("quartz", "quartz", "jar",
// "1.5.0-RC2"));
+ this.EXO_KERNEL_VER = "2.2.0-Beta05-SNAPSHOT";
+ product.addDependencies(new Project("org.jboss.mc-int", "jboss-mc-int-common", "jar", "2.2.0.Alpha2"));
+ product.addDependencies(new Project("org.jboss.mc-int", "jboss-mc-int-servlet", "jar", "2.2.0.Alpha2"));
+ product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-int", "jar", this.EXO_KERNEL_VER));
+ product.addDependencies(new Project("org.exoplatform.kernel", "exo.kernel.mc-kernel-extras", "jar", this.EXO_KERNEL_VER));
+
+
+ if (product.integrationTests) {
+ this.MC_INT_DEMO_ARTIFACT = "exo.kernel.demos.mc-injection";
+ product.addDependencies(new Project("org.exoplatform.kernel.demos", this.MC_INT_DEMO_ARTIFACT, "jar", this.EXO_KERNEL_VER));
+ product.addDependencies(new Project("org.exoplatform.kernel.tests", "exo.kernel.integration-tests", "war", this.EXO_KERNEL_VER));
+ }
+
var version = product.version;
if (version.indexOf("2.0") != 0 && version.indexOf("2.1") != 0 && version.indexOf("2.2") != 0
&& version.indexOf("2.5") != 0) {
@@ -130,7 +143,14 @@
eXo.core.IOUtil.remove(file);
}
}
-
+
+ if (product.integrationTests) {
+ var fromFile = new java.io.File(libDir, this.MC_INT_DEMO_ARTIFACT + "-" + this.EXO_KERNEL_VER + ".jar");
+ eXo.core.IOUtil.cp(fromFile.getAbsolutePath(), this.deployEarDir);
+ eXo.core.IOUtil.remove(fromFile);
+
+ }
+
eXo.core.IOUtil.chmodExecutableInDir(this.serverHome + "/bin/", ".sh");
}
Modified: tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js
===================================================================
--- tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js 2009-11-29 16:53:22 UTC (rev 849)
+++ tools/packager/branches/mc-integration/src/main/javascript/eXo/server/Tomcat.js 2009-11-29 20:02:27 UTC (rev 850)
@@ -78,7 +78,11 @@
//GTNPORTAL-32 No WSRP on tomcat yet
product.removeDependency(new Project("org.exoplatform.portal", "exo.portal.component.wsrp", "jar", product.serverPluginVersion ));
product.removeDependencyByGroupId("org.gatein.wsrp");
-
+
+ if (product.integrationTests) {
+ product.addDependencies(new Project("org.exoplatform.kernel.demos", "exo.kernel.demos.mc-injection", "jar", "2.2.0-Beta05-SNAPSHOT"));
+ product.addDependencies(new Project("org.exoplatform.kernel.tests", "exo.kernel.integration-tests", "war", "2.2.0-Beta05-SNAPSHOT"));
+ }
}
Tomcat.prototype.onDeploy = function(project) {
15 years
gatein SVN: r849 - portal/branches.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-29 11:53:22 -0500 (Sun, 29 Nov 2009)
New Revision: 849
Added:
portal/branches/mc-integration/
Log:
Branched off trunk r845
Copied: portal/branches/mc-integration (from rev 848, portal/trunk)
15 years
gatein SVN: r848 - tools/packager/branches.
by do-not-reply＠jboss.org
Author: mstruk
Date: 2009-11-29 09:55:56 -0500 (Sun, 29 Nov 2009)
New Revision: 848
Added:
tools/packager/branches/mc-integration/
Log:
Branched off trunk r729
Copied: tools/packager/branches/mc-integration (from rev 847, tools/packager/trunk)
15 years
gatein SVN: r847 - in portal/branches/wsrp-integration: component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer and 4 other directories.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-11-27 17:54:02 -0500 (Fri, 27 Nov 2009)
New Revision: 847
Modified:
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java
portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java
portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml
portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml
Log:
- Improved mapping classes:
+ Fixed improper use of RelatedMappedBy instead of MappedBy.
+ Create methods have been renamed and take the child name in parameter as it is needed by JCR.
+ Added QNameFormatter on RegistrationInfoMapping so QNames that are used as RegistrationProperty names can be persisted in JCR.
+ Children elements must be added to parents before they are initialized as they need to be attached in JCR.
+ Avoid NPEs by checking that we do have a RegistrationPropertyDescription before doing anything with it.
+ Re-added name property on RegistrationPropertyMapping as we don't always have a RegistrationPropertyDescription to get the name from.
- Added explicit defaultPrimaryType declaration on child node definitions for one to one mappings.
- Auto-create endpoint and registration info in JCR nodetype for ProducerInfo.
- Added closeSession method on JCRPersister to save and close the session when operations are done and used it where appropriate.
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/JCRPersister.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -25,6 +25,8 @@
import org.chromattic.api.Chromattic;
import org.chromattic.api.ChromatticBuilder;
import org.chromattic.api.ChromatticSession;
+import org.chromattic.api.format.FormatterContext;
+import org.chromattic.api.format.ObjectFormatter;
import org.chromattic.spi.jcr.SessionLifeCycle;
import org.exoplatform.container.ExoContainer;
import org.exoplatform.services.jcr.RepositoryService;
@@ -88,7 +90,13 @@
return chrome.openSession();
}
+ public void closeSession(ChromatticSession session)
+ {
+ session.save();
+ session.close();
+ }
+
public static class WSRPSessionLifeCycle implements SessionLifeCycle
{
@@ -127,4 +135,41 @@
session.logout();
}
}
+
+ public static class QNameFormatter implements ObjectFormatter
+ {
+ private static final String OPEN_BRACE_REPLACEMENT = "-__";
+ private static final String CLOSE_BRACE_REPLACEMENT = "__-";
+ private static final String COLON_REPLACEMENT = "_-_";
+
+ public String decodeNodeName(FormatterContext formatterContext, String s)
+ {
+ return decode(s);
+ }
+
+ public String encodeNodeName(FormatterContext formatterContext, String s)
+ {
+ return encode(s);
+ }
+
+ public String decodePropertyName(FormatterContext formatterContext, String s)
+ {
+ return decode(s);
+ }
+
+ public String encodePropertyName(FormatterContext formatterContext, String s)
+ {
+ return encode(s);
+ }
+
+ private String decode(String s)
+ {
+ return s.replace(CLOSE_BRACE_REPLACEMENT, "}").replace(OPEN_BRACE_REPLACEMENT, "{").replace(COLON_REPLACEMENT, ":");
+ }
+
+ private String encode(String s)
+ {
+ return s.replace("{", OPEN_BRACE_REPLACEMENT).replace("}", CLOSE_BRACE_REPLACEMENT).replace(":", COLON_REPLACEMENT);
+ }
+ }
}
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/JCRConsumerRegistry.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -68,13 +68,13 @@
ChromatticSession session = persister.getSession();
ProducerInfosMapping pims = getProducerInfosMapping(session);
- ProducerInfoMapping pim = pims.createProducerInfo();
+ ProducerInfoMapping pim = pims.createProducerInfo(info.getId());
pim.initFrom(info);
String key = session.persist(pims, pim, info.getId());
info.setKey(key);
- session.close();
+ persister.closeSession(session);
}
@Override
@@ -83,7 +83,7 @@
ChromatticSession session = persister.getSession();
delete(session, getPathFor(info));
- session.close();
+ persister.closeSession(session);
}
@Override
@@ -103,9 +103,9 @@
throw new IllegalArgumentException("Couldn't find ProducerInfoMapping associated with key " + key);
}
pim.initFrom(producerInfo);
- session.save();
- session.close();
+ persister.closeSession(session);
+
return null;
}
@@ -117,8 +117,8 @@
List<ProducerInfoMapping> mappings = producerInfosMapping.getProducerInfos();
- session.save();
- session.close();
+ persister.closeSession(session);
+
return new MappingToProducerInfoIterator(mappings.iterator());
}
@@ -141,11 +141,16 @@
List<WSRPConsumer> consumers = fromXML.getConfiguredConsumers();
for (WSRPConsumer consumer : consumers)
{
- ProducerInfoMapping pim = producerInfosMapping.createProducerInfo();
- pim.initFrom(consumer.getProducerInfo());
+ ProducerInfo info = consumer.getProducerInfo();
+
+ ProducerInfoMapping pim = producerInfosMapping.createProducerInfo(info.getId());
+
+ // need to add to parent first to attach newly created ProducerInfoMapping
infos.add(pim);
+
+ // init it from ProducerInfo
+ pim.initFrom(info);
}
- session.persist(infos); // todo: is that sufficient?
}
return producerInfosMapping;
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfoMapping.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -24,10 +24,10 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
import org.chromattic.api.annotations.Id;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
-import org.chromattic.api.annotations.RelatedMappedBy;
import org.gatein.wsrp.consumer.EndpointConfigurationInfo;
import org.gatein.wsrp.consumer.ProducerInfo;
import org.gatein.wsrp.consumer.RegistrationInfo;
@@ -42,11 +42,11 @@
public static final String NODE_NAME = "wsrp:producerinfo";
@OneToOne
- @RelatedMappedBy("endpoint")
+ @MappedBy("endpoint")
public abstract EndpointInfoMapping getEndpointInfo();
@OneToOne
- @RelatedMappedBy("registration")
+ @MappedBy("registration")
public abstract RegistrationInfoMapping getRegistrationInfo();
@Property(name = "producerid")
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/ProducerInfosMapping.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -42,5 +42,5 @@
public abstract List<ProducerInfoMapping> getProducerInfos();
@Create
- public abstract ProducerInfoMapping createProducerInfo();
+ public abstract ProducerInfoMapping createProducerInfo(String producerId);
}
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationInfoMapping.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -24,10 +24,12 @@
package org.gatein.portal.wsrp.state.consumer.mapping;
import org.chromattic.api.annotations.Create;
+import org.chromattic.api.annotations.FormattedBy;
import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToMany;
import org.chromattic.api.annotations.Property;
import org.exoplatform.commons.utils.Safe;
+import org.gatein.portal.wsrp.state.JCRPersister;
import org.gatein.portal.wsrp.state.mapping.RegistrationPropertyDescriptionMapping;
import org.gatein.wsrp.consumer.RegistrationInfo;
import org.gatein.wsrp.consumer.RegistrationProperty;
@@ -42,6 +44,7 @@
* @version $Revision$
*/
@NodeMapping(name = RegistrationInfoMapping.NODE_NAME)
+(a)FormattedBy(JCRPersister.QNameFormatter.class)
public abstract class RegistrationInfoMapping
{
public static final String NODE_NAME = "wsrp:registrationinfo";
@@ -65,7 +68,7 @@
public abstract List<RegistrationPropertyMapping> getRegistrationProperties();
@Create
- public abstract RegistrationPropertyMapping createRegistrationProperty();
+ public abstract RegistrationPropertyMapping createRegistrationProperty(String propertyName);
public void initFrom(RegistrationInfo regInfo)
{
@@ -84,13 +87,11 @@
for (RegistrationProperty property : regInfo.getRegistrationProperties().values())
{
// create new RegistrationPropertyMapping for this RegistrationInfoMapping
- RegistrationPropertyMapping rpm = createRegistrationProperty();
+ RegistrationPropertyMapping rpm = createRegistrationProperty(property.getName());
- // initialize
+ // add newly created RegistrationPropertyMapping to parent then initialize for JCR
+ rpms.add(rpm);
rpm.initFrom(property);
-
- // add newly created RegistrationPropertyMapping to parent
- rpms.add(rpm);
}
}
@@ -105,14 +106,15 @@
// registration properties
for (RegistrationPropertyMapping rpm : getRegistrationProperties())
{
+ RegistrationProperty prop = regInfo.setRegistrationPropertyValue(rpm.getName(), rpm.getValue());
+
RegistrationPropertyDescriptionMapping rpdm = rpm.getDescription();
- String name = rpdm.getName();
+ if (rpdm != null)
+ {
+ RegistrationPropertyDescription desc = rpdm.toRegistrationPropertyDescription();
+ prop.setDescription(desc);
+ }
- RegistrationProperty prop = regInfo.setRegistrationPropertyValue(name, rpm.getValue());
-
- RegistrationPropertyDescription desc = rpdm.toRegistrationPropertyDescription();
- prop.setDescription(desc);
-
prop.setStatus(RegistrationProperty.Status.valueOf(rpm.getStatus()));
}
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/consumer/mapping/RegistrationPropertyMapping.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -40,6 +40,11 @@
{
public static final String NODE_NAME = "wsrp:registrationproperty";
+ @Property(name = "name")
+ public abstract String getName();
+
+ public abstract void setName(String name);
+
@Property(name = "value")
public abstract String getValue();
@@ -59,12 +64,16 @@
public void initFrom(RegistrationProperty property)
{
// set properties
+ setName(property.getName());
setStatus(property.getStatus().name());
setValue(property.getValue());
// description
- RegistrationPropertyDescriptionMapping rpdm = getDescription();
RegistrationPropertyDescription desc = property.getDescription();
- rpdm.initFrom(desc);
+ if (desc != null)
+ {
+ RegistrationPropertyDescriptionMapping rpdm = getDescription();
+ rpdm.initFrom(desc);
+ }
}
}
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/JCRProducerConfigurationService.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -80,6 +80,7 @@
configuration = pcm.toProducerConfiguration();
+ persister.closeSession(session);
}
public void saveConfiguration() throws Exception
@@ -87,6 +88,8 @@
ChromatticSession session = persister.getSession();
saveConfiguration(session, session.findByPath(ProducerConfigurationMapping.class, PRODUCER_CONFIGURATION_PATH), false);
+
+ persister.closeSession(session);
}
private ProducerConfigurationMapping saveConfiguration(ChromatticSession session, ProducerConfigurationMapping pcm, boolean forceReloadFromXML) throws Exception
@@ -108,8 +111,6 @@
}
pcm.initFrom(configuration);
-
- session.persist(pcm);
}
return pcm;
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/ProducerConfigurationMapping.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -22,10 +22,10 @@
package org.gatein.portal.wsrp.state.producer.configuration.mapping;
+import org.chromattic.api.annotations.MappedBy;
import org.chromattic.api.annotations.NodeMapping;
import org.chromattic.api.annotations.OneToOne;
import org.chromattic.api.annotations.Property;
-import org.chromattic.api.annotations.RelatedMappedBy;
import org.gatein.wsrp.producer.config.ProducerConfiguration;
import org.gatein.wsrp.producer.config.ProducerRegistrationRequirements;
import org.gatein.wsrp.producer.config.impl.ProducerConfigurationImpl;
@@ -45,7 +45,7 @@
public abstract void setUsingStrictMode(boolean strict);
@OneToOne
- @RelatedMappedBy("registrationrequirements")
+ @MappedBy("registrationrequirements")
public abstract RegistrationRequirementsMapping getRegistrationRequirements();
public void initFrom(ProducerConfiguration configuration)
Modified: portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java
===================================================================
--- portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/component/wsrp/src/main/java/org/gatein/portal/wsrp/state/producer/configuration/mapping/RegistrationRequirementsMapping.java 2009-11-27 22:54:02 UTC (rev 847)
@@ -56,7 +56,7 @@
public abstract List<RegistrationPropertyDescriptionMapping> getRegistrationPropertyDescriptions();
@Create
- public abstract RegistrationPropertyDescriptionMapping create();
+ public abstract RegistrationPropertyDescriptionMapping createRegistrationPropertyDescription(String propertyName);
public void initFrom(ProducerRegistrationRequirements registrationRequirements)
{
@@ -66,11 +66,11 @@
List<RegistrationPropertyDescriptionMapping> rpdms = getRegistrationPropertyDescriptions();
for (RegistrationPropertyDescription desc : registrationRequirements.getRegistrationProperties().values())
{
- RegistrationPropertyDescriptionMapping rpdm = create();
+ RegistrationPropertyDescriptionMapping rpdm = createRegistrationPropertyDescription(desc.getNameAsString());
+ // attach first to parent, then init
+ rpdms.add(rpdm);
rpdm.initFrom(desc);
-
- rpdms.add(rpdm);
}
}
Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml
===================================================================
--- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/consumers-configuration-nodetypes.xml 2009-11-27 22:54:02 UTC (rev 847)
@@ -61,13 +61,15 @@
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="endpoint" defaultPrimaryType="" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="endpoint" defaultPrimaryType="wsrp:endpointinfo" autoCreated="true"
+ mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>wsrp:endpointinfo</requiredPrimaryType>
</requiredPrimaryTypes>
</childNodeDefinition>
- <childNodeDefinition name="registration" defaultPrimaryType="" autoCreated="false" mandatory="false"
+ <childNodeDefinition name="registration" defaultPrimaryType="wsrp:registrationinfo" autoCreated="true"
+ mandatory="false"
onParentVersion="COPY" protected="false" sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>wsrp:registrationinfo</requiredPrimaryType>
@@ -125,6 +127,10 @@
<supertype>mix:referenceable</supertype>
</supertypes>
<propertyDefinitions>
+ <propertyDefinition name="name" requiredType="String" autoCreated="false" mandatory="false"
+ onParentVersion="COPY" protected="false" multiple="true">
+ <valueConstraints/>
+ </propertyDefinition>
<propertyDefinition name="value" requiredType="String" autoCreated="false" mandatory="false"
onParentVersion="COPY" protected="false" multiple="true">
<valueConstraints/>
Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml
===================================================================
--- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2009-11-27 21:07:48 UTC (rev 846)
+++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/wsrp/producer-configuration-nodetypes.xml 2009-11-27 22:54:02 UTC (rev 847)
@@ -38,8 +38,9 @@
</propertyDefinition>
</propertyDefinitions>
<childNodeDefinitions>
- <childNodeDefinition name="registrationrequirements" defaultPrimaryType="" autoCreated="true" mandatory="false"
- onParentVersion="COPY" protected="false" sameNameSiblings="false">
+ <childNodeDefinition name="registrationrequirements" defaultPrimaryType="wsrp:registrationrequirements"
+ autoCreated="true" mandatory="false" onParentVersion="COPY" protected="false"
+ sameNameSiblings="false">
<requiredPrimaryTypes>
<requiredPrimaryType>wsrp:registrationrequirements</requiredPrimaryType>
</requiredPrimaryTypes>
15 years, 1 month
gatein SVN: r846 - portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr.
by do-not-reply＠jboss.org
Author: chris.laprun(a)jboss.com
Date: 2009-11-27 16:07:48 -0500 (Fri, 27 Nov 2009)
New Revision: 846
Modified:
portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml
portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
Log:
- Re-added changes that got lost during the merge due to improper conflict resolution.
Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml
===================================================================
--- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2009-11-27 20:45:23 UTC (rev 845)
+++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.tmpl.xml 2009-11-27 21:07:48 UTC (rev 846)
@@ -121,7 +121,7 @@
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
<value>jar:/conf/organization-nodetypes.xml</value>
- <value>jar:/conf/standalone/nodetypes.xml</value>
+ <value>jar:/conf/mop-nodetypes.xml</value>
<value>jar:/conf/portal/portal-nodetypes.xml</value>
<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
Modified: portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
===================================================================
--- portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-11-27 20:45:23 UTC (rev 845)
+++ portal/branches/wsrp-integration/web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml 2009-11-27 21:07:48 UTC (rev 846)
@@ -122,7 +122,7 @@
<description>Node types configuration file</description>
<value>jar:/conf/ext-nodetypes-config.xml</value>
<value>jar:/conf/organization-nodetypes.xml</value>
- <value>jar:/conf/standalone/nodetypes.xml</value>
+ <value>jar:/conf/mop-nodetypes.xml</value>
<value>jar:/conf/portal/portal-nodetypes.xml</value>
<value>war:/conf/wsrp/consumers-configuration-nodetypes.xml</value>
<value>war:/conf/wsrp/producer-configuration-nodetypes.xml</value>
15 years, 1 month