JBoss Portal SVN: r7929 - modules/web/trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-15 05:17:32 -0400 (Wed, 15 Aug 2007)
New Revision: 7929
Removed:
modules/web/trunk/build/local.properties
Log:
remove misplaced local.properties in web module
Deleted: modules/web/trunk/build/local.properties
===================================================================
--- modules/web/trunk/build/local.properties 2007-08-15 00:14:39 UTC (rev 7928)
+++ modules/web/trunk/build/local.properties 2007-08-15 09:17:32 UTC (rev 7929)
@@ -1,48 +0,0 @@
-### ====================================================================== ###
-## ##
-## Local project properties. ##
-## ##
-## Define properties that are local to your environment here. This ##
-## file (local.properties) should not be checked in. Modify the ##
-## example to affect all users. ##
-## ##
-### ====================================================================== ###
-
-### General compiler configuration ###
-
-#build.compiler=jikes
-#build.warnings=true
-#build.pedantic=true
-#javac.depend=on
-
-### Javac/Jikes compiler configuration ###
-
-javac.optimize=off
-javac.debug=on
-javac.deprecation=on
-
-### Enable verbose build output ###
-
-#init.verbose=true
-
-### JavaDoc ###
-#docs-javadocs.disable=true
-
-### Do we build xdoclet or get it from thirdparty ###
-### uncomment for thirdparty: comment to use xdoclet module.
-### To use xdoclet module also uncomment the xdoclet line in groups in build/build.xml
-#xdoclet.xdoclet.root=${project.root}/thirdparty/xdoclet
-
-# Portal database, for now : hsqldb, mysql, postgresql are the possible values
-portal.database=mysql
-# The datasource name used in the JNDI binding
-portal.datasource.name=PortalDS
-# Context root for the portal main servlet
-portal.web.context-root=/portal
-# JBoss server/<xxx> directory for JBoss Portal, ie: $JBOSS_HOME/server/default
-portal.deploy.dir=default/deploy
-portal-ha.deploy.dir=all/deploy
-# Show SQL or not
-portal.sql.show=false
-# Uncomment if you want to use a specific JBoss home path otherwise the build will use the JBOSS_HOME env variable
-#jboss.home=
18 years, 9 months
JBoss Portal SVN: r7928 - trunk/core/src/bin/portal-core-war/themes/renaissance/images.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-14 20:14:39 -0400 (Tue, 14 Aug 2007)
New Revision: 7928
Added:
trunk/core/src/bin/portal-core-war/themes/renaissance/images/ico_admin.gif
Log:
JBPORTAL-1623 : Create Admin icon for the different themes for the new admin portlet mode (for Renaissance)
Copied: trunk/core/src/bin/portal-core-war/themes/renaissance/images/ico_admin.gif (from rev 7926, branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/images/ico_admin.gif)
===================================================================
(Binary files differ)
18 years, 9 months
JBoss Portal SVN: r7927 - in trunk: theme/src/main/org/jboss/portal/theme/impl/render/div and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-14 20:13:20 -0400 (Tue, 14 Aug 2007)
New Revision: 7927
Modified:
trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
Log:
JBPORTAL-1630 : WindowState and Mode comparator severely broken
Modified: trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-08-15 00:09:04 UTC (rev 7926)
+++ trunk/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-08-15 00:13:20 UTC (rev 7927)
@@ -673,9 +673,9 @@
}
.portlet-mode-admin {
- background-image: url( images/ico_edit.gif );
+ background-image: url( images/ico_admin.gif );
background-repeat: no-repeat;
- width: 28px;
+ width: 16px;
height: 16px;
float: left;
display: inline;
Modified: trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
--- trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-08-15 00:09:04 UTC (rev 7926)
+++ trunk/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-08-15 00:13:20 UTC (rev 7927)
@@ -82,13 +82,15 @@
return;
}
+ //
if (modesOrStates instanceof List)
{
List list = (List)modesOrStates;
- Collections.sort(list, COMPARATOR);
+ Collections.sort(list, new ModeAndStateComparator());
modesOrStates = list;
}
+ //
for (Iterator i = modesOrStates.iterator(); i.hasNext();)
{
ActionRendererContext action = (ActionRendererContext)i.next();
@@ -106,42 +108,43 @@
}
}
- private static final Comparator COMPARATOR = new ModeAndStateComparator();
-
private static class ModeAndStateComparator implements Comparator
{
- private static final Map modeOrState2Index = new HashMap();
- static
+ /** . */
+ private final Map modeOrState2Index = new HashMap();
+
+ /** . */
+ private int lastModeIndex = 1;
+
+ /** . */
+ private int lastStateIndex = 101;
+
+ public ModeAndStateComparator()
{
- modeOrState2Index.put(Mode.EDIT, new Integer(98));
- modeOrState2Index.put(Mode.HELP, new Integer(99));
- modeOrState2Index.put(Mode.VIEW, new Integer(100));
- modeOrState2Index.put(Mode.ADMIN, new Integer(101));
- modeOrState2Index.put(WindowState.MINIMIZED, new Integer(198));
- modeOrState2Index.put(WindowState.NORMAL, new Integer(199));
- modeOrState2Index.put(WindowState.MAXIMIZED, new Integer(200));
+ modeOrState2Index.put(Mode.EDIT.toString(), new Integer(97));
+ modeOrState2Index.put(Mode.HELP.toString(), new Integer(98));
+ modeOrState2Index.put(Mode.VIEW.toString(), new Integer(99));
+ modeOrState2Index.put(Mode.ADMIN.toString(), new Integer(100));
+ modeOrState2Index.put(WindowState.MINIMIZED.toString(), new Integer(198));
+ modeOrState2Index.put(WindowState.NORMAL.toString(), new Integer(199));
+ modeOrState2Index.put(WindowState.MAXIMIZED.toString(), new Integer(200));
}
- private static int lastModeIndex = 1;
- private static int lastStateIndex = 101;
-
public int compare(Object o1, Object o2)
{
ActionRendererContext action1 = (ActionRendererContext)o1;
ActionRendererContext action2 = (ActionRendererContext)o2;
- Object origin1 = action1.getFamily();
- Object origin2 = action2.getFamily();
+ //
+ Object origin1 = action1.getName();
+ Object origin2 = action2.getName();
- if (origin1.equals(origin2))
- {
- return 0;
- }
-
+ //
int index1 = getIndexFor(origin1);
int index2 = getIndexFor(origin2);
+ //
return index1 - index2;
}
18 years, 9 months
JBoss Portal SVN: r7926 - branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/images.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-14 20:09:04 -0400 (Tue, 14 Aug 2007)
New Revision: 7926
Added:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/images/ico_admin.gif
Log:
JBPORTAL-1623 : Create "Admin" icon for the different themes for the new admin portlet mode (only for Renaissance)
Added: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/images/ico_admin.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/images/ico_admin.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
18 years, 9 months
JBoss Portal SVN: r7925 - in branches/JBoss_Portal_Branch_2_6: theme/src/main/org/jboss/portal/theme/impl/render/div and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-14 20:06:41 -0400 (Tue, 14 Aug 2007)
New Revision: 7925
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
Log:
JBPORTAL-1630 : WindowState and Mode comparator severely broken
Modified: branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-08-14 15:25:43 UTC (rev 7924)
+++ branches/JBoss_Portal_Branch_2_6/core/src/bin/portal-core-war/themes/renaissance/portal_style.css 2007-08-15 00:06:41 UTC (rev 7925)
@@ -673,9 +673,9 @@
}
.portlet-mode-admin {
- background-image: url( images/ico_edit.gif );
+ background-image: url( images/ico_admin.gif );
background-repeat: no-repeat;
- width: 28px;
+ width: 16px;
height: 16px;
float: left;
display: inline;
Modified: branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-08-14 15:25:43 UTC (rev 7924)
+++ branches/JBoss_Portal_Branch_2_6/theme/src/main/org/jboss/portal/theme/impl/render/div/DivDecorationRenderer.java 2007-08-15 00:06:41 UTC (rev 7925)
@@ -82,13 +82,15 @@
return;
}
+ //
if (modesOrStates instanceof List)
{
List list = (List)modesOrStates;
- Collections.sort(list, COMPARATOR);
+ Collections.sort(list, new ModeAndStateComparator());
modesOrStates = list;
}
+ //
for (Iterator i = modesOrStates.iterator(); i.hasNext();)
{
ActionRendererContext action = (ActionRendererContext)i.next();
@@ -106,42 +108,43 @@
}
}
- private static final Comparator COMPARATOR = new ModeAndStateComparator();
-
private static class ModeAndStateComparator implements Comparator
{
- private static final Map modeOrState2Index = new HashMap();
- static
+ /** . */
+ private final Map modeOrState2Index = new HashMap();
+
+ /** . */
+ private int lastModeIndex = 1;
+
+ /** . */
+ private int lastStateIndex = 101;
+
+ public ModeAndStateComparator()
{
- modeOrState2Index.put(Mode.EDIT, new Integer(98));
- modeOrState2Index.put(Mode.HELP, new Integer(99));
- modeOrState2Index.put(Mode.VIEW, new Integer(100));
- modeOrState2Index.put(Mode.ADMIN, new Integer(101));
- modeOrState2Index.put(WindowState.MINIMIZED, new Integer(198));
- modeOrState2Index.put(WindowState.NORMAL, new Integer(199));
- modeOrState2Index.put(WindowState.MAXIMIZED, new Integer(200));
+ modeOrState2Index.put(Mode.EDIT.toString(), new Integer(97));
+ modeOrState2Index.put(Mode.HELP.toString(), new Integer(98));
+ modeOrState2Index.put(Mode.VIEW.toString(), new Integer(99));
+ modeOrState2Index.put(Mode.ADMIN.toString(), new Integer(100));
+ modeOrState2Index.put(WindowState.MINIMIZED.toString(), new Integer(198));
+ modeOrState2Index.put(WindowState.NORMAL.toString(), new Integer(199));
+ modeOrState2Index.put(WindowState.MAXIMIZED.toString(), new Integer(200));
}
- private static int lastModeIndex = 1;
- private static int lastStateIndex = 101;
-
public int compare(Object o1, Object o2)
{
ActionRendererContext action1 = (ActionRendererContext)o1;
ActionRendererContext action2 = (ActionRendererContext)o2;
- Object origin1 = action1.getFamily();
- Object origin2 = action2.getFamily();
+ //
+ Object origin1 = action1.getName();
+ Object origin2 = action2.getName();
- if (origin1.equals(origin2))
- {
- return 0;
- }
-
+ //
int index1 = getIndexFor(origin1);
int index2 = getIndexFor(origin2);
+ //
return index1 - index2;
}
18 years, 9 months
JBoss Portal SVN: r7924 - in branches/JBoss_Portal_Branch_2_6: build and 12 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-08-14 11:25:43 -0400 (Tue, 14 Aug 2007)
New Revision: 7924
Removed:
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/web/
branches/JBoss_Portal_Branch_2_6/web/
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_6/build/build.xml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml
branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml
branches/JBoss_Portal_Branch_2_6/core/build.xml
branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml
branches/JBoss_Portal_Branch_2_6/portlet/build.xml
branches/JBoss_Portal_Branch_2_6/server/build.xml
branches/JBoss_Portal_Branch_2_6/theme/build.xml
branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent
branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
Log:
update 2.6 to use the portal web binary
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -48,6 +48,7 @@
-->
<componentref name="jboss-portal/modules/common" version="1.0.0-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/web" version="1.0.0-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
<componentref name="apache-ant" version="1.6.5"/>
Modified: branches/JBoss_Portal_Branch_2_6/build/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/build/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -112,7 +112,6 @@
<!-- Modules -->
<module name="test"/>
- <module name="web"/>
<module name="jems"/>
<module name="security"/>
<module name="faces"/>
@@ -143,15 +142,15 @@
<group name="portal">
<include
- modules="test, api, web, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
+ modules="test, api, jems, server, security, identity, search, format, portlet, portlet-server, bridge, faces, portlet-federation, theme, workflow, cms, registration, core, wsrp, core-admin, core-cms, core-management, core-samples, widget"/>
</group>
<group name="cms">
- <include modules="test, web, jems, workflow, cms"/>
+ <include modules="test, jems, workflow, cms"/>
</group>
<group name="security">
- <include modules="test, web, jems, security"/>
+ <include modules="test, jems, security"/>
</group>
<group name="default">
@@ -336,9 +335,6 @@
<classpath>
<fileset dir="../thirdparty" includes="**/*.jar"/>
</classpath>
- <packageset dir="../web/src/main">
- <exclude name="org/jboss/portal/test/**"/>
- </packageset>
<packageset dir="../server/src/main">
<exclude name="org/jboss/portal/test/**"/>
</packageset>
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/core/core.iml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -268,7 +268,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="web" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/portlet/portlet.iml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -141,7 +141,6 @@
</orderEntry>
<orderEntry type="module" module-name="jems" />
<orderEntry type="module" module-name="api" />
- <orderEntry type="module" module-name="web" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/server/server.iml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -93,7 +93,6 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module" module-name="web" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/build/ide/intellij/idea60/modules/theme/theme.iml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -95,7 +95,6 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="jems" />
- <orderEntry type="module" module-name="web" />
<orderEntry type="module" module-name="test" />
<orderEntryProperties />
</component>
Modified: branches/JBoss_Portal_Branch_2_6/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/core/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -88,6 +88,7 @@
<path id="library.classpath">
<path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/web.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.cache.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
@@ -122,7 +123,6 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portal-format.classpath"/>
- <path refid="jboss.portal-web.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-registration.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
@@ -320,7 +320,7 @@
<fileset dir="${build.lib}" includes="jboss-portlet-api-lib.jar"/>
<fileset dir="${jboss.portal-format.root}/lib" includes="portal-format-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portal-bridge.root}/lib" includes="portal-bridge-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-lib.jar"/>
<fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/>
Modified: branches/JBoss_Portal_Branch_2_6/portlet/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/portlet/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -89,6 +89,7 @@
&libraries;
<path id="library.classpath">
<path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/web.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.serialization.classpath"/>
@@ -108,7 +109,6 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portal-web.classpath"/>
<path refid="jboss.portlet-api.classpath"/>
<path refid="jboss.portal-test.classpath"/>
</path>
Modified: branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/portlet-server/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -89,6 +89,7 @@
&libraries;
<path id="library.classpath">
<path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/web.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jboss.serialization.classpath"/>
@@ -108,7 +109,6 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portal-web.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-server.classpath"/>
@@ -204,10 +204,10 @@
<fileset dir="${jboss.portal-security.root}/lib" includes="portal-security-lib.jar"/>
<fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/>
<fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-test-framework-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portlet-api-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${junit.junit.lib}" includes="junit.jar"/>
<fileset dir="${build.lib}" includes="portal-portlet-server-lib.jar"/>
<fileset dir="${build.lib}" includes="test.war"/>
@@ -231,7 +231,7 @@
<fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-test-framework-lib.jar"/>
<fileset dir="${jboss.portal-portlet.root}/lib" includes="test-info.jar"/>
<fileset dir="${jboss.portal-portlet.root}/lib" includes="test-info.war"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portal-server.lib}" includes="test-agent.war"/>
<fileset dir="${build.lib}" includes="portal-portlet-server-lib.jar"/>
<fileset dir="${build.resources}/test/info/test-info-sar"/>
Modified: branches/JBoss_Portal_Branch_2_6/server/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/server/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -91,6 +91,7 @@
<echo message="${sun.servlet.lib}"/>
<path id="library.classpath">
<path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/web.classpath"/>
<path refid="dom4j.dom4j.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
@@ -113,7 +114,7 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portal-web.classpath"/>
+
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-test.classpath"/>
</path>
@@ -198,7 +199,7 @@
<fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.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="${jboss.portal/modules/web.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"/>
@@ -219,7 +220,7 @@
<fileset dir="${junit.junit.lib}" includes="junit.jar"/>
<fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.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"/>
@@ -235,7 +236,7 @@
<fileset dir="${junit.junit.lib}" includes="junit.jar"/>
<fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.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"/>
@@ -249,7 +250,7 @@
<fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.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="${jboss.portal/modules/web.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"/>
Modified: branches/JBoss_Portal_Branch_2_6/theme/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/theme/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -91,6 +91,7 @@
<echo message="${sun.servlet.lib}"/>
<path id="library.classpath">
<path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/web.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
@@ -109,7 +110,6 @@
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
<path refid="jboss.portlet-api.classpath"/>
- <path refid="jboss.portal-web.classpath"/>
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-server.classpath"/>
<path refid="jboss.portal-portlet.classpath"/>
@@ -234,7 +234,7 @@
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
<fileset dir="${jboss.portal-server.root}/lib" includes="portal-server-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="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal-theme.root}/lib" includes="portal-theme-lib.jar"/>
<fileset dir="${jboss.portal-test.root}/lib" includes="portal-test-lib.jar"/>
Modified: branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent
===================================================================
--- branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/tools/etc/buildfragments/modules.ent 2007-08-14 15:25:43 UTC (rev 7924)
@@ -2,13 +2,6 @@
<target name="configure-modules" unless="configure-modules.disabled">
- <!-- web -->
- <property name="jboss.portal-web.root" value="${project.root}/web/output"/>
- <property name="jboss.portal-web.lib" value="${jboss.portal-web.root}/lib"/>
- <path id="jboss.portal-web.classpath">
- <pathelement path="${jboss.portal-web.lib}/portal-web-lib.jar"/>
- </path>
-
<!-- test -->
<property name="jboss.portal-test.root" value="${project.root}/test/output"/>
<property name="jboss.portal-test.lib" value="${jboss.portal-test.root}/lib"/>
Modified: branches/JBoss_Portal_Branch_2_6/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-14 13:48:34 UTC (rev 7923)
+++ branches/JBoss_Portal_Branch_2_6/wsrp/build.xml 2007-08-14 15:25:43 UTC (rev 7924)
@@ -487,7 +487,7 @@
includes="portal-portlet-lib.jar, portal-portlet-test-lib.jar"/>
<fileset dir="${jboss.portal-portlet-server.root}/lib"
includes="portal-portlet-server-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/>
<fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/>
<fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/>
@@ -548,7 +548,7 @@
<fileset dir="${jboss.portlet-api.root}/lib" includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal-portlet.root}/lib" includes="portal-portlet-lib.jar"/>
<fileset dir="${jboss.portal-portlet-server.root}/lib" includes="portal-portlet-server-lib.jar"/>
- <fileset dir="${jboss.portal-web.root}/lib" includes="portal-web-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/web.lib}" includes="portal-web-lib.jar"/>
<fileset dir="${jboss.portal-portlet-federation.root}/lib" includes="portal-portlet-federation-lib.jar"/>
<fileset dir="${jboss.portal-registration.root}/lib" includes="portal-registration-lib.jar"/>
<fileset dir="${jboss.portal-test.lib}" includes="portal-test-lib.jar"/>
18 years, 9 months
JBoss Portal SVN: r7923 - in trunk/core/src/main/org/jboss: portlet/content and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-14 09:48:34 -0400 (Tue, 14 Aug 2007)
New Revision: 7923
Modified:
trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java
trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java
Log:
JBPORTAL-1629: NullPointerException after adding a google portlet to dashboard
Contribution of Roman Kalyakin, thanks !
Modified: trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-14 13:47:39 UTC (rev 7922)
+++ trunk/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-14 13:48:34 UTC (rev 7923)
@@ -28,6 +28,7 @@
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry;
import org.jboss.portal.common.util.CopyOnWriteRegistry;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -55,6 +56,9 @@
/** . */
private CopyOnWriteRegistry registrations = new CopyOnWriteRegistry();
+
+ /** . */
+ private PortalAuthorizationManagerFactory pamf;
public InstanceContainer getInstanceContainer()
{
@@ -85,6 +89,16 @@
{
this.registry = registry;
}
+
+ public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory()
+ {
+ return pamf;
+ }
+
+ public void setPortalAuthorizationManagerFactory(PortalAuthorizationManagerFactory portalAuthorizationManagerFactory)
+ {
+ this.pamf = portalAuthorizationManagerFactory;
+ }
public void register(
ContentType contentType,
Modified: trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java
===================================================================
--- trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-14 13:47:39 UTC (rev 7922)
+++ trunk/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-14 13:48:34 UTC (rev 7923)
@@ -42,6 +42,7 @@
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.jems.as.system.JBossServiceModelMBean;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
/**
* Provide registration of a content type with a portlet instance. This listener can be used
@@ -122,6 +123,11 @@
Object container = MBeanProxy.get(InstanceContainer.class, instanceContainerON, mbeanServer);
mbean.setAttribute(new Attribute("InstanceContainer", container));
+ // Get proxy on Portal Authorization Manager Factory
+ ObjectName pamfON = new ObjectName("portal:service=PortalAuthorizationManagerFactory");
+ Object factory = MBeanProxy.get(PortalAuthorizationManagerFactory.class, pamfON, mbeanServer);
+ mbean.setAttribute(new Attribute("PortalAuthorizationManagerFactory", factory));
+
// Set dependencies
List dependencies = new ArrayList();
dependencies.add(contentProviderRegistryON);
18 years, 9 months
JBoss Portal SVN: r7922 - trunk/core/src/main/org/jboss/portal/core/deployment.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-14 09:47:39 -0400 (Tue, 14 Aug 2007)
New Revision: 7922
Modified:
trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
Log:
JBPORTAL-1621: "title" attribute of "link" tag in jboss-portlet.xml is unhandled
(oups)
Modified: trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-08-14 13:45:17 UTC (rev 7921)
+++ trunk/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-08-14 13:47:39 UTC (rev 7922)
@@ -81,7 +81,8 @@
String type = attrs.getValue("type");
String media = attrs.getValue("media");
String rel = attrs.getValue("rel");
- ElementMetaData elt = ElementMetaData.createLinkElement(type, rel, href, media);
+ String title = attrs.getValue("title");
+ ElementMetaData elt = ElementMetaData.createLinkElement(type, rel, href, media, title);
elt.init();
child = elt;
}
18 years, 9 months
JBoss Portal SVN: r7921 - in branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss: portlet/content and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-14 09:45:17 -0400 (Tue, 14 Aug 2007)
New Revision: 7921
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java
Log:
JBPORTAL-1629: NullPointerException after adding a google portlet to dashboard
Contribution of Roman Kalyakin, thanks !
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-14 13:44:01 UTC (rev 7920)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/content/generic/GenericContentProviderRegistry.java 2007-08-14 13:45:17 UTC (rev 7921)
@@ -28,6 +28,7 @@
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.impl.model.content.InternalContentProviderRegistry;
import org.jboss.portal.common.util.CopyOnWriteRegistry;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -55,6 +56,9 @@
/** . */
private CopyOnWriteRegistry registrations = new CopyOnWriteRegistry();
+
+ /** . */
+ private PortalAuthorizationManagerFactory pamf;
public InstanceContainer getInstanceContainer()
{
@@ -85,6 +89,16 @@
{
this.registry = registry;
}
+
+ public PortalAuthorizationManagerFactory getPortalAuthorizationManagerFactory()
+ {
+ return pamf;
+ }
+
+ public void setPortalAuthorizationManagerFactory(PortalAuthorizationManagerFactory portalAuthorizationManagerFactory)
+ {
+ this.pamf = portalAuthorizationManagerFactory;
+ }
public void register(
ContentType contentType,
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-14 13:44:01 UTC (rev 7920)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portlet/content/ContentTypeRegistration.java 2007-08-14 13:45:17 UTC (rev 7921)
@@ -42,6 +42,7 @@
import org.jboss.portal.core.model.content.spi.portlet.ContentPortlet;
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.jems.as.system.JBossServiceModelMBean;
+import org.jboss.portal.security.spi.auth.PortalAuthorizationManagerFactory;
/**
* Provide registration of a content type with a portlet instance. This listener can be used
@@ -122,6 +123,11 @@
Object container = MBeanProxy.get(InstanceContainer.class, instanceContainerON, mbeanServer);
mbean.setAttribute(new Attribute("InstanceContainer", container));
+ // Get proxy on Portal Authorization Manager Factory
+ ObjectName pamfON = new ObjectName("portal:service=PortalAuthorizationManagerFactory");
+ Object factory = MBeanProxy.get(PortalAuthorizationManagerFactory.class, pamfON, mbeanServer);
+ mbean.setAttribute(new Attribute("PortalAuthorizationManagerFactory", factory));
+
// Set dependencies
List dependencies = new ArrayList();
dependencies.add(contentProviderRegistryON);
18 years, 9 months
JBoss Portal SVN: r7920 - branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-08-14 09:44:01 -0400 (Tue, 14 Aug 2007)
New Revision: 7920
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
Log:
JBPORTAL-1621: "title" attribute of "link" tag in jboss-portlet.xml is unhandled
(oups)
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-08-14 13:13:41 UTC (rev 7919)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/deployment/JBossApplicationMetaDataFactory.java 2007-08-14 13:44:01 UTC (rev 7920)
@@ -81,7 +81,8 @@
String type = attrs.getValue("type");
String media = attrs.getValue("media");
String rel = attrs.getValue("rel");
- ElementMetaData elt = ElementMetaData.createLinkElement(type, rel, href, media);
+ String title = attrs.getValue("title");
+ ElementMetaData elt = ElementMetaData.createLinkElement(type, rel, href, media, title);
elt.init();
child = elt;
}
18 years, 9 months