JBoss Portal SVN: r8768 - branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-10-23 21:52:12 -0400 (Tue, 23 Oct 2007)
New Revision: 8768
Modified:
branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
Log:
- Fixed incorrect assumption when downcasting PortletInfo in icon property resolver: in the WSRP case, the PortletInfo is NOT a CorePortletInfo object.
- Extracted common code into inner class.
Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-10-23 19:41:48 UTC (rev 8767)
+++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-10-24 01:52:12 UTC (rev 8768)
@@ -74,6 +74,7 @@
*/
public class AdminPropertyResolver extends DelegatingPropertyResolver
{
+ private static final String DEFAULT_PORTLET_ICON = "/portal-admin/img/portletIcon_Default1.gif";
public AdminPropertyResolver()
{
@@ -190,40 +191,8 @@
return new ArrayList(portlet.getInfo().getCapabilities().getAllLocales());
}
});
- portletDecorator.setProperty("smallIconLocation", new AbstractPropertyDecorator(String.class)
- {
- public Object getValue(Object bean) throws IllegalArgumentException
- {
- Portlet portlet = (Portlet)bean;
- CorePortletInfo cInfo = (CorePortletInfo)portlet.getInfo();
- PortletInfoInfo portletInfo = cInfo.getPortletInfo();
- if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL) != null)
- {
- return portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.SMALL);
- }
- else
- {
- return "/portal-admin/img/portletIcon_Default1.gif";
- }
- }
- });
- portletDecorator.setProperty("largeIconLocation", new AbstractPropertyDecorator(String.class)
- {
- public Object getValue(Object bean) throws IllegalArgumentException
- {
- Portlet portlet = (Portlet)bean;
- CorePortletInfo cInfo = (CorePortletInfo)portlet.getInfo();
- PortletInfoInfo portletInfo = cInfo.getPortletInfo();
- if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.LARGE) != null)
- {
- return portletInfo.getPortletIconInfo().getIconLocation(PortletIconInfo.LARGE);
- }
- else
- {
- return "/portal-admin/img/portletIcon_Default1.gif";
- }
- }
- });
+ portletDecorator.setProperty("smallIconLocation", new PortletIconPropertyDecorator(PortletIconInfo.SMALL));
+ portletDecorator.setProperty("largeIconLocation", new PortletIconPropertyDecorator(PortletIconInfo.LARGE));
registerDecorator(Portlet.class, portletDecorator);
//
@@ -450,4 +419,32 @@
registerDecorator(ThemeService.class, themeServiceDecorator);
}
+ private static class PortletIconPropertyDecorator extends AbstractPropertyDecorator
+ {
+ private String iconType;
+
+ public PortletIconPropertyDecorator(String iconType)
+ {
+ super(String.class);
+ this.iconType = iconType;
+ }
+
+ public Object getValue(Object bean) throws IllegalArgumentException
+ {
+ Portlet portlet = (Portlet)bean;
+ PortletInfo info = portlet.getInfo();
+
+ if (info instanceof CorePortletInfo)
+ {
+ CorePortletInfo cInfo = (CorePortletInfo)portlet.getInfo();
+ PortletInfoInfo portletInfo = cInfo.getPortletInfo();
+ if (portletInfo != null && portletInfo.getPortletIconInfo() != null && portletInfo.getPortletIconInfo().getIconLocation(iconType) != null)
+ {
+ return portletInfo.getPortletIconInfo().getIconLocation(iconType);
+ }
+ }
+
+ return DEFAULT_PORTLET_ICON;
+ }
+ }
}
18 years, 6 months
JBoss Portal SVN: r8767 - in modules/test/trunk/build/ide/intellij/idea70/modules: remote and 2 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-10-23 15:41:48 -0400 (Tue, 23 Oct 2007)
New Revision: 8767
Modified:
modules/test/trunk/build/ide/intellij/idea70/modules/mc/mc.iml
modules/test/trunk/build/ide/intellij/idea70/modules/remote/remote.iml
modules/test/trunk/build/ide/intellij/idea70/modules/tooling/tooling.iml
modules/test/trunk/build/ide/intellij/idea70/modules/unit/unit.iml
Log:
update intellij project file for source location
Modified: modules/test/trunk/build/ide/intellij/idea70/modules/mc/mc.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea70/modules/mc/mc.iml 2007-10-23 18:04:16 UTC (rev 8766)
+++ modules/test/trunk/build/ide/intellij/idea70/modules/mc/mc.iml 2007-10-23 19:41:48 UTC (rev 8767)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../mc">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: modules/test/trunk/build/ide/intellij/idea70/modules/remote/remote.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea70/modules/remote/remote.iml 2007-10-23 18:04:16 UTC (rev 8766)
+++ modules/test/trunk/build/ide/intellij/idea70/modules/remote/remote.iml 2007-10-23 19:41:48 UTC (rev 8767)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../remote">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: modules/test/trunk/build/ide/intellij/idea70/modules/tooling/tooling.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea70/modules/tooling/tooling.iml 2007-10-23 18:04:16 UTC (rev 8766)
+++ modules/test/trunk/build/ide/intellij/idea70/modules/tooling/tooling.iml 2007-10-23 19:41:48 UTC (rev 8767)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../tooling">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
Modified: modules/test/trunk/build/ide/intellij/idea70/modules/unit/unit.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea70/modules/unit/unit.iml 2007-10-23 18:04:16 UTC (rev 8766)
+++ modules/test/trunk/build/ide/intellij/idea70/modules/unit/unit.iml 2007-10-23 19:41:48 UTC (rev 8767)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../unit">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../unit/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
18 years, 6 months
JBoss Portal SVN: r8766 - modules/test/trunk/build/ide/intellij/idea60/modules/remote.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-23 14:04:16 -0400 (Tue, 23 Oct 2007)
New Revision: 8766
Modified:
modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml
Log:
intellij module
Modified: modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml 2007-10-23 18:01:44 UTC (rev 8765)
+++ modules/test/trunk/build/ide/intellij/idea60/modules/remote/remote.iml 2007-10-23 18:04:16 UTC (rev 8766)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../remote">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../remote/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
18 years, 6 months
JBoss Portal SVN: r8764 - in modules/test/trunk/remote: src and 10 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-23 13:59:29 -0400 (Tue, 23 Oct 2007)
New Revision: 8764
Added:
modules/test/trunk/remote/src/main/java/
modules/test/trunk/remote/src/main/java/org/
modules/test/trunk/remote/src/main/java/org/jboss/
modules/test/trunk/remote/src/main/java/org/jboss/unit/
modules/test/trunk/remote/src/main/resources/
modules/test/trunk/remote/src/main/resources/org/
modules/test/trunk/remote/src/test/
modules/test/trunk/remote/src/test/java/
modules/test/trunk/remote/src/test/java/org/
modules/test/trunk/remote/src/test/java/org/jboss/
modules/test/trunk/remote/src/test/java/org/jboss/test/
modules/test/trunk/remote/src/test/resources/
Removed:
modules/test/trunk/remote/src/main/org/jboss/test/
modules/test/trunk/remote/src/main/org/jboss/unit/
modules/test/trunk/remote/src/resources/
Modified:
modules/test/trunk/remote/build.xml
Log:
remote module reorganization for maven
Modified: modules/test/trunk/remote/build.xml
===================================================================
--- modules/test/trunk/remote/build.xml 2007-10-23 16:34:20 UTC (rev 8763)
+++ modules/test/trunk/remote/build.xml 2007-10-23 17:59:29 UTC (rev 8764)
@@ -136,6 +136,29 @@
_default:compile-etc,
_default:compile-resources">
<!-- Add module specific elements here. -->
+
+ <!-- Workaround to include test classes from maven convention -->
+
+ <javac destdir="${build.classes}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ debug="${javac.debug}"
+ source="${javac.source}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src path="${maven.module.test.sources}"/>
+ <classpath>
+ <path refid="javac.classpath"/>
+ <pathelement location="${build.classes}"/>
+ </classpath>
+
+ <include name="${javac.includes}"/>
+ </javac>
+
</target>
<!--+====================================================================+-->
@@ -156,9 +179,16 @@
<fileset dir="${build.classes}">
<exclude name="org/jboss/test/**"/>
</fileset>
- <fileset dir="${build.resources}/jboss-unit-remote-jar"/>
+ <fileset dir="${maven.module.resources}"/>
</jar>
+ <jar jarfile="${build.lib}/jboss-unit-remote-test.jar">
+ <fileset dir="${build.classes}">
+ <exclude name="org/jboss/unit/**"/>
+ </fileset>
+ <fileset dir="${maven.module.test.resources}"/>
+ </jar>
+
</target>
<!-- ================================================================== -->
@@ -200,6 +230,8 @@
<path location="${build.lib}/jboss-unit-lib.jar"/>
<path location="${build.lib}/jboss-unit-test.jar"/>
<path location="${build.resources}/test"/>
+
+ <path location="${build.lib}/jboss-unit-remote-test.jar"/>
</classpath>
</java>
Copied: modules/test/trunk/remote/src/main/java/org/jboss/unit (from rev 8752, modules/test/trunk/remote/src/main/org/jboss/unit)
Copied: modules/test/trunk/remote/src/main/resources/org (from rev 8752, modules/test/trunk/remote/src/resources/jboss-unit-remote-jar/org)
Copied: modules/test/trunk/remote/src/test/java/org/jboss/test (from rev 8752, modules/test/trunk/remote/src/main/org/jboss/test)
18 years, 6 months
JBoss Portal SVN: r8763 - modules/test/trunk/build/ide/intellij/idea60/modules/mc.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-23 12:34:20 -0400 (Tue, 23 Oct 2007)
New Revision: 8763
Modified:
modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
Log:
mc module - intellij
Modified: modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml 2007-10-23 16:33:44 UTC (rev 8762)
+++ modules/test/trunk/build/ide/intellij/idea60/modules/mc/mc.iml 2007-10-23 16:34:20 UTC (rev 8763)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../mc">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../mc/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
18 years, 6 months
JBoss Portal SVN: r8762 - in modules/test/trunk/mc: src and 9 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-23 12:33:44 -0400 (Tue, 23 Oct 2007)
New Revision: 8762
Added:
modules/test/trunk/mc/src/main/java/
modules/test/trunk/mc/src/main/java/org/
modules/test/trunk/mc/src/main/java/org/jboss/
modules/test/trunk/mc/src/main/java/org/jboss/unit/
modules/test/trunk/mc/src/main/resources/
modules/test/trunk/mc/src/test/
modules/test/trunk/mc/src/test/java/
modules/test/trunk/mc/src/test/java/org/
modules/test/trunk/mc/src/test/java/org/jboss/
modules/test/trunk/mc/src/test/java/org/jboss/test/
modules/test/trunk/mc/src/test/resources/
modules/test/trunk/mc/src/test/resources/blah/
Removed:
modules/test/trunk/mc/src/main/org/
modules/test/trunk/mc/src/resources/
Modified:
modules/test/trunk/mc/build.xml
Log:
mc module reorganization for maven structure
Modified: modules/test/trunk/mc/build.xml
===================================================================
--- modules/test/trunk/mc/build.xml 2007-10-23 16:26:21 UTC (rev 8761)
+++ modules/test/trunk/mc/build.xml 2007-10-23 16:33:44 UTC (rev 8762)
@@ -128,6 +128,29 @@
_default:compile-etc,
_default:compile-resources">
<!-- Add module specific elements here. -->
+
+ <!-- Workaround to include test classes from maven convention -->
+
+ <javac destdir="${build.classes}"
+ optimize="${javac.optimize}"
+ target="${javac.target}"
+ debug="${javac.debug}"
+ source="${javac.source}"
+ depend="${javac.depend}"
+ verbose="${javac.verbose}"
+ deprecation="${javac.deprecation}"
+ includeAntRuntime="${javac.include.ant.runtime}"
+ includeJavaRuntime="${javac.include.java.runtime}"
+ failonerror="${javac.fail.onerror}">
+ <src path="${maven.module.test.sources}"/>
+ <classpath>
+ <path refid="javac.classpath"/>
+ <pathelement location="${build.classes}"/>
+ </classpath>
+
+ <include name="${javac.includes}"/>
+ </javac>
+
</target>
<!--+====================================================================+-->
@@ -148,12 +171,14 @@
<fileset dir="${build.classes}">
<exclude name="org/jboss/test/**"/>
</fileset>
+ <fileset dir="${maven.module.resources}"/>
</jar>
<jar jarfile="${build.lib}/jboss-unit-mc-test.jar">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/**"/>
+ <exclude name="org/jboss/unit/**"/>
</fileset>
+ <fileset dir="${maven.module.test.resources}"/>
</jar>
</target>
Copied: modules/test/trunk/mc/src/main/java/org/jboss/unit (from rev 8752, modules/test/trunk/mc/src/main/org/jboss/unit)
Copied: modules/test/trunk/mc/src/test/java/org/jboss/test (from rev 8752, modules/test/trunk/mc/src/main/org/jboss/test)
Copied: modules/test/trunk/mc/src/test/resources/blah (from rev 8752, modules/test/trunk/mc/src/resources/test/blah)
18 years, 6 months
JBoss Portal SVN: r8761 - modules/test/trunk/build/ide/intellij/idea60/modules/tooling.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-10-23 12:26:21 -0400 (Tue, 23 Oct 2007)
New Revision: 8761
Modified:
modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml
Log:
intellij module update
Modified: modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml
===================================================================
--- modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml 2007-10-23 16:21:41 UTC (rev 8760)
+++ modules/test/trunk/build/ide/intellij/idea60/modules/tooling/tooling.iml 2007-10-23 16:26:21 UTC (rev 8761)
@@ -3,7 +3,8 @@
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../tooling">
- <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/main" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/../../../../../../tooling/src/test/java" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
18 years, 6 months
JBoss Portal SVN: r8759 - branches/JBoss_Portal_Branch_2_6/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-10-23 12:20:31 -0400 (Tue, 23 Oct 2007)
New Revision: 8759
Modified:
branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
Log:
It looks like i broke the build...
Modified: branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-10-23 16:19:15 UTC (rev 8758)
+++ branches/JBoss_Portal_Branch_2_6/build/build-thirdparty.xml 2007-10-23 16:20:31 UTC (rev 8759)
@@ -47,7 +47,7 @@
are pushed to the http://repository.jboss.com site.
-->
- <componentref name="jboss-portal/modules/common" version="trunk-SNAPSHOT"/>
+ <componentref name="jboss-portal/modules/common" version="1.0.0"/>
<componentref name="jboss-portal/modules/web" version="1.0.0"/>
<componentref name="jboss-portal/modules/test" version="1.0.0"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
18 years, 6 months