JBoss Portal SVN: r9008 - branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-18 10:13:49 -0500 (Sun, 18 Nov 2007)
New Revision: 9008
Modified:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml
Log:
revert project file update as they were corrupted
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml 2007-11-18 14:50:32 UTC (rev 9007)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/migration/migration.iml 2007-11-18 15:13:49 UTC (rev 9008)
@@ -79,7 +79,7 @@
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
- <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="ACTIVE_VCS_NAME" value="CVS" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
<component name="copyright">
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9007 - in branches/UIServer/build/ide/intellij/idea60/modules: migration and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-18 09:50:32 -0500 (Sun, 18 Nov 2007)
New Revision: 9007
Modified:
branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml
branches/UIServer/build/ide/intellij/idea60/modules/migration/migration.iml
branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml
Log:
update project file for portal ui branch
Modified: branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml 2007-11-18 14:47:07 UTC (rev 9006)
+++ branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml 2007-11-18 14:50:32 UTC (rev 9007)
@@ -9,7 +9,34 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="uiserver" />
+ <orderEntry type="module" module-name="core" />
+ <orderEntry type="module" module-name="server" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="jems" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="test" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
</module>
Modified: branches/UIServer/build/ide/intellij/idea60/modules/migration/migration.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/migration/migration.iml 2007-11-18 14:47:07 UTC (rev 9006)
+++ branches/UIServer/build/ide/intellij/idea60/modules/migration/migration.iml 2007-11-18 14:50:32 UTC (rev 9007)
@@ -80,7 +80,7 @@
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
- <option name="ACTIVE_VCS_NAME" value="CVS" />
+ <option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
<component name="copyright">
Modified: branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml 2007-11-18 14:47:07 UTC (rev 9006)
+++ branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml 2007-11-18 14:50:32 UTC (rev 9007)
@@ -39,7 +39,20 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/junit/lib/junit.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
+ <component name="VcsManagerConfiguration">
+ <option name="ACTIVE_VCS_NAME" value="svn" />
+ <option name="USE_PROJECT_VCS" value="false" />
+ </component>
</module>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9006 - in branches/JBoss_Portal_Branch_2_6: core/src/main/org/jboss/portal/core/impl/model/content/generic and 4 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-18 09:47:07 -0500 (Sun, 18 Nov 2007)
New Revision: 9006
Added:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java
Log:
- introduced ContentRendererContext to allow the content framework to be reused without the whole controller command pipeline
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-11-18 13:34:30 UTC (rev 9005)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/InternalContentProvider.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -26,25 +26,22 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.core.aspects.portlet.AjaxInterceptor;
-import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerResponse;
import org.jboss.portal.core.controller.command.response.SecurityErrorResponse;
import org.jboss.portal.core.controller.command.response.UnavailableResourceResponse;
-import org.jboss.portal.core.controller.portlet.PortletInvocationFactory;
import org.jboss.portal.core.model.content.Content;
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.content.spi.ContentProvider;
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstancePermission;
import org.jboss.portal.core.model.portal.Portal;
-import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand;
+import org.jboss.portal.core.model.portal.PortalObject;
import org.jboss.portal.core.model.portal.command.response.MarkupResponse;
import org.jboss.portal.core.model.portal.content.ContentRenderer;
import org.jboss.portal.core.model.portal.content.WindowRendition;
+import org.jboss.portal.core.model.portal.content.ContentRendererContext;
import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
-import org.jboss.portal.core.navstate.NavigationalStateKey;
import org.jboss.portal.portlet.NoSuchPortletException;
import org.jboss.portal.portlet.PortletInvokerException;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
@@ -154,26 +151,34 @@
/**
* Returns the portlet instance to render view mode.
*
- * @param command
+ * @param rendererContext
* @return the portlet instance for the view mode
*/
- protected abstract Instance getPortletInstance(RenderWindowCommand command);
+ protected abstract Instance getPortletInstance(ContentRendererContext rendererContext);
- public WindowRendition renderWindow(RenderWindowCommand cmd)
+ public WindowRendition renderWindow(ContentRendererContext rendererContext)
{
- Window window = cmd.getWindow();
- Portal portal = cmd.getPortal();
- ControllerContext context = cmd.getControllerContext();
+ Window window = rendererContext.getWindow();
- PortalObjectId windowId = window.getId();
- NavigationalStateKey nsKey = new NavigationalStateKey(WindowNavigationalState.class, windowId);
- WindowNavigationalState windowNS = (WindowNavigationalState)context.getAttribute(RenderWindowCommand.NAVIGATIONAL_STATE_SCOPE, nsKey);
+ // Get the parent portal
+ Portal portal = null;
+ for (PortalObject current = window;current != null;current = current.getParent())
+ {
+ if (current.getType() == PortalObject.TYPE_PORTAL)
+ {
+ portal = (Portal)current;
+ break;
+ }
+ }
//
+ WindowNavigationalState windowNS = rendererContext.getNavigationalState();
+
+ //
if (windowNS == null)
{
windowNS = new WindowNavigationalState(window.getInitialWindowState(), window.getInitialMode(), null);
- context.setAttribute(RenderWindowCommand.NAVIGATIONAL_STATE_SCOPE, nsKey, windowNS);
+ rendererContext.setNavigationalState(windowNS);
}
//
@@ -182,7 +187,7 @@
WindowState windowState = windowNS.getWindowState();
// Obtain instance
- Instance instance = getPortletInstance(cmd);
+ Instance instance = getPortletInstance(rendererContext);
// No instance means we can't continue
if (instance == null)
@@ -202,13 +207,7 @@
}
// Create invocation
- RenderInvocation invocation = PortletInvocationFactory.createRender(
- context,
- mode,
- windowState,
- windowNS.getContentState(),
- window,
- portal);
+ RenderInvocation invocation = rendererContext.createRenderInvocation(new WindowNavigationalState(windowState, mode, windowNS.getContentState()));
//
List supportedWindowStates = Collections.EMPTY_LIST;
@@ -247,7 +246,7 @@
}
// Remove edit mode if the user is not logged it
- if (context.getServerInvocation().getServerContext().getClientRequest().getUserPrincipal() == null)
+ if (rendererContext.getUser() == null)
{
supportedModes.remove(Mode.EDIT);
}
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-11-18 13:34:30 UTC (rev 9005)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/InternalGenericContentProvider.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -24,8 +24,6 @@
import org.jboss.portal.Mode;
import org.jboss.portal.common.i18n.LocalizedString;
-import org.jboss.portal.common.invocation.AttributeResolver;
-import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.impl.model.content.InternalContentProvider;
import org.jboss.portal.core.model.content.Content;
import org.jboss.portal.core.model.content.ContentType;
@@ -37,11 +35,10 @@
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.portal.PortalObjectId;
import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand;
import org.jboss.portal.core.model.portal.command.response.MarkupResponse;
import org.jboss.portal.core.model.portal.content.WindowRendition;
+import org.jboss.portal.core.model.portal.content.ContentRendererContext;
import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
-import org.jboss.portal.core.navstate.NavigationalStateKey;
import org.jboss.portal.portlet.PortletParametersStateString;
import java.util.Iterator;
@@ -129,16 +126,14 @@
return new GenericContent(state);
}
- protected Instance getPortletInstance(RenderWindowCommand command)
+ protected Instance getPortletInstance(ContentRendererContext rendererContext)
{
String id = contentPortlet.getPortletName(Mode.VIEW);
//
if (id != null)
{
- ControllerContext context = command.getControllerContext();
- InstanceContainer container = context.getController().getInstanceContainer();
- return container.getDefinition(id);
+ return instanceContainer.getDefinition(id);
}
else
{
@@ -154,10 +149,9 @@
{
}
- public WindowRendition renderWindow(RenderWindowCommand cmd)
+ public WindowRendition renderWindow(ContentRendererContext rendererContext)
{
- ControllerContext context = cmd.getControllerContext();
- Window window = cmd.getWindow();
+ Window window = rendererContext.getWindow();
PortalObjectId windowId = window.getId();
// No content
@@ -168,11 +162,9 @@
}
//
- AttributeResolver nsResolver = context.getAttributeResolver(RenderWindowCommand.NAVIGATIONAL_STATE_SCOPE);
// Initialize the navigational state with the URI when needed
- NavigationalStateKey nsKey = new NavigationalStateKey(WindowNavigationalState.class, windowId);
- WindowNavigationalState navigationalState = (WindowNavigationalState)nsResolver.getAttribute(nsKey);
+ WindowNavigationalState navigationalState = rendererContext.getNavigationalState();
//
// boolean update = true;
@@ -203,11 +195,11 @@
state.setValue("uri", uri);
//
- WindowNavigationalState.setState(nsResolver, nsKey, state, window);
+ rendererContext.setNavigationalState(WindowNavigationalState.bilto(navigationalState, null, null, state));
}
//
- WindowRendition rendition = super.renderWindow(cmd);
+ WindowRendition rendition = super.renderWindow(rendererContext);
//
if (rendition != null && rendition.getControllerResponse() instanceof MarkupResponse && !getDecorateContent())
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-11-18 13:34:30 UTC (rev 9005)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/portlet/InternalPortletContentProvider.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -28,7 +28,6 @@
import org.jboss.portal.common.i18n.ResourceBundleManager;
import org.jboss.portal.common.i18n.SimpleResourceBundleFactory;
import org.jboss.portal.common.util.EmptyResourceBundle;
-import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.impl.model.content.InternalContentProvider;
import org.jboss.portal.core.model.CustomizationManager;
import org.jboss.portal.core.model.content.Content;
@@ -40,7 +39,7 @@
import org.jboss.portal.core.model.instance.Instance;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.portal.Window;
-import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand;
+import org.jboss.portal.core.model.portal.content.ContentRendererContext;
import org.jboss.portal.identity.User;
/**
@@ -179,15 +178,13 @@
// ContentRenderer implementation ***********************************************************************************
- protected Instance getPortletInstance(RenderWindowCommand command)
+ protected Instance getPortletInstance(ContentRendererContext rendererContext)
{
- ControllerContext context = command.getControllerContext();
-
// The window
- Window window = command.getWindow();
+ Window window = rendererContext.getWindow();
// We need the user id
- User user = context.getUser();
+ User user = rendererContext.getUser();
// Get instance
return customizationManager.getInstance(window, user);
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java 2007-11-18 13:34:30 UTC (rev 9005)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/command/render/RenderWindowCommand.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -25,21 +25,28 @@
import org.jboss.portal.core.controller.ControllerContext;
import org.jboss.portal.core.controller.ControllerException;
import org.jboss.portal.core.controller.ControllerResponse;
+import org.jboss.portal.core.controller.portlet.PortletInvocationFactory;
import org.jboss.portal.core.controller.command.info.CommandInfo;
import org.jboss.portal.core.controller.command.info.ViewCommandInfo;
import org.jboss.portal.core.model.content.ContentType;
import org.jboss.portal.core.model.portal.PortalObjectId;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
import org.jboss.portal.core.model.portal.command.WindowCommand;
import org.jboss.portal.core.model.portal.content.ContentRenderer;
import org.jboss.portal.core.model.portal.content.ContentRendererRegistry;
import org.jboss.portal.core.model.portal.content.WindowRendition;
+import org.jboss.portal.core.model.portal.content.ContentRendererContext;
import org.jboss.portal.core.model.portal.control.page.PageControlContext;
+import org.jboss.portal.core.navstate.NavigationalStateKey;
+import org.jboss.portal.common.invocation.AttributeResolver;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
-public class RenderWindowCommand extends WindowCommand
+public class RenderWindowCommand extends WindowCommand implements ContentRendererContext
{
/** . */
@@ -95,4 +102,34 @@
//
return null;
}
+
+ public WindowNavigationalState getNavigationalState()
+ {
+ AttributeResolver nsResolver = context.getAttributeResolver(RenderWindowCommand.NAVIGATIONAL_STATE_SCOPE);
+ NavigationalStateKey nsKey = new NavigationalStateKey(WindowNavigationalState.class, window.getId());
+ return (WindowNavigationalState)nsResolver.getAttribute(nsKey);
+ }
+
+ public void setNavigationalState(WindowNavigationalState navigationalState)
+ {
+ AttributeResolver nsResolver = context.getAttributeResolver(RenderWindowCommand.NAVIGATIONAL_STATE_SCOPE);
+ NavigationalStateKey nsKey = new NavigationalStateKey(WindowNavigationalState.class, window.getId());
+ nsResolver.setAttribute(nsKey, navigationalState);
+ }
+
+ public User getUser()
+ {
+ return context.getUser();
+ }
+
+ public RenderInvocation createRenderInvocation(WindowNavigationalState navigationalState)
+ {
+ return PortletInvocationFactory.createRender(
+ context,
+ navigationalState.getMode(),
+ navigationalState.getWindowState(),
+ navigationalState.getContentState(),
+ window,
+ portal);
+ }
}
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java 2007-11-18 13:34:30 UTC (rev 9005)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRenderer.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -22,13 +22,11 @@
******************************************************************************/
package org.jboss.portal.core.model.portal.content;
-import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand;
-
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
*/
public interface ContentRenderer
{
- WindowRendition renderWindow(RenderWindowCommand cmd);
+ WindowRendition renderWindow(ContentRendererContext rendererContext);
}
Added: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/model/portal/content/ContentRendererContext.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -0,0 +1,48 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.core.model.portal.content;
+
+import org.jboss.portal.core.model.portal.Window;
+import org.jboss.portal.core.model.portal.navstate.WindowNavigationalState;
+import org.jboss.portal.identity.User;
+import org.jboss.portal.portlet.invocation.RenderInvocation;
+
+/**
+ * Abstract the services provided to a content renderer for the render phase.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface ContentRendererContext
+{
+
+ Window getWindow();
+
+ WindowNavigationalState getNavigationalState();
+
+ void setNavigationalState(WindowNavigationalState navigationalState);
+
+ User getUser();
+
+ RenderInvocation createRenderInvocation(WindowNavigationalState navigationalState);
+}
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java 2007-11-18 13:34:30 UTC (rev 9005)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/main/org/jboss/portal/core/cms/content/InternalCMSContentProvider.java 2007-11-18 14:47:07 UTC (rev 9006)
@@ -27,8 +27,8 @@
import org.jboss.portal.core.impl.model.content.generic.InternalGenericContentProvider;
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.model.portal.PortalObjectId;
-import org.jboss.portal.core.model.portal.command.render.RenderWindowCommand;
import org.jboss.portal.core.model.portal.content.WindowRendition;
+import org.jboss.portal.core.model.portal.content.ContentRendererContext;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -89,11 +89,11 @@
super.start();
}
- public WindowRendition renderWindow(RenderWindowCommand cmd)
+ public WindowRendition renderWindow(ContentRendererContext rendererContext)
{
try
{
- PortalObjectId windowId = cmd.getWindow().getId();
+ PortalObjectId windowId = rendererContext.getWindow().getId();
//
if (windowId.equals(targetWindowId))
@@ -102,7 +102,7 @@
}
//
- return super.renderWindow(cmd);
+ return super.renderWindow(rendererContext);
}
finally
{
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9005 - in branches/UIServer: core/src/main/org/jboss/portal/core and 14 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-18 08:34:30 -0500 (Sun, 18 Nov 2007)
New Revision: 9005
Added:
branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/
branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/
branches/UIServer/core-uiserver/src/resources/presentation-sar/
branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/
branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml
branches/UIServer/uiserver/src/resources/presentation-war/
Removed:
branches/UIServer/core/src/main/org/jboss/portal/core/presentation/
branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java
branches/UIServer/uiserver/src/resources/portal-uiserver.sar/
branches/UIServer/uiserver/src/resources/portal-uiserver.war/
Modified:
branches/UIServer/core-uiserver/build.xml
branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
branches/UIServer/core/build.xml
branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java
branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
branches/UIServer/tools/etc/buildfragments/modules.ent
branches/UIServer/uiserver/build.xml
Log:
- moved uiserver stuff from core to core-uiserver that deploys in a separate sar file
- re enabled the default jboss portal pipeline
- commented instance security instance interceptor that prevent access to instance on a redeploy of the core-uiserver sar
Modified: branches/UIServer/core/build.xml
===================================================================
--- branches/UIServer/core/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/build.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -133,7 +133,6 @@
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-security.classpath"/>
- <path refid="jboss.portal-uiserver.classpath"/>
<path refid="jboss.portal-test.classpath"/>
</path>
@@ -361,7 +360,7 @@
</target>
<!-- Build the jboss-portal-ha.sar -->
- <target name="output-ha" depends="artifacts,pre-output">
+ <target name="output-ha" depends="artifacts">
<copy todir="${build.resources}/jboss-portal-ha.sar">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
</copy>
@@ -379,13 +378,7 @@
</target>
- <!-- Build the jboss-portal.sar -->
- <target name="pre-output">
- <copy todir="${build.resources}/jboss-portal/portal-uiserver.sar">
- <fileset dir="${jboss.portal-uiserver.root}/resources/portal-uiserver.sar"/>
- </copy>
- </target>
- <target name="output" depends="artifacts,pre-output">
+ <target name="output" depends="artifacts">
<!-- Build configurations -->
<copy todir="${build.resources}/jboss-portal.sar">
<fileset dir="${build.resources}/jboss-portal" excludes="**/*.xml"/>
@@ -641,11 +634,6 @@
<test todir="${test.reports}"
name="org.jboss.portal.test.core.model.portal.PortalObjectPathTestCase"/>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.presentation.model.UIModelTester"
- outfile="TEST-UIModelTester">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
</x-test>
<x-classpath>
<pathelement location="${build.lib}/portal-core-lib.jar"/>
@@ -676,61 +664,7 @@
</x-classpath>
</execute-tests>
</target>
-
- <target name="test-presentation" depends="init">
- <execute-tests>
- <x-sysproperty>
-
- <!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
- -->
- <sysproperty
- key="jboss.aop.path"
- value="${build.resources}/jboss-portal.sar/portal-aop.xml${path.separator}${source.etc}/jboss-aop/base-aop.xml"/>
- <sysproperty
- key="jboss.aop.class.path"
- value="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
-
- </x-sysproperty>
- <x-test>
- <zest todir="${test.reports}" name="org.jboss.portal.test.core.presentation.model.UIModelTester"
- outfile="TEST-UIModelTester">
- <parameter name="CacheNaturalId" value="true"/>
- <parameter name="Config" value="persistent-jboss-beans.xml"/>
- </zest>
- </x-test>
- <x-classpath>
- <pathelement location="${build.lib}/portal-core-lib.jar"/>
- <pathelement location="${build.lib}/portal-core-test-lib.jar"/>
- <pathelement location="${build.resources}/jboss-portal.sar"/>
- <pathelement location="${jboss.portal-test.root}/etc"/>
- <pathelement location="${build.resources}"/>
-
- <path refid="apache.collections.classpath"/>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="apache.httpclient.classpath"/>
- <path refid="aop.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="cglib.cglib.classpath"/>
- <path refid="antlr.antlr.classpath"/>
- <path refid="asm.asm.classpath"/>
-
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <pathelement location="${nekohtml.nekohtml.lib}/nekohtml.jar"/>
- <pathelement location="${dbunit.dbunit.lib}/dbunit.jar"/>
- <pathelement location="${jdbc.connectors.lib}/mysql-connector-java.jar"/>
- <!--<pathelement location="postgresql-8.1-407.jdbc3.jar"/>-->
- </x-classpath>
- </execute-tests>
- </target>
-
<!--
Run a single unit test.
ant -Dtest=org.jboss.portal.test.core.model.portal.PortalObjectContainerTestCase one-test
Modified: branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/controller/Controller.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -314,7 +314,7 @@
ControllerResponse response = forward.getResponse();
processCommandResponse(controllerContext, command, response);
}
- /*else if (handlerResponse instanceof HTTPResponse)
+ else if (handlerResponse instanceof HTTPResponse)
{
HTTPResponse hr = (HTTPResponse)handlerResponse;
sendResponse(controllerContext, hr);
@@ -323,13 +323,13 @@
{
AjaxResponse ar = (AjaxResponse)handlerResponse;
sendResponse(controllerContext, ar);
- }*/
+ }
}
/**
* All http responses in the stack should be handled here.
*/
- /*protected void sendResponse(ControllerContext ctx, HTTPResponse resp)
+ protected void sendResponse(ControllerContext ctx, HTTPResponse resp)
{
try
{
@@ -343,12 +343,12 @@
{
log.error("Cound not send http response", e);
}
- }*/
+ }
/**
* All http responses in the stack should be handled here.
*/
- /*protected void sendResponse(ControllerContext ctx, AjaxResponse resp)
+ protected void sendResponse(ControllerContext ctx, AjaxResponse resp)
{
try
{
@@ -362,5 +362,5 @@
{
log.error("Cound not send http response", e);
}
- }*/
+ }
}
\ No newline at end of file
Modified: branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/main/org/jboss/portal/core/model/portal/PortalObjectResponseHandler.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -79,13 +79,7 @@
final PageRendition rendition = (PageRendition)resp;
final ServerInvocation invocation = controllerContext.getServerInvocation();
- /**
- * Used for integration with the new Presentation Framework
- */
- invocation.getServerContext().getClientRequest().setAttribute("pfTask", "aggregate");
- invocation.getServerContext().getClientRequest().setAttribute("pageResult", rendition.getPageResult());
-
- /*return new HTTPResponse()
+ return new HTTPResponse()
{
public void sendResponse(ServerInvocationContext ctx) throws IOException, ServletException
{
@@ -93,8 +87,7 @@
MarkupInfo markupInfo = (MarkupInfo)invocation.getResponse().getContentInfo();
rendition.render(markupInfo, dispatcher);
}
- };*/
- return null;
+ };
}
else
{
Deleted: branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/main/org/jboss/portal/test/core/presentation/model/UIModelTester.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -1,150 +0,0 @@
-/******************************************************************************
- * JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
- * contributors as indicated by the @authors tag. See the *
- * copyright.txt in the distribution for a full listing of *
- * individual contributors. *
- * *
- * This is free software; you can redistribute it and/or modify it *
- * under the terms of the GNU Lesser General Public License as *
- * published by the Free Software Foundation; either version 2.1 of *
- * the License, or (at your option) any later version. *
- * *
- * This software is distributed in the hope that it will be useful, *
- * but WITHOUT ANY WARRANTY; without even the implied warranty of *
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
- * Lesser General Public License for more details. *
- * *
- * You should have received a copy of the GNU Lesser General Public *
- * License along with this software; if not, write to the Free *
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
- ******************************************************************************/
-package org.jboss.portal.test.core.presentation.model;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import junit.framework.TestSuite;
-
-import org.apache.log4j.Logger;
-import org.jboss.portal.test.core.model.portal.AbstractPortalObjectContainerTestCase;
-import org.jboss.portal.test.framework.AbstractPortalTestCase;
-
-import org.jboss.portal.common.junit.TransactionAssert;
-import org.jboss.portal.core.model.portal.*;
-import org.jboss.portal.core.model.content.ContentType;
-import org.jboss.portal.core.presentation.model.ModelLoaderImpl;
-import org.jboss.portal.presentation.impl.model.UIContextImpl;
-import org.jboss.portal.presentation.model.UIContext;
-import org.jboss.portal.presentation.model.UIObject;
-import org.jboss.portal.presentation.model.UIPortal;
-import org.jboss.portal.presentation.model.UIPage;
-
-/**
- * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
- *
- */
-public class UIModelTester extends AbstractPortalObjectContainerTestCase
-{
- private Logger logger = Logger.getLogger(this.getClass());
-
- private UIContext uiContext = null;
-
- /**
- *
- * @return
- * @throws Exception
- */
- public static TestSuite suite() throws Exception
- {
- return AbstractPortalTestCase.suite(UIModelTester.class);
- }
-
- /**
- *
- */
- public void setUp() throws Exception
- {
- super.setUp();
- ModelLoaderImpl modelLoader = new ModelLoaderImpl();
- modelLoader.setPortalObjectContainer(this.container);
- this.uiContext = new UIContextImpl(modelLoader);
- this.loadPortalObjectContainer();
- }
-
- /**
- *
- */
- public void tearDown() throws Exception
- {
- super.tearDown();
- this.uiContext = null;
- }
-
- /**
- *
- * @throws Exception
- */
- /*public void testModelLoading() throws Exception
- {
- TransactionAssert.beginTransaction();
-
- //Setup rootChildrenInfo
- Map rootChildrenInfo = new HashMap();
- rootChildrenInfo.put("defaultPortal", UIPortal.class);
-
- UIContext objectTree = this.uiContext.initUIObjectTree(rootChildrenInfo);
- UIPortal defaultPortal = objectTree.getChildren(UIPortal.class).get(0);
-
- assertEquals(defaultPortal.getName(), "defaultPortal");
- assertEquals(defaultPortal.getId(), "/defaultPortal");
-
- List<UIObject> lazyLoadedChildren = defaultPortal.getChildren();
-
- assertTrue((lazyLoadedChildren != null && lazyLoadedChildren.size()>0));
- for(int i=0; i<lazyLoadedChildren.size(); i++)
- {
- UIObject child = lazyLoadedChildren.get(i);
- assertEquals(child.getParent().getName(), "defaultPortal");
- assertEquals(child.getParent().getId(), "/defaultPortal");
- assertTrue(child instanceof UIPage);
- assertTrue(child.getId().equals("/defaultPortal/page1") || child.getId().equals("/defaultPortal/page2"));
-
- if(child.getId().equals("/defaultPortal/page1"))
- {
- List<UIObject> subchildren = child.getChildren();
- for(int j=0; j<subchildren.size(); j++)
- {
- UIObject subchild = subchildren.get(j);
-
- logger.info("------------------------------");
- logger.info("Child="+subchild+"("+subchild.getId()+")");
- logger.info("------------------------------");
- }
- }
- }
-
-
- TransactionAssert.commitTransaction();
- }*/
-
- /**
- *
- *
- */
- private void loadPortalObjectContainer() throws Exception
- {
- TransactionAssert.beginTransaction();
- PortalContainer ctx = container.getContext();
- Portal portal_1 = ctx.createPortal("defaultPortal");
- Page page_1_1 = portal_1.createPage("page1");
- Page page_1_2 = portal_1.createPage("page2");
- Page page_1_1_1 = page_1_1.createPage("subpage1");
- Page page_1_1_3 = page_1_1.createPage("subpage2");
- Window window_1_1_2 = page_1_1.createWindow("window1", ContentType.PORTLET, "uri");
- Window window_1_1_4 = page_1_1.createWindow("window3", ContentType.PORTLET, "uri");
- TransactionAssert.commitTransaction();
- }
-}
Modified: branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -287,7 +287,7 @@
<xmbean/>
<depends-list optional-attribute-name="InterceptorNames">
<depends-list-element>portal:service=Interceptor,type=Portlet,name=ConsumerCache</depends-list-element>
- <depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>
+ <!--<depends-list-element>portal:service=Interceptor,type=Portlet,name=InstanceSecurity</depends-list-element>-->
<depends-list-element>portal:service=Interceptor,type=Portlet,name=PortalSessionSynchronization</depends-list-element>
</depends-list>
</mbean>
@@ -1053,7 +1053,7 @@
<!-- The controller -->
<mbean
code="org.jboss.portal.core.controller.Controller"
- name="portal:service=RequestController"
+ name="portal:service=Controller"
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
@@ -1091,64 +1091,6 @@
optional-attribute-name="PageControlPolicy"
proxy-type="attribute">portal:service=ControlPolicy,type=Page</depends>
</mbean>
- <mbean
- code="org.jboss.portal.core.presentation.server.PresentationServerImpl"
- name="portal:service=PresentationServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="Processor" proxy-type="attribute">portal:service=Processor</depends>
- <depends optional-attribute-name="ModelLoader" proxy-type="attribute">portal:container=ModelLoader</depends>
- <depends optional-attribute-name="ControllerContextFactory" proxy-type="attribute">portal:service=RequestController</depends>
- <depends>portal:service=PageService</depends>
- <depends>portal:commandFactory=DefaultPortal</depends>
- <depends>portal:urlFactory=Delegating</depends>
- <depends>portal:service=InterceptorStackFactory,type=Command</depends>
- <depends>portal:container=Instance</depends>
- <depends>portal:service=PortalAuthorizationManagerFactory</depends>
- <depends>portal:service=CustomizationManager</depends>
- <depends>portal:service=ContentProviderRegistry</depends>
- <depends>portal:service=ResponseHandler,type=Selector</depends>
- <depends>portal:service=ControlPolicy,type=Page</depends>
- </mbean>
- <mbean
- code="org.jboss.portal.core.presentation.server.MainProcessor"
- name="portal:service=Processor"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="RequestController" proxy-type="attribute">portal:service=RequestController</depends>
- <depends>portal:container=PortalObject</depends>
- <depends>portal:service=PageService</depends>
- <depends>portal:commandFactory=DefaultPortal</depends>
- <depends>portal:urlFactory=Delegating</depends>
- <depends>portal:service=InterceptorStackFactory,type=Command</depends>
- <depends>portal:container=Instance</depends>
- <depends>portal:service=PortalAuthorizationManagerFactory</depends>
- <depends>portal:service=CustomizationManager</depends>
- <depends>portal:service=ContentProviderRegistry</depends>
- <depends>portal:service=ResponseHandler,type=Selector</depends>
- <depends>portal:service=ControlPolicy,type=Page</depends>
- </mbean>
- <mbean
- code="org.jboss.portal.core.presentation.model.ModelLoaderImpl"
- name="portal:container=ModelLoader"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends>
- <depends>portal:container=PortalObject</depends>
- <depends>portal:service=PageService</depends>
- <depends>portal:commandFactory=DefaultPortal</depends>
- <depends>portal:urlFactory=Delegating</depends>
- <depends>portal:service=InterceptorStackFactory,type=Command</depends>
- <depends>portal:container=Instance</depends>
- <depends>portal:service=PortalAuthorizationManagerFactory</depends>
- <depends>portal:service=CustomizationManager</depends>
- <depends>portal:service=ContentProviderRegistry</depends>
- <depends>portal:service=ResponseHandler,type=Selector</depends>
- <depends>portal:service=ControlPolicy,type=Page</depends>
- </mbean>
<!-- The controller factory -->
<mbean
Modified: branches/UIServer/core-uiserver/build.xml
===================================================================
--- branches/UIServer/core-uiserver/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/core-uiserver/build.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -90,23 +90,9 @@
<echo message="${xdoclet.xdoclet.lib}"/>
<echo message="${sun.servlet.lib}"/>
<path id="library.classpath">
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
- <path refid="apache.ant.classpath"/>
- <path refid="apache.collections.classpath"/>
<path refid="apache.log4j.classpath"/>
- <path refid="apache.httpclient.classpath"/>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.codec.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="jboss.test.classpath"/>
<path refid="sun.servlet.classpath"/>
- <path refid="jboss/backport.concurrent.classpath"/>
- <pathelement location="jboss-bean-deployer.jar"/>
- <pathelement location="jboss-container.jar"/>
- <pathelement location="jboss-dependency.jar"/>
- <pathelement location="jboss-microcontainer.jar"/>
</path>
<!-- Configure modules -->
@@ -116,6 +102,9 @@
<path refid="jboss.portal-web.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-test.classpath"/>
+ <path refid="jboss.portal-server.classpath"/>
+ <path refid="jboss.portal-uiserver.classpath"/>
+ <path refid="jboss.portal-core.classpath"/>
</path>
<!--+=======================================+-->
@@ -166,98 +155,26 @@
<mkdir dir="${build.lib}"/>
<!-- -->
- <jar jarfile="${build.lib}/portal-server-lib.jar">
- <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
- </jar>
+ <jar jarfile="${build.lib}/portal-core-presentation-lib.jar">
+ <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
+ </jar>
- <copy todir="${build.resources}/portal-server-sar">
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${build.lib}/" includes="portal-server-lib.jar"/>
- </copy>
- <jar jarfile="${build.lib}/portal-server.sar">
- <fileset dir="${build.resources}/portal-server-sar"/>
- </jar>
- <jar jarfile="${build.lib}/portal-server-test-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/server/**"/>
- </jar>
- <jar jarfile="${build.lib}/portal-server-test-framework-lib.jar">
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/**"/>
- </jar>
- </target>
+ <copy file="${gwt.gwt.root}/lib/gwt-user.jar" todir="${build.resources}/presentation-sar/lib" overwrite="true"/>
+ <copy file="${build.lib}/portal-core-presentation-lib.jar" todir="${build.resources}/presentation-sar/lib" overwrite="true"/>
+ <copy file="${jboss.portal-uiserver.lib}/portal-presentation-lib.jar" todir="${build.resources}/presentation-sar/lib" overwrite="true"/>
+ <copy todir="${build.resources}/presentation-sar">
+ <fileset dir="${jboss.portal-uiserver.lib}" includes="presentation.war"/>
+ </copy>
+ <jar jarfile="${build.lib}/presentation.sar">
+ <fileset dir="${build.resources}/presentation-sar"/>
+ </jar>
+ </target>
+
<!-- generates artifacts used for tests, requires output to be previously run -->
<target name="package-tests" depends="init">
+ </target>
- <jar jarfile="${build.lib}/test-agent.war">
- <fileset dir="${build.resources}/test-agent-war"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-parameters.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-parameters-sar"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-servlet-rootpathmapping.war">
- <fileset dir="${build.resources}/test/test-servlet-rootpathmapping-war"/>
- </jar>
- <jar jarfile="${build.lib}/test-servlet-pathmapping.war">
- <fileset dir="${build.resources}/test/test-servlet-pathmapping-war"/>
- </jar>
- <jar jarfile="${build.lib}/test-servlet-defaultservletmapping.war">
- <fileset dir="${build.resources}/test/test-servlet-defaultservletmapping-war"/>
- </jar>
- <jar jarfile="${build.lib}/test-servlet.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-servlet-sar"/>
- <fileset dir="${build.lib}" includes="test-servlet-rootpathmapping.war"/>
- <fileset dir="${build.lib}" includes="test-servlet-pathmapping.war"/>
- <fileset dir="${build.lib}" includes="test-servlet-defaultservletmapping.war"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-charset.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-charset-sar"/>
- </jar>
-
- <jar jarfile="${build.lib}/test-response.sar">
- <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
- <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
- <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
- <fileset dir="${build.lib}" includes="test-agent.war"/>
- <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
- <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
- <fileset dir="${build.resources}/test/test-response-sar"/>
- </jar>
- </target>
-
<!-- ================================================================== -->
<!-- Cleaning -->
<!-- ================================================================== -->
@@ -294,45 +211,16 @@
description="Deploy."
depends="output">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy file="${build.lib}/portal-server.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy file="${build.lib}/presentation.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
</target>
<target name="undeploy"
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-server.sar"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/presentation.sar"/>
</target>
<target name="tests" depends="init">
- <execute-tests>
- <x-sysproperty>
- <sysproperty key="test.root" value="${build.lib}"/>
- <sysproperty key="test.uri" value="/test/redirect/"/>
-<!--
- <jvmarg value="-Xdebug"/>
- <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
--->
- </x-sysproperty>
- <x-test>
- <!-- Server side tests -->
- <test todir="${test.reports}" name="org.jboss.portal.test.server.CharsetTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.ParametersTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.ServletTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.ResponseTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.server.request.URLContextTestCase"/>
- </x-test>
- <x-classpath>
- <path refid="jboss.serialization.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- </x-classpath>
- </execute-tests>
</target>
</project>
Copied: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation (from rev 8997, branches/UIServer/core/src/main/org/jboss/portal/core/presentation)
Modified: branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java
===================================================================
--- branches/UIServer/core/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-17 22:27:52 UTC (rev 8997)
+++ branches/UIServer/core-uiserver/src/main/org/jboss/portal/core/presentation/server/MainProcessor.java 2007-11-18 13:34:30 UTC (rev 9005)
@@ -24,9 +24,7 @@
import org.apache.log4j.Logger;
-import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.server.ServerException;
-import org.jboss.portal.server.RequestController;
import org.jboss.portal.presentation.RequestContext;
@@ -41,7 +39,7 @@
* @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
*
*/
-public class MainProcessor extends AbstractJBossService implements Processor
+public class MainProcessor implements Processor
{
/**
*
@@ -51,29 +49,6 @@
/**
*
*/
- private RequestController requestController = null;
-
- /**
- *
- * @return
- */
- public RequestController getRequestController()
- {
- return requestController;
- }
-
- /**
- *
- * @param requestController
- */
- public void setRequestController(RequestController requestController)
- {
- this.requestController = requestController;
- }
-
- /**
- *
- */
public ProcessorResponse process(RequestContext requestContext, ProcessorRequest request) throws ServerException
{
try
Added: branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml
===================================================================
--- branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml (rev 0)
+++ branches/UIServer/core-uiserver/src/resources/presentation-sar/META-INF/jboss-service.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<server>
+
+ <mbean
+ code="org.jboss.portal.presentation.controller.UIController"
+ name="portal:service=Controller,type=Presentation"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="PresentationServer" proxy-type="attribute">portal:service=PresentationServer</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.server.impl.RequestControllerFactoryImpl"
+ name="portal:service=ControllerFactory,type=Presentation"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends
+ optional-attribute-name="Controller"
+ proxy-type="attribute">portal:service=Controller,type=Presentation</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.presentation.impl.entry.EntryPointImpl"
+ name="portal:service=EntryPoint"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="InterceptorStackFactory" proxy-type="attribute">portal:service=InterceptorStackFactory,type=Server</depends>
+ <depends optional-attribute-name="ControllerFactory" proxy-type="attribute">portal:service=ControllerFactory,type=Presentation</depends>
+ <depends optional-attribute-name="PortalServer" proxy-type="attribute">portal:service=Server</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.presentation.server.PresentationServerImpl"
+ name="portal:service=PresentationServer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="Processor" proxy-type="attribute">portal:service=Processor</depends>
+ <depends optional-attribute-name="ModelLoader" proxy-type="attribute">portal:container=ModelLoader</depends>
+ <depends optional-attribute-name="ControllerContextFactory" proxy-type="attribute">portal:service=Controller</depends>
+ <depends>portal:service=PageService</depends>
+ <depends>portal:commandFactory=DefaultPortal</depends>
+ <depends>portal:urlFactory=Delegating</depends>
+ <depends>portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends>portal:container=Instance</depends>
+ <depends>portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends>portal:service=CustomizationManager</depends>
+ <depends>portal:service=ContentProviderRegistry</depends>
+ <depends>portal:service=ResponseHandler,type=Selector</depends>
+ <depends>portal:service=ControlPolicy,type=Page</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.presentation.server.MainProcessor"
+ name="portal:service=Processor"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends>portal:container=PortalObject</depends>
+ <depends>portal:service=PageService</depends>
+ <depends>portal:commandFactory=DefaultPortal</depends>
+ <depends>portal:urlFactory=Delegating</depends>
+ <depends>portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends>portal:container=Instance</depends>
+ <depends>portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends>portal:service=CustomizationManager</depends>
+ <depends>portal:service=ContentProviderRegistry</depends>
+ <depends>portal:service=ResponseHandler,type=Selector</depends>
+ <depends>portal:service=ControlPolicy,type=Page</depends>
+ </mbean>
+ <mbean
+ code="org.jboss.portal.core.presentation.model.ModelLoaderImpl"
+ name="portal:container=ModelLoader"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends optional-attribute-name="PortalObjectContainer" proxy-type="attribute">portal:container=PortalObject</depends>
+ <depends>portal:container=PortalObject</depends>
+ <depends>portal:service=PageService</depends>
+ <depends>portal:commandFactory=DefaultPortal</depends>
+ <depends>portal:urlFactory=Delegating</depends>
+ <depends>portal:service=InterceptorStackFactory,type=Command</depends>
+ <depends>portal:container=Instance</depends>
+ <depends>portal:service=PortalAuthorizationManagerFactory</depends>
+ <depends>portal:service=CustomizationManager</depends>
+ <depends>portal:service=ContentProviderRegistry</depends>
+ <depends>portal:service=ResponseHandler,type=Selector</depends>
+ <depends>portal:service=ControlPolicy,type=Page</depends>
+ </mbean>
+
+</server>
Modified: branches/UIServer/tools/etc/buildfragments/modules.ent
===================================================================
--- branches/UIServer/tools/etc/buildfragments/modules.ent 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/tools/etc/buildfragments/modules.ent 2007-11-18 13:34:30 UTC (rev 9005)
@@ -198,13 +198,7 @@
<property name="jboss.portal-uiserver.root" value="${project.root}/uiserver/output"/>
<property name="jboss.portal-uiserver.lib" value="${jboss.portal-uiserver.root}/lib"/>
<path id="jboss.portal-uiserver.classpath">
- <pathelement path="${jboss.portal-uiserver.lib}/portal-uiserver-lib.jar"/>
+ <pathelement path="${jboss.portal-uiserver.lib}/portal-presentation-lib.jar"/>
</path>
- <!-- core-uiserver -->
- <property name="jboss.portal-core-uiserver.root" value="${project.root}/core-uiserver/output"/>
- <property name="jboss.portal-core-uiserver.lib" value="${jboss.portal-core-uiserver.root}/lib"/>
- <path id="jboss.portal-core-uiserver.classpath">
- <pathelement path="${jboss.portal-core-uiserver.lib}/portal-core-uiserver-lib.jar"/>
- </path>
</target>
Modified: branches/UIServer/uiserver/build.xml
===================================================================
--- branches/UIServer/uiserver/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
+++ branches/UIServer/uiserver/build.xml 2007-11-18 13:34:30 UTC (rev 9005)
@@ -205,35 +205,33 @@
<mkdir dir="${build.lib}"/>
- <!-- portal-uiserver-lib.jar -->
- <jar jarfile="${build.lib}/portal-uiserver-lib.jar">
+ <!-- portal-presentation-lib.jar -->
+ <jar jarfile="${build.lib}/portal-presentation-lib.jar">
<fileset dir="${build.classes}">
</fileset>
- <fileset dir="../portlet/output/classes">
- </fileset>
</jar>
- <!-- portal-uiserver.war -->
+ <!-- presentation.war -->
<!-- compile the GWT Java code into JavaScript/Web resources -->
<!--
These are only standalone GWT prototypes
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.uiserver.ajax.PortalLayout"/>
+ <delete dir="${build.resources}/presentation.war/org.jboss.portal.uiserver.ajax.PortalLayout"/>
<java classpathref="gwt.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
</classpath>
- <arg line="-out ${build.resources}/portal-uiserver.war/"/>
+ <arg line="-out ${build.resources}/presentation.war/"/>
<arg line="org.jboss.portal.uiserver.ajax.PortalLayout"/>
</java>
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.uiserver.ajax.PartialRefresh"/>
+ <delete dir="${build.resources}/presentation.war/org.jboss.portal.uiserver.ajax.PartialRefresh"/>
<java classpathref="gwt.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
</classpath>
- <arg line="-out ${build.resources}/portal-uiserver.war/"/>
+ <arg line="-out ${build.resources}/presentation.war/"/>
<arg line="org.jboss.portal.uiserver.ajax.PartialRefresh"/>
</java>
-->
@@ -242,33 +240,24 @@
<path refid="gwt.gwt.classpath"/>
<path refid="mygwt.mygwt.classpath"/>
</path>
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.presentation.ajax.Portal"/>
+ <delete dir="${build.resources}/presentation-war/org.jboss.portal.presentation.ajax.Portal"/>
<java classpathref="full.gwt.classpath" fork="true" classname="com.google.gwt.dev.GWTCompiler">
<classpath>
<pathelement path="src/main"/>
<pathelement path="src/resources/client/ajax/src"/>
</classpath>
- <arg line="-out ${build.resources}/portal-uiserver.war/"/>
+ <arg line="-out ${build.resources}/presentation-war/"/>
<arg line="org.jboss.portal.presentation.ajax.Portal"/>
</java>
- <jar jarfile="${build.lib}/portal-uiserver.war">
- <fileset dir="${build.resources}/portal-uiserver.war"></fileset>
+ <jar jarfile="${build.lib}/presentation.war">
+ <fileset dir="${build.resources}/presentation-war"></fileset>
</jar>
- <copy todir="${build.resources}/portal-uiserver.war">
- <fileset dir="${build.resources}/portal-uiserver.war/org.jboss.portal.presentation.ajax.Portal"/>
+ <copy todir="${build.resources}/presentation-war">
+ <fileset dir="${build.resources}/presentation-war/org.jboss.portal.presentation.ajax.Portal"/>
</copy>
- <delete dir="${build.resources}/portal-uiserver.war/org.jboss.portal.presentation.ajax.Portal"/>
+ <delete dir="${build.resources}/presentation-war/org.jboss.portal.presentation.ajax.Portal"/>
- <!-- portal-uiserver.sar -->
- <copy file="${gwt.gwt.root}/lib/gwt-user.jar" todir="${build.resources}/portal-uiserver.sar/lib" overwrite="true"/>
- <copy file="${build.lib}/portal-uiserver-lib.jar" todir="${build.resources}/portal-uiserver.sar/lib" overwrite="true"/>
- <copy todir="${build.resources}/portal-uiserver.sar/portal-uiserver.war">
- <fileset dir="${build.resources}/portal-uiserver.war"/>
- </copy>
- <jar jarfile="${build.lib}/portal-uiserver.sar">
- <fileset dir="${build.resources}/portal-uiserver.sar"></fileset>
- </jar>
</target>
<target name="output" depends="artifacts">
Copied: branches/UIServer/uiserver/src/resources/presentation-war (from rev 8997, branches/UIServer/uiserver/src/resources/portal-uiserver.war)
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9004 - in branches/UIServer: build/ide/intellij/idea60 and 8 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-11-17 19:52:27 -0500 (Sat, 17 Nov 2007)
New Revision: 9004
Added:
branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/
branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml
branches/UIServer/build/ide/intellij/idea60/modules/uiserver/
branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml
branches/UIServer/core-uiserver/
branches/UIServer/core-uiserver/.classpath
branches/UIServer/core-uiserver/.cvsignore
branches/UIServer/core-uiserver/.project
branches/UIServer/core-uiserver/build.bat
branches/UIServer/core-uiserver/build.sh
branches/UIServer/core-uiserver/build.xml
branches/UIServer/core-uiserver/src/
branches/UIServer/core-uiserver/src/main/
branches/UIServer/core-uiserver/src/main/org/
branches/UIServer/core-uiserver/src/main/org/jboss/
branches/UIServer/core-uiserver/src/main/org/jboss/portal/
branches/UIServer/core-uiserver/src/resources/
Modified:
branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr
Log:
resurrect core-uiserver to contain the actual impl of uiserver for core in order to get a separate deployment life cycle
Modified: branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr 2007-11-18 00:28:24 UTC (rev 9003)
+++ branches/UIServer/build/ide/intellij/idea60/jboss-portal.ipr 2007-11-18 00:52:27 UTC (rev 9004)
@@ -129,6 +129,32 @@
<option name="FILTER_INFO" value="true" />
<option name="CUSTOM_FILTER" />
</component>
+ <component name="MavenBuildProjectComponent">
+ <option name="mavenExecutable" value="" />
+ <option name="Settings File" value="/Users/julien/.m2/settings.xml" />
+ <option name="mavenCommandLineParams" value="" />
+ <option name="vmOptions" value="" />
+ <option name="useMavenEmbedder" value="false" />
+ <option name="useFilter" value="false" />
+ <option name="Batch Mode" value="false" />
+ <option name="Check Plugin Updates" value="false" />
+ <option name="Debug" value="false" />
+ <option name="Errors" value="false" />
+ <option name="Fail At End" value="false" />
+ <option name="Fail Fast" value="false" />
+ <option name="Fail Never" value="false" />
+ <option name="Lax Checksums" value="false" />
+ <option name="No Plugin Registry" value="false" />
+ <option name="No Plugin Updates" value="false" />
+ <option name="Non Recursive" value="false" />
+ <option name="Offline" value="false" />
+ <option name="Reactor" value="false" />
+ <option name="Strict Checksums" value="false" />
+ <option name="Update Plugins" value="false" />
+ <option name="Update Snapshots" value="false" />
+ <option name="Skip Tests" value="false" />
+ <pom-list />
+ </component>
<component name="Palette2">
<group name="Swing">
<item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
@@ -254,7 +280,6 @@
<modules>
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/api/api.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/api/api.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/bridge/bridge.iml" />
- <module fileurl="file://$PROJECT_DIR$/build/build.iml" filepath="$PROJECT_DIR$/build/build.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" />
@@ -262,6 +287,7 @@
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" />
@@ -278,12 +304,14 @@
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/uiserver/uiserver.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/uiserver/uiserver.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/web/web.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" project-jdk-type="JavaSDK">
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="true" project-jdk-name="1.5" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/output" />
</component>
<component name="ProjectRunConfigurationManager" />
Added: branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml (rev 0)
+++ branches/UIServer/build/ide/intellij/idea60/modules/core-uiserver/core-uiserver.iml 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../core-uiserver">
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../core-uiserver/src/main" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="uiserver" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Added: branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml
===================================================================
--- branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml (rev 0)
+++ branches/UIServer/build/ide/intellij/idea60/modules/uiserver/uiserver.iml 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager" inherit-compiler-output="true">
+ <exclude-output />
+ <content url="file://$MODULE_DIR$/../../../../../../uiserver">
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../uiserver/src/main" isTestSource="false" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module" module-name="api" />
+ <orderEntry type="module" module-name="common" />
+ <orderEntry type="module" module-name="server" />
+ <orderEntry type="module" module-name="web" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet/lib/servlet-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j/lib/log4j.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/gwt/lib/gwt-user.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntryProperties />
+ </component>
+</module>
+
Added: branches/UIServer/core-uiserver/.classpath
===================================================================
--- branches/UIServer/core-uiserver/.classpath (rev 0)
+++ branches/UIServer/core-uiserver/.classpath 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/test"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
+ <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/jems"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/web"/>
+ <classpathentry kind="lib" path="/thirdparty/jboss/backport-concurrent/lib/jboss-backport-concurrent.jar"/>
+ <classpathentry kind="output" path="bin"/>
+</classpath>
Property changes on: branches/UIServer/core-uiserver/.classpath
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/UIServer/core-uiserver/.cvsignore
===================================================================
--- branches/UIServer/core-uiserver/.cvsignore (rev 0)
+++ branches/UIServer/core-uiserver/.cvsignore 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,2 @@
+bin
+output
Property changes on: branches/UIServer/core-uiserver/.cvsignore
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/UIServer/core-uiserver/.project
===================================================================
--- branches/UIServer/core-uiserver/.project (rev 0)
+++ branches/UIServer/core-uiserver/.project 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>server</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ </natures>
+</projectDescription>
Property changes on: branches/UIServer/core-uiserver/.project
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/UIServer/core-uiserver/build.bat
===================================================================
--- branches/UIServer/core-uiserver/build.bat (rev 0)
+++ branches/UIServer/core-uiserver/build.bat 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,54 @@
+@echo off
+rem
+rem Invokes a script of the same name in the 'tools' module.
+rem
+rem The 'tools' module is expected to be a peer directory of the directory
+rem in which this script lives.
+rem
+rem @author Jason Dillon <jason(a)planet57.com>
+rem
+
+rem $Id: build.bat 21 2005-01-14 23:14:21Z vietj $
+
+setlocal
+
+set PROGNAME=%~nx0
+set DIRNAME=%~dp0
+
+rem Legacy shell support
+if x%PROGNAME%==x set PROGNAME=build.bat
+if x%DIRNAME%==x set DIRNAME=.\
+
+set MODULE_ROOT=%DIRNAME%
+if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools
+set TARGET=%TOOLS_ROOT%\bin\build.bat
+set ARGS=%*
+
+rem Start'er up yo
+goto main
+
+:debug
+if not x%DEBUG%==x echo %PROGNAME%: %*
+goto :EOF
+
+:main
+call :debug PROGNAME=%PROGNAME%
+call :debug DIRNAME=%DIRNAME%
+call :debug TOOLS_ROOT=%TOOLS_ROOT%
+call :debug TARGET=%TARGET%
+
+if exist %TARGET% call :call-script & goto :EOF
+rem else fail, we can not go on
+
+echo %PROGNAME%: *ERROR* The target executable does not exist:
+echo %PROGNAME%:
+echo %PROGNAME%: %TARGET%
+echo %PROGNAME%:
+echo %PROGNAME%: Please make sure you have checked out the 'tools' module
+echo %PROGNAME%: and make sure it is up to date.
+goto :EOF
+
+:call-script
+call :debug Executing %TARGET% %ARGS%
+call %TARGET% %ARGS%
+goto :EOF
Property changes on: branches/UIServer/core-uiserver/build.bat
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/UIServer/core-uiserver/build.sh
===================================================================
--- branches/UIServer/core-uiserver/build.sh (rev 0)
+++ branches/UIServer/core-uiserver/build.sh 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,49 @@
+#!/bin/sh
+##
+## Invokes a script of the same name in the 'tools' module.
+##
+## The 'tools' module is expected to be a peer directory of the directory
+## in which this script lives.
+##
+## @author Jason Dillon <jason(a)planet57.com>
+##
+
+# $Id: build.sh 21 2005-01-14 23:14:21Z vietj $
+
+PROGNAME=`basename $0`
+DIRNAME=`dirname $0`
+
+# Buss it yo
+main() {
+ if [ "x$TOOLS_ROOT" = "x" ]; then
+ TOOLS_ROOT=`cd $DIRNAME/../tools && pwd`
+ fi
+
+ MODULE_ROOT=`cd $DIRNAME; pwd`
+ export TOOLS_ROOT MODULE_ROOT DEBUG TRACE
+
+ # Where is the target script?
+ target="$TOOLS_ROOT/bin/$PROGNAME"
+ if [ ! -f "$target" ]; then
+ echo "${PROGNAME}: *ERROR* The target executable does not exist:"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: $target"
+ echo "${PROGNAME}:"
+ echo "${PROGNAME}: Please make sure you have checked out the 'tools' module"
+ echo "${PROGNAME}: and make sure it is up to date."
+ exit 2
+ fi
+
+ # Get busy yo!
+ if [ "x$DEBUG" != "x" ]; then
+ echo "${PROGNAME}: Executing: /bin/sh $target $@"
+ fi
+ if [ "x$TRACE" = "x" ]; then
+ exec /bin/sh $target "$@"
+ else
+ exec /bin/sh -x $target "$@"
+ fi
+}
+
+# Lets get ready to rumble!
+main "$@"
Property changes on: branches/UIServer/core-uiserver/build.sh
___________________________________________________________________
Name: svn:executable
+ *
Added: branches/UIServer/core-uiserver/build.xml
===================================================================
--- branches/UIServer/core-uiserver/build.xml (rev 0)
+++ branches/UIServer/core-uiserver/build.xml 2007-11-18 00:52:27 UTC (rev 9004)
@@ -0,0 +1,338 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE project [
+ <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
+ ]>
+
+<!-- $Id: build.xml 6929 2007-04-05 21:05:42Z julien(a)jboss.com $ -->
+
+<!--+======================================================================+-->
+<!--| JBoss Portal (The OpenSource Portal) Build File |-->
+<!--| |-->
+<!--| Distributable under LGPL license. |-->
+<!--| See terms of license at http://www.gnu.org. |-->
+<!--| |-->
+<!--| This file has been designed to work with the 'tools' module and |-->
+<!--| Buildmagic extentions. |-->
+<!--+======================================================================+-->
+
+<project default="main" name="JBoss Portal">
+
+ <!--+====================================================================+-->
+ <!--| Setup |-->
+ <!--| |-->
+ <!--| Include the common build elements. |-->
+ <!--| |-->
+ <!--| This defines several different targets, properties and paths. |-->
+ <!--| It also sets up the basic extention tasks amoung other things. |-->
+ <!--+====================================================================+-->
+
+ &buildmagic;
+ &modules;
+ &defaults;
+ &tools;
+ &targets;
+
+ <!-- ================================================================== -->
+ <!-- Initialization -->
+ <!-- ================================================================== -->
+
+ <!--
+ | Initialize the build system. Must depend on '_buildmagic:init'.
+ | Other targets should depend on 'init' or things will mysteriously fail.
+ -->
+
+ <target name="init" unless="init.disable" depends="_buildmagic:init">
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Configuration |-->
+ <!--| |-->
+ <!--| This target is invoked by the Buildmagic initialization logic |-->
+ <!--| and should contain module specific configuration elements. |-->
+ <!--+====================================================================+-->
+
+ <target name="configure" unless="configure.disable">
+
+ <!-- Configure some properties -->
+ <property name="jboss-junit-configuration" value=""/>
+ <property name="junit.formatter.usefile" value="true"/>
+
+ <!-- Configure thirdparty libraries -->
+ &libraries;
+ <echo message="${xdoclet.xdoclet.lib}"/>
+ <echo message="${sun.servlet.lib}"/>
+ <path id="library.classpath">
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="apache.ant.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="apache.httpclient.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.codec.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="jboss.test.classpath"/>
+ <path refid="sun.servlet.classpath"/>
+ <path refid="jboss/backport.concurrent.classpath"/>
+ <pathelement location="jboss-bean-deployer.jar"/>
+ <pathelement location="jboss-container.jar"/>
+ <pathelement location="jboss-dependency.jar"/>
+ <pathelement location="jboss-microcontainer.jar"/>
+ </path>
+
+ <!-- Configure modules -->
+ <call target="configure-modules"/>
+ <path id="dependentmodule.classpath">
+ <path refid="jboss.portal-common.classpath"/>
+ <path refid="jboss.portal-web.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="jboss.portal-test.classpath"/>
+ </path>
+
+ <!--+=======================================+-->
+ <!--| Override any default properties here. |-->
+ <!--+=======================================+-->
+
+ <!-- Configure defaults & build tools -->
+ <call target="configure-defaults"/>
+ <call target="configure-tools"/>
+
+ <!--+=======================================+-->
+ <!--| Define module specific elements here. |-->
+ <!--+=======================================+-->
+ <property name="javadoc.private" value="true"/>
+ <property name="javadoc.protected" value="false"/>
+
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Compile |-->
+ <!--| |-->
+ <!--| This target should depend on other compile-* targets for each |-->
+ <!--| different type of compile that needs to be performed, short of |-->
+ <!--| documentation compiles. |-->
+ <!--+====================================================================+-->
+
+ <target name="compile"
+ description="Compile all source files."
+ depends="_default:compile-classes,
+ _default:compile-etc,
+ _default:compile-resources">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Generate Output |-->
+ <!--| |-->
+ <!--| Generates the target output for this module. Target output is |-->
+ <!--| the output which is ment to be released or used by external |-->
+ <!--| modules. |-->
+ <!--+====================================================================+-->
+
+ <target name="output"
+ description="Generate all target output."
+ depends="compile">
+
+ <!-- -->
+ <mkdir dir="${build.lib}"/>
+
+ <!-- -->
+ <jar jarfile="${build.lib}/portal-server-lib.jar">
+ <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/>
+ </jar>
+
+ <copy todir="${build.resources}/portal-server-sar">
+ <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+ <fileset dir="${build.lib}/" includes="portal-server-lib.jar"/>
+ </copy>
+ <jar jarfile="${build.lib}/portal-server.sar">
+ <fileset dir="${build.resources}/portal-server-sar"/>
+ </jar>
+ <jar jarfile="${build.lib}/portal-server-test-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/server/**"/>
+ </jar>
+ <jar jarfile="${build.lib}/portal-server-test-framework-lib.jar">
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/framework/**"/>
+ </jar>
+ </target>
+
+ <!-- generates artifacts used for tests, requires output to be previously run -->
+ <target name="package-tests" depends="init">
+
+ <jar jarfile="${build.lib}/test-agent.war">
+ <fileset dir="${build.resources}/test-agent-war"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/test-parameters.sar">
+ <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+ <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+ <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+ <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${build.lib}" includes="test-agent.war"/>
+ <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+ <fileset dir="${build.resources}/test/test-parameters-sar"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/test-servlet-rootpathmapping.war">
+ <fileset dir="${build.resources}/test/test-servlet-rootpathmapping-war"/>
+ </jar>
+ <jar jarfile="${build.lib}/test-servlet-pathmapping.war">
+ <fileset dir="${build.resources}/test/test-servlet-pathmapping-war"/>
+ </jar>
+ <jar jarfile="${build.lib}/test-servlet-defaultservletmapping.war">
+ <fileset dir="${build.resources}/test/test-servlet-defaultservletmapping-war"/>
+ </jar>
+ <jar jarfile="${build.lib}/test-servlet.sar">
+ <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+ <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+ <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+ <fileset dir="${build.lib}" includes="test-agent.war"/>
+ <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+ <fileset dir="${build.resources}/test/test-servlet-sar"/>
+ <fileset dir="${build.lib}" includes="test-servlet-rootpathmapping.war"/>
+ <fileset dir="${build.lib}" includes="test-servlet-pathmapping.war"/>
+ <fileset dir="${build.lib}" includes="test-servlet-defaultservletmapping.war"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/test-charset.sar">
+ <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+ <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+ <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+ <fileset dir="${build.lib}" includes="test-agent.war"/>
+ <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+ <fileset dir="${build.resources}/test/test-charset-sar"/>
+ </jar>
+
+ <jar jarfile="${build.lib}/test-response.sar">
+ <fileset dir="${junit.junit.lib}" includes="junit.jar"/>
+ <fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
+ <fileset dir="${jboss.portal-common.root}/lib" includes="portal-common-lib.jar"/>
+ <fileset dir="${jboss.portal-jems.root}/lib" includes="portal-jems-lib.jar"/>
+ <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${build.lib}" includes="test-agent.war"/>
+ <fileset dir="${build.lib}" includes="portal-server-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-lib.jar"/>
+ <fileset dir="${build.lib}" includes="portal-server-test-framework-lib.jar"/>
+ <fileset dir="${build.resources}/test/test-response-sar"/>
+ </jar>
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Cleaning -->
+ <!-- ================================================================== -->
+
+ <!-- Clean up all build output -->
+ <target name="clean" depends="_default:clean">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!--+====================================================================+-->
+ <!--| Documents |-->
+ <!--| |-->
+ <!--| Generate all documentation for this module. |-->
+ <!--+====================================================================+-->
+
+ <target name="docs" depends="_default:docs">
+ <!-- Add module specific elements here. -->
+ </target>
+
+ <!-- ================================================================== -->
+ <!-- Misc. -->
+ <!-- ================================================================== -->
+
+ <target name="main" depends="most"/>
+ <target name="all" depends="_default:all"/>
+ <target name="most" depends="_default:most"/>
+ <target name="help" depends="_default:help"/>
+
+ <!-- ================================================================== -->
+ <!-- Deployment -->
+ <!-- ================================================================== -->
+
+ <target name="deploy"
+ description="Deploy."
+ depends="output">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy file="${build.lib}/portal-server.sar" todir="${jboss.home}/server/${portal.deploy.dir}"/>
+ </target>
+
+ <target name="undeploy"
+ description="Undeploy."
+ depends="init">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-server.sar"/>
+ </target>
+
+ <target name="tests" depends="init">
+ <execute-tests>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+ <sysproperty key="test.uri" value="/test/redirect/"/>
+<!--
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,address=7878,server=y,suspend=y"/>
+-->
+ </x-sysproperty>
+ <x-test>
+ <!-- Server side tests -->
+ <test todir="${test.reports}" name="org.jboss.portal.test.server.CharsetTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.server.ParametersTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.server.ServletTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.server.ResponseTestCase"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.server.request.URLContextTestCase"/>
+ </x-test>
+ <x-classpath>
+ <path refid="jboss.serialization.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ </x-classpath>
+ </execute-tests>
+ </target>
+</project>
Property changes on: branches/UIServer/core-uiserver/build.xml
___________________________________________________________________
Name: svn:executable
+ *
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9003 - branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2007-11-17 19:28:24 -0500 (Sat, 17 Nov 2007)
New Revision: 9003
Modified:
branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
Log:
new update for italian language
Modified: branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2007-11-18 00:26:50 UTC (rev 9002)
+++ branches/JBoss_Portal_Branch_2_6/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2007-11-18 00:28:24 UTC (rev 9003)
@@ -1,17 +1,17 @@
# Welcome Page
pagetitle=Upgrade per JBoss Portal
-welcome1=Quest\'applicazione migrera\' il tuo JBoss Portal esistente
+welcome1=Quest\'applicazione migrer\u00e0 il tuo JBoss Portal esistente
welcome2=usato su un nuovo Database per JBoss Portal
req=Esigenze:
req1=Devi deployare quest\'applicazione nello stesso modo di JBoss Portal
req2=Quest\'applicazione richiede l\'accesso a due datasource per JBoss Portal (Uno per versione).
req3=DA NON FARE: deployare JBoss Portal
-req3a=finche\' il processo di migrazione non e\' completo!
+req3a=finch\u00e8 il processo di migrazione non \u00e8 completo!
ds=Nome JNDI del DataSource Descriptor
# Step 1
step1=Step 1
-checkdbtitle=Verifica di connettivita\' del Database
+checkdbtitle=Verifica di connettivit\u00e0 del Database
dbfail=Fallita la connessione al Database!
dbpass=Connessione al Database... avvenuta con successo.
@@ -22,32 +22,32 @@
createtitle=Step 3: Creazione delle tabelle
tblcreatepass=Tabelle create con successo.
tblcreatefail=Creazione della tabella fallita!
-createtablebegin=Premi il bottone Continua in basso, ti creera\' la nuova struttura del Database.
-migrationcmsbegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati CMS.
+createtablebegin=Premi il bottone Continua in basso, ti creer\u00e0 la nuova struttura del Database.
+migrationcmsbegin=Premendo il bottone Continua in basso, inizier\u00e0 il processo di migrazione verso il tuo nuovo DB per i dati CMS.
# Step 4: Migrate CMS
migratecmstitle=Step 4: Migrazione dei dati del CMS
migratecmspass=Dati CMS migrati con successo.
migratecmsfail=Migrazione del CMS fallita!
-migrationuserbegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati Utenti/Ruoli.
+migrationuserbegin=Premendo il bottone Continua in basso, inizier\u00e0 il processo di migrazione verso il tuo nuovo DB per i dati Utenti/Ruoli.
# Step 5: Migrate User/Role Data
migrateusertitle=Step 5: Migrazione dei dati Utenti/Ruoli
migrateuserpass= Dati Utenti/Ruoli migrati con successo.
migrateuserfail=Migrazione dei dati Utenti/Ruoli fallita!
-migrationobjectbegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per gli oggetti del portaleortal.
+migrationobjectbegin=Premendo il bottone Continua in basso, inizier\u00e0 il processo di migrazione verso il tuo nuovo DB per gli oggetti del portaleortal.
# Step 6: Migrate Portal Object Data
migrateobjecttitle=Step 6: Migrazione degli oggetti del portale
migrateobjectpass= Oggetti del portale migrati con successo.
migrateobjectfail=Migrazione degli oggetti del portale fallita!
-migrationinstancebegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati sulle istanze delle portlets.
+migrationinstancebegin=Premendo il bottone Continua in basso, inizier\u00e0 il processo di migrazione verso il tuo nuovo DB per i dati sulle istanze delle portlets.
# Step 7: Migrate Portlet Instances Data
migrateinstancetitle=Step 7: Migrazione dei dati delle istanze delle portlets
migrateinstancepass= Dati delle istanze delle portlets migrati con successo.
migrateinstancefail=Migrazione dei dati delle istanze delle portlets fallita!
-migrationsecuritybegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati sulla Sicurezza.
+migrationsecuritybegin=Premendo il bottone Continua in basso, inizier\u00e0 il processo di migrazione verso il tuo nuovo DB per i dati sulla Sicurezza.
# Step 8: Migrate Portlet Instances Data
migratesecuritytitle=Step 8: Migrazione dei dati sulla Sicurezza
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9002 - branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2007-11-17 19:26:50 -0500 (Sat, 17 Nov 2007)
New Revision: 9002
Modified:
branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
Log:
new update for italian language
Modified: branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-11-18 00:25:20 UTC (rev 9001)
+++ branches/JBoss_Portal_Branch_2_6/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-11-18 00:26:50 UTC (rev 9002)
@@ -29,7 +29,7 @@
TITLE_CREATECOLLCONFIRM=Conferma di creazione della Directory
TITLE_COPYCONFIRM=Conferma di Copia della Risorsa
TITLE_MOVECONFIRM=Conferma di Spostamento della Risorsa
-TITLE_VIEWFILE=Visualizzazione delle Proprieta' dei File
+TITLE_VIEWFILE=Visualizzazione delle Propriet\u00e0 dei File
TITLE_EDIT=Modifica File
TITLE_CREATE=Creazione File
TITLE_UPLOAD=Caricamento File
@@ -61,7 +61,7 @@
CMS_BACKTOBROWSER=Torna al Navigatore delle Directory
CMS_TRANSFER=Importa/Esporta
CMS_EXPORTARCHIVE=Esporta Cartella
-CMS_SECURE=Sicuro
+CMS_SECURE=Sicurezza
CMS_CREATEFILEINDIR=Crea File nella Directory
CMS_FILENAME=Nome del File
@@ -69,7 +69,7 @@
CMS_LANGUAGE=Lingua
CMS_DELETEPATH=Conferma la Cancellazione di
-CMS_DELETEWARN1=ATTENZIONE! Non ti e\' permesso tornare alla vecchia configurazione\!
+CMS_DELETEWARN1=ATTENZIONE! Non ti \u00e8 permesso tornare alla vecchia configurazione\!
CMS_DELETEWARN2=Sei sicuro di voler cancellare questa risorsa\?
CMS_DESTINATION=Destinazione
@@ -86,11 +86,11 @@
CMS_CONTENT_DIR=Contenuto della Directory
CMS_CONTENT_DIR_USE=Usa l\'albero delle directory per navigare nella struttura a cartelle del portale.
CMS_MAIN_USE=Usa la portlet di Amministrazione CMS per gestire il contenuto del tuo portale.
-CMS_MANAGE=Controllare il soddisfare
+CMS_MANAGE=Gestione dei contenuti
CMS_CREATED_BY=Creato da
CMS_APPROVE=Approva
CMS_DENY=Nega
CMS_APPROVAL=Oggetti in sospeso
-CMS_PATH=Localita\'
-
\ No newline at end of file
+CMS_PATH=Localit\u00e0
+
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9001 - branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2007-11-17 19:25:20 -0500 (Sat, 17 Nov 2007)
New Revision: 9001
Modified:
branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
Log:
new update for italian language
Modified: branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2007-11-18 00:24:07 UTC (rev 9000)
+++ branches/JBoss_Portal_Branch_2_6/core-samples/src/resources/portal-users-samples-war/WEB-INF/classes/Resource_it.properties 2007-11-18 00:25:20 UTC (rev 9001)
@@ -21,12 +21,12 @@
# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
################################################################################
-NO_USERS_ONLINE=Nessun utente e' online
-ONE_USER_ONLINE_0=Al momento c'e' <b>
+NO_USERS_ONLINE=Nessun utente \u00e8 online
+ONE_USER_ONLINE_0=Al momento c'\u00e8 <b>
ONE_USER_ONLINE_1=</b> utente online:
ONE_USER_IS_0=<b>
ONE_USER_IS_1=</b>
USERS_ONLINE_0=Al momento ci sono <b>
USERS_ONLINE_1=</b> utenti online:
USERS_ARE_0=<b>
-USERS_ARE_1=</b>
\ No newline at end of file
+USERS_ARE_1=</b>
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r9000 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2007-11-17 19:24:07 -0500 (Sat, 17 Nov 2007)
New Revision: 9000
Added:
branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
Log:
new update for italian language
Added: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties (rev 0)
+++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_it.properties 2007-11-18 00:24:07 UTC (rev 9000)
@@ -0,0 +1,175 @@
+################################################################################
+# JBoss, a division of Red Hat #
+# Copyright 2006, Red Hat Middleware, LLC, and individual #
+# contributors as indicated by the @authors tag. See the #
+# copyright.txt in the distribution for a full listing of #
+# individual contributors. #
+# #
+# This is free software; you can redistribute it and/or modify it #
+# under the terms of the GNU Lesser General Public License as #
+# published by the Free Software Foundation; either version 2.1 of #
+# the License, or (at your option) any later version. #
+# #
+# This software is distributed in the hope that it will be useful, #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU #
+# Lesser General Public License for more details. #
+# #
+# You should have received a copy of the GNU Lesser General Public #
+# License along with this software; if not, write to the Free #
+# Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA #
+# 02110-1301 USA, or see the FSF site: http://www.fsf.org. #
+################################################################################
+
+IDENTITY_APPLICATION_NOT_AVAILABLE=La portlet non \u00e8 disponibile. Verifica la configurazione e il log degli errori per i dettagli.
+
+IDENTITY_WELCOME=Benvenuto
+IDENTITY_REGISTER=Registrati
+IDENTITY_LOST_PASSWORD=Password smarrita
+IDENTITY_NOT_LOGGED_IN=Non sei al momento loggato.
+IDENTITY_CREATE_ACCOUNT=Puoi creare un account.
+IDENTITY_BUTTON_SUBMIT=Conferma
+IDENTITY_BUTTON_EDIT=Modifica
+IDENTITY_BUTTON_CANCEL=Cancella
+
+IDENTITY_REGISTER_TITLE=Informazioni base dell'utente
+IDENTITY_REGISTER_TITLE_CONFIRM=Conferma
+IDENTITY_REGISTER_PASSWORD_CONFIRM=Conferma Password
+IDENTITY_REGISTER_STATUS_TITLE=Stato della registrazione
+IDENTITY_REGISTER_SUCCESS_TITLE=Il tuo account \u00e8 stato creato con successo. Puoi ora loggarti.
+IDENTITY_REGISTER_PENDING_TITLE=Un' e-mail \u00e8 stata mandata al tuo indirizzo e-mail per confermare la registrazione.
+IDENTITY_REGISTER_REQUIRED_INFORMATION=indica un campo richiesto.
+
+IDENTITY_LOST_PASSWORD_TITLE=Dimenticati i dati del tuo login?
+IDENTITY_LOST_PASSWORD_DESCRIPTION=Inserisci il tuo nome utente per azzerare la password.
+IDENTITY_LOST_PASSWORD_ERROR=Reset della password fallito.
+IDENTITY_LOST_PASSWORD_STATUS_SUCCESSFUL=Riceverai un'e-mail con la tua nuova password.
+IDENTITY_LOST_PASSWORD_STATUS_404=Nessun account trovato.
+IDENTITY_LOST_PASSWORD_STATUS_TITLE=Password smarrita
+
+IDENTITY_EDIT_PROFILE_ERROR=Errore nell'aggiornamento del profilo.
+IDENTITY_EDIT_PASSWORD_TITLE=Cambia la password
+IDENTITY_EDIT_PASSWORD_CURRENT=Password corrente
+IDENTITY_EDIT_CHANGE_PASSWORD=Cambia la password
+IDENTITY_EDIT_CHANGE_PASSWORD_ERROR=Non \u00e8 possibile cambiare la password.
+IDENTITY_EDIT_CHANGE_PASSWOR_STATUS=La tua password \u00e8 stata aggiornata.
+
+IDENTITY_EDIT_EMAIL_TITLE=Cambia il tuo indirizzo e-mail
+IDENTITY_EDIT_EMAIL_NEW=Nuovo indirizzo e-mail
+IDENTITY_EDIT_CHANGE_EMAIL=Cambia e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_ERROR=Non \u00e8 possibile modificare l'indirizzo e-mail
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_PENDING=Un'e-mail di conferma \u00e8 stata mandata all'indirizzo.
+IDENTITY_EDIT_CHANGE_EMAIL_STATUS_CHANGED=Il tuo indirizzo e-mail \u00e8 stato modificato.
+
+IDENTITY_EDIT_PROFILE_TITLE=Modifica il profilo
+IDENTITY_VIEW_PROFILE_TITLE=Vedi il profilo
+
+IDENTITY_USERNAME=Nome utente
+IDENTITY_PASSWORD=Password
+IDENTITY_EMAIL=E-Mail
+IDENTITY_GIVENNAME=Cognome
+IDENTITY_FAMILYNAME=Nome
+IDENTITY_SKYPE=ID Skype
+IDENTITY_LOCATION=Localit\u00e0
+IDENTITY_OCCUPATION=Occupazione
+IDENTITY_EXTRA=Extra
+IDENTITY_SIGNATURE=Firma
+IDENTITY_INTERESTS=Interessi
+IDENTITY_LOCALE=Nazione
+IDENTITY_ICQ=ID Icq
+IDENTITY_AIM=ID Aim
+IDENTITY_MSNM= ID MSN messenger
+IDENTITY_YIM=ID Yahoo
+IDENTITY_XMMP=ID Xmmp
+IDENTITY_HOMEPAGE=Homepage
+IDENTITY_TIMEZONE=Fuso orario
+IDENTITY_THEME=Tema
+IDENTITY_SECURITY_QUESTION=Domanda di sicurezza
+IDENTITY_SECURITY_ANSWER=Risposta di sicurezza
+IDENTITY_LAST_LOGIN=Ultimo login
+IDENTITY_REIGSTRATION_DATE=Data di registrazione
+IDENTITY_ENABLED=Attivo
+
+IDENTITY_CATEGORY_GENERAL=Preferenze generali
+IDENTITY_CATEGORY_PERSONAL=Informazioni personali
+IDENTITY_CATEGORY_INSTANT=Identit\u00e0 di messaggeria istantanea
+IDENTITY_CATEGORY_ADDITIONAL=Informazioni addizionali
+
+IDENTITY_CATEGORY_ADDITIONAL_SIGNATURE=(Firma di massimo 255 caratteri)
+IDENTITY_CATEGORY_ADDITIONAL_EXTRA=(massimo 255 caratteri.)
+
+IDENTITY_MANAGEMENT_ACTION=Azioni
+IDENTITY_MANAGEMENT_ACTION_EDIT_PROFILE=Modifica l'utente
+IDENTITY_MANAGEMENT_ACTION_ROLES=Ruoli
+IDENTITY_MANAGEMENT_ACTION_DELETE=Elimina
+IDENTITY_MANAGEMENT_USER_MANAGEMENT=Gestione dell'utente
+IDENTITY_MANAGEMENT_ROLE_MANAGEMENT=Gestione dei ruoli
+IDENTITY_MANAGEMENT_SEARCH_USER=Ricerca degli utenti
+IDENTITY_MANAGEMENT_CREATE_USER=Crea un nuovo account
+IDENTITY_MANAGEMENT_CREATE_USER_CREATED=Utente creato
+IDENTITY_MANAGEMENT_USER_DELETED=Utente cancellato
+IDENTITY_MANAGEMENT_ROLE=Ruolo
+IDENTITY_MANAGEMENT_ROLE_DISPLAY=Nome visualizzato
+IDENTITY_MANAGEMENT_ROLE_MEMBERS=Membri
+IDENTITY_MANAGEMENT_ROLE_ASSIGNED=Ruoli assegnati
+IDENTITY_MANAGEMENT_CREATE_ROLE=Crea un nuovo ruolo
+IDENTITY_MANAGEMENT_EDIT_ROLE=Modifica il ruolo
+IDENTITY_MANAGEMENT_CREATE_ROLE=Crea il ruolo
+IDENTITY_MANAGEMENT_DISABLE=Disabilita
+IDENTITY_MANAGEMENT_ENABLE=Abilita
+IDENTITY_MANAGEMENT_RESET_PASSWORD=Azzera la password
+IDENTITY_MANAGEMENT_RESET_PASSWORD_FOR_USER=Azzera la password all'utente
+IDENTITY_MANAGEMENT_RESET_PASSWORD_DESCRIPTION=L'utente ricever\u00e0 una password casuale al suo indirizzo e-mail.
+IDENTITY_MANAGEMENT_ASSIGN_ROLES=Assegna i ruoli
+IDENTITY_MANAGEMENT_COUNT_PENDING_USERS=Utenti in attesa
+IDENTITY_MANAGEMENT_COUNT_REGISTERED_USERS=Utenti registrati
+IDENTITY_MANAGEMENT_APPROVE_ALL=Conferma la selezione
+IDENTITY_MANAGEMENT_REJECT_ALL=Rifiuta la selezione
+IDENTITY_MANAGEMENT_SELECT_ALL=seleziona tutto
+IDENTITY_MANAGEMENT_UNSELECT_ALL=deseleziona tutto
+IDENTITY_MANAGEMENT_MATRIX=Matrice
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODES=Modalit\u00e0 di iscrizione
+
+IDENTITY_MANAGEMENT_PENDING_REGISTRATIONS=Registrazioni in attesa
+IDENTITY_MANAGEMENT_PENDING_BPM_ID=Id
+IDENTITY_MANAGEMENT_PENDING_APPROVE=conferma
+IDENTITY_MANAGEMENT_PENDING_REJECT=rifiuta
+
+IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Modalit\u00e0 di iscrizione
+IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Amministra le modalit\u00e0 di iscrizione
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Personalizza la modalit\u00e0 di iscrizione.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatico - nessuna validazione e-mail, nessuna conferma dell'amministratore.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Validazione dell'E-Mail, nessuna conferma dell'amministratore.
+IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN= Validazione dell'E-Mail e conferma dell'amministratore.
+
+IDENTITY_REGISTER_VERIFY_CAPTCHA=Verifica il captcha
+IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Conferma: Elimina
+IDENTITY_WARNING_CONFIRM_DELETE_USER=Attenzione! Stai per cancellare l'utente
+IDENTITY_WARNING_CONFIRM_DELETE_ROLE=Attenzione! Stai per cancellare il ruolo
+IDENTITY_REGISTER_CONFIRMATIONEMAIL=Conferma la tua iscrizione
+
+IDENTITY_MAIL_SUBJECT_LOST_PASSWORD=Azzera la password
+IDENTITY_MAIL_SUBJECT_REGISTER=Conferma la registrazione
+IDENTITY_MAIL_SUBJECT_CHANGE_EMAIL=Conferma l'indirizzo e-mail
+
+IDENTITY_MANAGEMENT_ERROR_ACTION_ROLE=Impossibile eseguire l'azione sul ruolo. Controlla il file di log per i dettagli.
+IDENTITY_MANAGEMENT_ERROR_ACTION_USER=Impossibile eseguire l'azione sull'utente. Controlla il file di log per i dettagli.
+
+IDENTITY_VERIFICATION_RETURN=Ritorna al portale
+IDENTITY_VERIFICATION_LOGIN=Login
+IDENTITY_VERIFICATION_STATUS_EROOR=Errore durante la validazione dell'indirizzo e-mail.
+IDENTITY_VERIFICATION_STATUS_FAILED=Non \u00e8 possibile validare l'indirizzo e-mail.
+IDENTITY_VERIFICATION_STATUS_VALIDATED=Indirizzo e-mail validato.
+IDENTITY_VERIFICATION_STATUS_REGISTER_SUCCESS=Il tuo account \u00e8 stato attivato. Puoi ora loggarti.
+IDENTITY_VERIFICATION_STATUS_REGISTER_APPROVAL=Il tuo indirizzo e-mail \u00e8 stato verificato, ma il tuo account deve essere validato dall'amministratore.
+IDENTITY_VERIFICATION_STATUS_REGISTER_CUSTOM=Il tuo account \u00e8 stato attivato. Puoi ora loggarti.
+
+IDENTITY_VALIDATION_ERROR_REGISTRATION=Fallita la registrazione dell'utente.
+IDENTITY_VALIDATION_ERROR_USERNAME_TAKEN=Il nome utente esiste gi\u00e0. Errore durante la validazione della password.
+IDENTITY_VALIDATION_ERROR_INVALID_EMAIL=Indirizzo e-mail non valido.
+IDENTITY_VALIDATION_ERROR_INVALID_PASSWORD=Password non valida
+IDENTITY_VALIDATION_ERROR_CAPTCHA_INCORRECT=Captcha non corretto
+
+# Example usage for dynamic values
+IDENTITY_DYNAMIC_VALUE_TEST=titolo di test
+IDENTITY_DYNAMIC_VALUE_TEST2=titolo di test2
16 years, 7 months
- 1
- 0
JBoss Portal SVN: r8999 - branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes.
by portal-commits＠lists.jboss.org
Author: sviluppatorefico
Date: 2007-11-17 19:23:07 -0500 (Sat, 17 Nov 2007)
New Revision: 8999
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
Log:
new update for italian language
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2007-11-18 00:22:37 UTC (rev 8998)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2007-11-18 00:23:07 UTC (rev 8999)
@@ -46,11 +46,11 @@
Question=Domanda segreta
Answer=Risposta segreta
-Location=Localita'
+Location=Localit\u00e0
Occupation=Occupazione
Interests=Interessi
ExtraInfo=Informazioni extra
-YourLocation=La tua localita'
+YourLocation=La tua localit\u00e0
YourOccupation=La tua occupazione
YourInterests=Tuoi interessi
Signature=Firma
@@ -63,7 +63,7 @@
EmailVerify=Mandato il link di attivazione! Leggi la tua e-mail e clicca sul link per l'attivazione.
AccountActivated=Account creato con successo!
UnableActivate=Impossibile validare il nuovo utente.
-LoggingYou=Login in atto, attenti un po'\!
+LoggingYou=Login in atto, attenti un p\u00f2\!
YouAreLoggedOut=Sei uscito\!
PassDifferent=Le passwords sono differenti. Devono essere identiche.
YourPassMustBe=Mi spiace, la tua password deve essere di almeno
@@ -111,11 +111,11 @@
CanKnowAbout=(massimo 255 caratteri. Scrivi cosa vorresti far sapere agli altri)
Language=Lingua
255CharMax=(massimo 255 caratteri. Scrivi la tua firma con la codifica HTML)
-YourAvatar=La tua identita'
+YourAvatar=La tua identit\u00e0
YourHomePage=Il tuo sito web
TimeZoneOffset=Fuso orario
-EmailNotPublic=(Questa e-mail non sara' pubblica ma e' richiesta. Sara' usata per inviarti la password nel caso la perdessi)
-EmailPublic=(Questa e-mail sara' pubblica. Scrivi quello che vuoi. A prova di spam)
+EmailNotPublic=(Questa e-mail non sar\u00e0 pubblica ma \u00e8 richiesta. Sar\u00e0 usata per inviarti la password nel caso la perdessi)
+EmailPublic=(Questa e-mail sar\u00e0 pubblica. Scrivi quello che vuoi. A prova di spam)
RealEmail=e-mail principale
FakeEmail=e-mail secondaria
NewUser=Nuovo utente
@@ -134,7 +134,7 @@
AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente?
UserDeleted=Utente cancellato con successo
ReturnToMemberList=Ritorna alla lista dei membri
-Avatar=Identita'
+Avatar=Identit\u00e0
AdminFunctions=Funzioni di amministrazione
URL=URL
UpdateUser=Aggiorna l'utente
@@ -143,23 +143,23 @@
MemberList=Lista dei membri
SearchTip=Consiglio: scegli una lettera, visualizza tutto o cerca un utente se conosci lo username
-ThemeText1=Quest'opzione cambiera' il look all'intero sito.
+ThemeText1=Quest'opzione cambier\u00e0 il look all'intero sito.
ThemeText2=Le modifiche saranno valide solo per te.
-ThemeText3=Ogni utente puo' vedere il sito con un tema differente.
+ThemeText3=Ogni utente pu\u00f2 vedere il sito con un tema differente.
SelectTheme=Seleziona un tema
ThemeSelection=Selezione del tema
CannotLogin=Non posso procedere con la login
-LoginInvalidName=il nome utente non e' valido
+LoginInvalidName=il nome utente non \u00e8 valido
LoginNoSuchUser=il nome utente non esiste
-LoginBadPassword=la tua password non e' corretta
+LoginBadPassword=la tua password non \u00e8 corretta
LoginUnexpectedError=errore inaspettato
-LoginUserDisabled=il tuo account e' stato bloccato. Per favore contatta l'amministratore.
+LoginUserDisabled=il tuo account \u00e8 stato bloccato. Per favore contatta l'amministratore.
Enable=Attiva
Disable=Disattiva
-StatusChanged=Lo stato dell'utente e' stato modificato con successo
+StatusChanged=Lo stato dell'utente \u00e8 stato modificato con successo
NotAuth=Non sei autorizzato ad eseguire quest\'operazione
@@ -177,7 +177,7 @@
NAMENOTAVAILABLE=N/A
-MODIFIED_PROFILE=Il tuo profilo e' stato modificato, il portale lavorera' con il vecchio profilo finche' non ti ricolleghi.
+MODIFIED_PROFILE=Il tuo profilo \u00e8 stato modificato, il portale lavorer\u00e0 con il vecchio profilo finch\u00e8 non ti ricolleghi.
# Registration
REGISTER_NOT_LOGGED_IN=Non sei al momento loggato.
@@ -186,15 +186,15 @@
REGISTER_REGISTER_ADMIN_LINK=Crea un account
REGISTER_TY=Grazie per la registrazione.
REGISTER_BASICINFO=Informazioni base sull'utente
-REGISTER_IM=Identita' del messaggio istantaneo
+REGISTER_IM=Identit\u00e0 del messaggio istantaneo
REGISTER_ADDITIONAL=Informazioni sull'utente opzionali e aggiuntive
REGISTER_NEWUSER=Registrazione nuovo utente
REGISTER_PASSWORDAGAIN=Conferma la tua password
REGISTER_REALEMAIL=e-mail principale
-REGISTER_EMAILNOTPUBLIC=(Questa e-mail non sara' pubblica ma e' richiesta. Sara' usata per inviarti la password nel caso la perdessi)
+REGISTER_EMAILNOTPUBLIC=(Questa e-mail non sar\u00e0 pubblica ma \u00e8 richiesta. Sar\u00e0 usata per inviarti la password nel caso la perdessi)
REGISTER_FAKEEMAIL=e-mail secondaria
-REGISTER_EMAILPUBLIC=(Questa e-mail sara' pubblica. Scrivi quello che vuoi. A prova di spam)
-REGISTER_FAKEEMAIL_EXPLAIN=Se questo campo non e' vuoto, l'e-mail principale sara' usata solo per mandare notifiche
+REGISTER_EMAILPUBLIC=(Questa e-mail sar\u00e0 pubblica. Scrivi quello che vuoi. A prova di spam)
+REGISTER_FAKEEMAIL_EXPLAIN=Se questo campo non \u00e8 vuoto, l'e-mail principale sar\u00e0 usata solo per mandare notifiche
REGISTER_QUESTION=Domanda segreta
REGISTER_ANSWER=Risposta segreta
REGISTER_ASREGUSER=Come utente registrato puoi:
@@ -206,7 +206,7 @@
REGISTER_ASREG1=Rispondi ai commenti con il tuo username
REGISTER_REGISTERNOW=Registrati ora! E' gratis!
REGISTER_WEDONTGIVE=Non vogliamo dare agli altri le tue informazioni personali.
-REGISTER_ALREADYHAVEACCOUNT=Hai gia' un account:
+REGISTER_ALREADYHAVEACCOUNT=Hai gi\u00e0 un account:
REGISTER_SIGNIN=Registrati
REGISTER_GIVENNAME=Nome
REGISTER_FAMILYNAME=Cognome
@@ -221,7 +221,8 @@
REGISTER_YIM=Id Yahoo
REGISTER_MSNM=Id MSN messenger
REGISTER_SKYPE=Id Skype
-REGISTER_LOCATION=Localita'
+REGISTER_XMMP=Id XMMP
+REGISTER_LOCATION=Localit\u00e0
REGISTER_LANGUAGE=Lingua preferita
REGISTER_OCCUPATION=Occupazione
REGISTER_INTERESTS=Interessi
@@ -233,14 +234,14 @@
REGISTER_SHOWMENU=Torna al menu utenti
-REGISTER_ERROR_INVALIDUSERNAME=Il nome utente non e' valido
-REGISTER_ERROR_EXISTINGUSERNAME=Questo nome utente e' gia' stato preso
-REGISTER_ERROR_INVALIDPASSWORD1=La password non e' valida
-REGISTER_ERROR_INVALIDPASSWORD2=La password non e' valida
+REGISTER_ERROR_INVALIDUSERNAME=Il nome utente non \u00e8 valido
+REGISTER_ERROR_EXISTINGUSERNAME=Questo nome utente \u00e8 gi\u00e0 stato preso
+REGISTER_ERROR_INVALIDPASSWORD1=La password non \u00e8 valida
+REGISTER_ERROR_INVALIDPASSWORD2=La password non \u00e8 valida
REGISTER_ERROR_PASSWORDMISMATCH=La password non corrisponde
-REGISTER_ERROR_INVALIDREALEMAIL=L'indirizzo di posta non e' valido
+REGISTER_ERROR_INVALIDREALEMAIL=L'indirizzo di posta non \u00e8 valido
-REGISTER_CONFIRM=L'utente e' stato creato con successo.
+REGISTER_CONFIRM=L'utente \u00e8 stato creato con successo.
REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti
@@ -270,12 +271,13 @@
PREVIOUSPAGE=Pagina precedente
ASSIGNROLES=Assegna i ruoli
+ASSIGNEDROLES=Ruoli da assegnare
ROLESAVAILABLE=Ruoli attivi
EDITROLESFORUSER=Modifica i ruoli per l'utente
ROLE_THEREARE=Ci sono
-ROLE_THEREIS=C'e'
+ROLE_THEREIS=C'\u00e8
ROLE_ROLESDEFINED=ruoli definiti
ROLE_ROLEDEFINED=ruolo definito
@@ -289,16 +291,18 @@
ROLE_EDIT=Modifica il ruolo utente
ROLE_DELETE=Cancella il ruolo selezionato
ROLE_CONFIRM_DELETE=Stai per cancellare un ruolo
-ROLE_DELETED=Il ruolo e'stato cancellato
+ROLE_DELETED=Il ruolo \u00e8 stato cancellato
ROLE_EDIT_MEMBERS=Modifica il ruolo dei membri
ROLE_MAINLIST=Torna alla modifica del ruolo
ROLE_EDIT_USER=Modifica i ruoli degli utenti
+ROLE_ADD=Aggiungi i ruoli
+ROLE_REMOVE=Rimuovi i ruoli
-ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Esiste gia' un ruolo con quel nome visualizzabile
-ROLE_ERROR_NAMEALREADYEXISTS=Esiste gia' un ruolo con quel nome
-ROLE_ERROR_NAMEEMPTY=Il nome del ruolo non puo' essere vuoto
-ROLE_ERROR_DISPLAYNAMEEMPTY=Il nome visualizzabile del ruolo non puo' essere vuoto
-ROLE_ERROR_DELETE_FAILED=Non si puo' cancellare il ruolo
+ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Esiste gi\u00e0 un ruolo con quel nome visualizzabile
+ROLE_ERROR_NAMEALREADYEXISTS=Esiste gi\u00e0 un ruolo con quel nome
+ROLE_ERROR_NAMEEMPTY=Il nome del ruolo non pu\u00f2 essere vuoto
+ROLE_ERROR_DISPLAYNAMEEMPTY=Il nome visualizzabile del ruolo non pu\u00f2 essere vuoto
+ROLE_ERROR_DELETE_FAILED=Non si pu\u00f2 cancellare il ruolo
MENU_CREATEROLE=Crea un nuovo ruolo
MENU_EDITROLE=Modifica il ruolo esistente
@@ -317,4 +321,4 @@
PERMISSION_DOMAIN_MOD=Modifica Dominio
PERMISSION_DEFINEDROLES=Ruoli definiti
PERMISSION_IMPLIEDROLES=Ruoli impliciti
-
\ No newline at end of file
+
16 years, 7 months
- 1
- 0