JBoss Portal SVN: r11067 - in branches/JBoss_Portal_Branch_2_7: core/src/bin/portal-core-war/images/corners and 3 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-17 18:21:24 -0400 (Tue, 17 Jun 2008)
New Revision: 11067
Added:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-bottom-grey.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-bottom-white.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-top-grey.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-top-white.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-bottom-grey.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-bottom-white.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-top-grey.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-top-white.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/gray-header.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/main-bg.jpg
Modified:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
Log:
front page touch up
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-bottom-grey.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-bottom-grey.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-bottom-white.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-bottom-white.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-top-grey.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-top-grey.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-top-white.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-left-top-white.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-bottom-grey.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-bottom-grey.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-bottom-white.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-bottom-white.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-top-grey.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-top-grey.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-top-white.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/7px/corner-right-top-white.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/gray-header.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/corners/gray-header.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/main-bg.jpg
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/images/main-bg.jpg
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-06-17 21:53:04 UTC (rev 11066)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-06-17 22:21:24 UTC (rev 11067)
@@ -1347,4 +1347,5 @@
background-color: #eef8fd;
padding: 10px;
border: 1px solid #000000;
-}
\ No newline at end of file
+}
+
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-06-17 21:53:04 UTC (rev 11066)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-06-17 22:21:24 UTC (rev 11067)
@@ -1,15 +1,15 @@
<style type="text/css">
- #welcomelogo {
- float: left;
- margin: 30px 0px 30px 15px;
+ .welcomelogo {
+ margin: 10px;
}
#welcometext {
- margin: 30px 50px 30px 225px;
+
}
#welcomegreybox {
- margin-bottom: 30px;
+ width: 674px;
+ text-align: center;
}
.welcomegreyboxTD {
@@ -18,45 +18,216 @@
#welcomegreybox h3 {
color: #5078aa;
font: bold 13px Helvetica, Arial, sans-serif;
+
}
.home-img {
padding: 10px 0 0 10px;
}
+
+ /*---------------------------------------------Rounded corner boxes*/
+ .services-box{
+ float: left;
+ width: 30%;
+ }
+
+ .forum-box{
+ float: left;
+ width: 30%;
+ }
+
+ .info-box {
+ float: left;
+ width: 30%;
+ }
+
+ .box-content .content{
+ padding: 3px;
+ height: 70px;
+ }
+
+ .whiteWithLtGreyHeader .header {
+ background-color: #ececec;
+ background-image: url("/portal-core/images/corners/gray-header.gif");
+ background-repeat: repeat-x;
+ padding: 2px 2px 2px 5px;
+ color: #000;
+ font-weight: bold;
+ }
+
+ /*------------------------------------------White Rounded Box with light grey Header-----*/
+
+ .whiteWithLtGreyHeader {
+ position: relative;
+ margin: 5px 0 5px 10px;
+ text-align: left;
+ }
+
+ .whiteWithLtGreyHeader p{
+ margin: 0;
+ padding: 0;
+ }
+
+ .whiteWithLtGreyHeader .box-header,
+ .whiteWithLtGreyHeader .box-footer {
+ padding: 0 7px 0 7px;
+ position: relative;
+ }
+
+ .whiteWithLtGreyHeader .img-top-left {
+ position: absolute;
+ top: 0;
+ left: 0;
+ }
+
+ .whiteWithLtGreyHeader .img-top-right {
+ position: absolute;
+ top: 0;
+ right: 0;
+ }
+
+ .whiteWithLtGreyHeader .img-bottom-left {
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ }
+
+ .whiteWithLtGreyHeader .img-bottom-right {
+ position: absolute;
+ bottom: 0;
+ right: 0;
+ }
+
+ .whiteWithLtGreyHeader .box-header-content {
+ border-top: 1px solid #a5a5a5;
+ background-color: #ececec;
+ width: 100%;
+ height: 6px;
+ }
+
+ .whiteWithLtGreyHeader .box-content {
+ border-left: 1px solid #a5a5a5;
+ border-right: 1px solid #a5a5a5;
+ }
+
+ .whiteWithLtGreyHeader .box-footer-content {
+ border-bottom: 1px solid #a5a5a5;
+ width: 100%;
+ height: 6px;
+ }
+
+ .main-box .box-header-content {
+ background-color: transparent;
+ }
+
+ .main-box .box-content {
+ padding: 12px;
+ }
+
+ .main-box {
+ width: 624px;
+ background-image: url("/portal-core/images/main-bg.jpg");
+ background-repeat: no-repeat;
+ }
</style>
<div class="home-img">
- <img src="default/images/2_7-go-faster.gif" width="624" height="148" alt="JBoss Portal 2.7: Go Faster!" />
+ <img src="default/images/2_7-go-faster.gif" width="624" height="148" alt="JBoss Portal 2.7: Go Faster!"/>
</div>
-<div id="welcomelogo"><img src="default/images/homeimg_jbosslogo.png" alt="JBoss, a division of Red Hat" width="143"
- height="64"/></div>
-<p id="welcometext">JBoss Portal provides an open source platform for hosting and serving a portal Web interface,
- publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help
- enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license
- combined with a flexible and scalable underling platform.</p>
-<br/>
<div id="welcomegreybox">
- <table width="100%">
- <tr>
- <td valign="top"><h3>Support Services</h3>
+ <div class="whiteWithLtGreyHeader services-box">
+ <div class="box-header">
+ <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/>
+ <div class="box-header-content">
+ </div>
+ <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/>
+ </div>
+ <div class="box-content">
+ <div class="header">Services</div>
+ <div class="content">JBoss Inc. offers various support services tailored to fit your needs. <a href="default/support.html">Explore</a>
+ support and service options for JBoss Portal.</div>
+ </div>
+ <div class="box-footer">
+ <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/>
+ <div class="box-footer-content">
+ </div>
+ <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/>
+ </div>
+ </div>
- <p>JBoss Inc. offers various support services tailored to fit your needs. <a href="default/support.html">Explore</a>
- support and service options for JBoss Portal.</p></td>
- <td valign="top" class="welcomegreyboxTD"><h3>PortletSwap</h3>
+ <div class="whiteWithLtGreyHeader forum-box">
+ <div class="box-header">
+ <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/>
+ <div class="box-header-content">
+ </div>
+ <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/>
+ </div>
+ <div class="box-content">
+ <div class="header">Forums</div>
+ <div class="content">If you have any questions or concerns, please use
+ our <a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215" target="_blank">
+ Forums</a> to voice them. Project developers and community members are always there to help.</div>
+ </div>
+ <div class="box-footer">
+ <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/>
+ <div class="box-footer-content">
+ </div>
+ <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/>
+ </div>
+ </div>
- <p><a href="http://www.portletswap.com" target="_blank">Portletswap.com</a> is an open community sponsored
- by JBoss, Inc. to facilitate the exchange of portlets and layouts for use in JBoss Portal.</p></td>
- <td valign="top" class="welcomegreyboxTD"><h3>Project Information</h3>
-
- <p>Learn more about the <a href="default/project.html">JBoss Portal project</a>, on-going development, open
+ <div class="whiteWithLtGreyHeader info-box">
+ <div class="box-header">
+ <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/>
+ <div class="box-header-content">
+ </div>
+ <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/>
+ </div>
+ <div class="box-content">
+ <div class="header">Information</div>
+ <div class="content">Learn more about the <a href="default/project.html">JBoss Portal project</a>, on-going development, open
issues, and our
- user and developer communities.</p></td>
- </tr>
- </table>
+ user and developer communities.</div>
+ </div>
+ <div class="box-footer">
+ <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/>
+ <div class="box-footer-content">
+ </div>
+ <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/>
+ </div>
+ </div>
+ <br style="clear:both"/>
+</div>
+ <br style="clear:left"/>
+<div class="whiteWithLtGreyHeader main-box">
+ <div class="box-header">
+ <img src="/portal-core/images/corners/7px/corner-left-top-white.gif" alt="" class="img-top-left"/>
+ <div class="box-header-content"></div>
+ <img src="/portal-core/images/corners/7px/corner-right-top-white.gif" alt="" class="img-top-right"/>
+ </div>
+ <div class="box-content">
+
+ <img src="default/images/homeimg_jbosslogo.png" alt="JBoss, a division of Red Hat" width="143" class="welcomelogo"
+ height="64" align="left"/>
+ <div id="welcometext">JBoss Portal provides an open source platform for hosting and serving a portal Web interface,
+ publishing and managing its content, and customizing its experience. While most packaged Portal frameworks help
+ enterprises launch Portals more quickly, only JBoss Portal delivers the benefits of a zero-cost open source license
+ combined with a flexible and scalable underling platform.</div>
+ <br/>
+
+ <p>Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy
+ developing it!</p>
+ <p>Baci e abbracci,<br/>
+ The JBoss Portal Team.</p>
+
+ </div>
+ <div class="box-footer">
+ <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/>
+ <div class="box-footer-content"></div>
+ <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/>
+ </div>
</div>
-<p>Thank you for downloading and deploying JBoss Portal. We hope your enjoy working with it as much as we enjoy
- developing it!</p>
-<p>Baci e abbracci,<br/>
- The JBoss Portal Team.</p>
+
+
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11066 - branches/JBoss_Portal_Branch_2_6/workflow.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-17 17:53:04 -0400 (Tue, 17 Jun 2008)
New Revision: 11066
Modified:
branches/JBoss_Portal_Branch_2_6/workflow/build.xml
Log:
- Re-formatting...
Modified: branches/JBoss_Portal_Branch_2_6/workflow/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2008-06-17 15:58:48 UTC (rev 11065)
+++ branches/JBoss_Portal_Branch_2_6/workflow/build.xml 2008-06-17 21:53:04 UTC (rev 11066)
@@ -23,13 +23,13 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<!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">
- ]>
+ <!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$ -->
@@ -45,14 +45,7 @@
<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. |-->
- <!--+====================================================================+-->
+ <!--+====================================================================+--><!--| 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;
@@ -60,9 +53,7 @@
&tools;
&targets;
- <!-- ================================================================== -->
- <!-- Initialization -->
- <!-- ================================================================== -->
+ <!-- ================================================================== --><!-- Initialization --><!-- ================================================================== -->
<!--
| Initialize the build system. Must depend on '_buildmagic:init'.
@@ -72,12 +63,7 @@
<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. |-->
- <!--+====================================================================+-->
+ <!--+====================================================================+--><!--| Configuration |--><!--| |--><!--| This target is invoked by the Buildmagic initialization logic |--><!--| and should contain module specific configuration elements. |--><!--+====================================================================+-->
<target name="configure" unless="configure.disable">
@@ -89,25 +75,24 @@
&libraries;
<path id="library.classpath">
<path refid="jboss.portal/modules/common.classpath"/>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.collections.classpath"/>
- <path refid="beanshell.beanshell.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="beanshell.beanshell.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
- <path refid="ehcache.ehcache.classpath"/>
+ <path refid="ehcache.ehcache.classpath"/>
<path refid="junit.junit.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="asm.asm.classpath"/>
- <path refid="cglib.cglib.classpath"/>
- <path refid="antlr.antlr.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
- <path refid="sun.servlet.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="asm.asm.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="sun.servlet.classpath"/>
<!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
-
-
+
<path id="javac.classpath">
<pathelement location="${build.classes}"/>
</path>
@@ -117,55 +102,45 @@
<!-- Configure modules -->
<call target="configure-modules"/>
<path id="dependentmodule.classpath">
- <path refid="jboss.portal-jems.classpath"/>
- <path refid="jboss.portal/modules/identity.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <path refid="jboss.portal/modules/identity.classpath"/>
</path>
- <!--+=======================================+-->
- <!--| Override any default properties here. |-->
- <!--+=======================================+-->
+ <!--+=======================================+--><!--| Override any default properties here. |--><!--+=======================================+-->
<!-- Configure defaults & build tools -->
<call target="configure-defaults"/>
<call target="configure-tools"/>
- <!--+=======================================+-->
- <!--| Define module specific elements here. |-->
- <!--+=======================================+-->
+ <!--+=======================================+--><!--| Define module specific elements here. |--><!--+=======================================+-->
<property name="javadoc.private" value="true"/>
<property name="javadoc.protected" value="false"/>
-
- <taskdef name="explode"
- classname="org.jboss.portal.common.ant.Explode"
- classpathref="explode.task.classpath"/>
- <taskdef name="implode"
- classname="org.jboss.portal.common.ant.Implode"
- classpathref="explode.task.classpath"/>
-
- </target>
-
- <target name="configure-explode">
- <path id="explode.task.classpath">
- <pathelement location="${project.tools}/lib/explode.jar"/>
- <path refid="apache.ant.classpath"/>
- </path>
- <taskdef
- name="explode"
+ <taskdef name="explode"
classname="org.jboss.portal.common.ant.Explode"
classpathref="explode.task.classpath"/>
- </target>
+ <taskdef name="implode"
+ classname="org.jboss.portal.common.ant.Implode"
+ classpathref="explode.task.classpath"/>
- <!--+====================================================================+-->
- <!--| 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>
+ <target name="configure-explode">
+ <path id="explode.task.classpath">
+ <pathelement location="${project.tools}/lib/explode.jar"/>
+ <path refid="apache.ant.classpath"/>
+ </path>
+ <taskdef
+ name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
+ </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,
@@ -174,22 +149,16 @@
<!-- 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. |-->
- <!--+====================================================================+-->
+ <!--+====================================================================+--><!--| 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-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf">
+ <mkdir dir="${build.lib}"/>
+
+ <jar jarfile="${build.lib}/portal-workflow-lib.jar" manifest="${build.etc}/portal-workflow-lib-jar.mf">
<fileset dir="${build.classes}"/>
- </jar>
+ </jar>
<!--
<copy todir="${build.resources}/portal-workflow.war">
@@ -203,7 +172,7 @@
<!-- workflow service -->
<copy todir="${build.resources}/portal-workflow.sar">
- <fileset dir="${build.resources}/portal-workflow-sar"/>
+ <fileset dir="${build.resources}/portal-workflow-sar"/>
</copy>
<!--
@@ -212,8 +181,8 @@
</copy>
-->
<implode
- dir="${build.resources}/portal-workflow.sar"
- tofile="${build.lib}/portal-workflow.sar"/>
+ dir="${build.resources}/portal-workflow.sar"
+ tofile="${build.lib}/portal-workflow.sar"/>
</target>
<target name="deploy"
@@ -226,76 +195,66 @@
<!--
generates artifacts used for tests, requires output to be previously run
-->
- <target name="package-tests" depends="init">
- </target>
-
- <target name="deploy-tests"
+ <target name="package-tests" depends="init">
+ </target>
+
+ <target name="deploy-tests"
description="Deploy."
- depends="output">
- </target>
-
- <target name="undeploy-tests"
+ depends="output">
+ </target>
+
+ <target name="undeploy-tests"
description="UnDeploy."
- depends="output">
- </target>
+ depends="output">
+ </target>
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
+ <!-- ================================================================== --><!-- 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. |-->
- <!--+====================================================================+-->
+ <!--+====================================================================+--><!--| Documents |--><!--| |--><!--| Generate all documentation for this module. |--><!--+====================================================================+-->
<target name="docs" depends="_default:docs">
<!-- Add module specific elements here. -->
</target>
- <!-- ================================================================== -->
- <!-- Misc. -->
- <!-- ================================================================== -->
+ <!-- ================================================================== --><!-- Misc. --><!-- ================================================================== -->
<target name="main" depends="most"/>
<target name="all" depends="_default:all"/>
<target name="most" depends="_default:most"/>
<target name="help" depends="_default:help"/>
- <!-- ================================================================== -->
- <!-- Test. -->
- <!-- ================================================================== -->
+ <!-- ================================================================== --><!-- Test. --><!-- ================================================================== -->
<target name="tests" depends="init">
<execute-tests>
- <x-test>
- <!-- general jbpm unit tests -->
+ <x-test>
+ <!-- general jbpm unit tests -->
<test todir="${test.reports}" name="org.jboss.portal.workflow.test.HelloWorldDbTest"/>
<!-- cms workflow tests -->
<test todir="${test.reports}" name="org.jboss.portal.workflow.test.PortalCMSPublish"/>
</x-test>
<x-classpath>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.collections.classpath"/>
- <path refid="beanshell.beanshell.classpath"/>
- <path refid="hibernate.hibernate.classpath"/>
- <path refid="ehcache.ehcache.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="asm.asm.classpath"/>
- <path refid="cglib.cglib.classpath"/>
- <path refid="antlr.antlr.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="beanshell.beanshell.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
+ <path refid="ehcache.ehcache.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="asm.asm.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
<!-- jbpm integration -->
<path refid="jbpm.jaronly.classpath"/>
- <pathelement location="${build.lib}/portal-workflow-lib.jar"/>
- <pathelement location="${build.resources}/test"/>
+ <pathelement location="${build.lib}/portal-workflow-lib.jar"/>
+ <pathelement location="${build.resources}/test"/>
</x-classpath>
</execute-tests>
</target>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11065 - modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-17 11:58:48 -0400 (Tue, 17 Jun 2008)
New Revision: 11065
Modified:
modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java
Log:
Bug fix
Modified: modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java
===================================================================
--- modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2008-06-17 13:23:00 UTC (rev 11064)
+++ modules/portlet/trunk/management/src/main/java/org/jboss/portal/portlet/management/PortletContainerManagementInterceptorImpl.java 2008-06-17 15:58:48 UTC (rev 11065)
@@ -89,6 +89,6 @@
}
//
- return info;
+ return map.get(key);
}
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11064 - in branches/JBoss_Portal_Branch_2_7/core/src: resources/portal-core-war/WEB-INF/jsp/header and 1 other directory.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-17 09:23:00 -0400 (Tue, 17 Jun 2008)
New Revision: 11064
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
JBPORTAL-2039 Make the check in header generation based on Principal and not User
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2008-06-17 13:17:08 UTC (rev 11063)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2008-06-17 13:23:00 UTC (rev 11064)
@@ -69,6 +69,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.security.Principal;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -187,6 +188,7 @@
ControllerContext controllerCtx = cc.getControllerContext();
ControllerRequestDispatcher rd = controllerCtx.getRequestDispatcher(targetContextPath, headerPath);
+
//
if (rd != null)
{
@@ -195,7 +197,10 @@
User user = controllerCtx.getUser();
rd.setAttribute("org.jboss.portal.header.USER", user);
- if (user == null)
+ Principal principal = controllerCtx.getServerInvocation().getServerContext().getClientRequest().getUserPrincipal();
+ rd.setAttribute("org.jboss.portal.header.PRINCIPAL", principal);
+
+ if (principal == null)
{
PortalURL portalURL;
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-06-17 13:17:08 UTC (rev 11063)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-06-17 13:23:00 UTC (rev 11064)
@@ -1,10 +1,11 @@
<%@ page import="org.jboss.portal.api.PortalURL" %>
<%@ page import="org.jboss.portal.identity.User" %>
<%@page import="java.util.ResourceBundle"%>
+<%@ page import="java.security.Principal" %>
<%
ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale());
- User user = (User)request.getAttribute("org.jboss.portal.header.USER");
+ Principal principal = (Principal)request.getAttribute("org.jboss.portal.header.PRINCIPAL");
PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
PortalURL defaultPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
@@ -15,7 +16,7 @@
%>
<%
- if (user == null)
+ if (principal == null)
{
%>
@@ -52,7 +53,7 @@
document.getElementById('loginIframe').src = '';
/* ]]> */
</script>
-<%= rb.getString("LOGGED") %>: <%= user.getUserName() %><br/><br/>
+<%= rb.getString("LOGGED") %>: <%= principal.getName() %><br/><br/>
<%
if (dashboardURL != null)
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11063 - in branches/JBoss_Portal_Branch_2_6/core/src: resources/portal-core-war/WEB-INF/jsp/header and 1 other directory.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-17 09:17:08 -0400 (Tue, 17 Jun 2008)
New Revision: 11063
Modified:
branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
Log:
JBPORTAL-2039 Make the check in header generation based on Principal and not User
Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2008-06-17 01:58:52 UTC (rev 11062)
+++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/aspects/controller/PageCustomizerInterceptor.java 2008-06-17 13:17:08 UTC (rev 11063)
@@ -69,6 +69,7 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
+import java.security.Principal;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -195,7 +196,11 @@
User user = controllerCtx.getUser();
rd.setAttribute("org.jboss.portal.header.USER", user);
- if (user == null)
+ Principal principal = controllerCtx.getServerInvocation().getServerContext().getClientRequest().getUserPrincipal();
+ rd.setAttribute("org.jboss.portal.header.PRINCIPAL", principal);
+
+
+ if (principal == null)
{
PortalURL portalURL = null;
Modified: branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-06-17 01:58:52 UTC (rev 11062)
+++ branches/JBoss_Portal_Branch_2_6/core/src/resources/portal-core-war/WEB-INF/jsp/header/header.jsp 2008-06-17 13:17:08 UTC (rev 11063)
@@ -1,10 +1,12 @@
<%@ page import="org.jboss.portal.api.PortalURL" %>
-<%@ page import="org.jboss.portal.identity.User" %>
+<%@ page import="java.security.Principal" %>
<%@page import="java.util.ResourceBundle"%>
+
<%
+
ResourceBundle rb = ResourceBundle.getBundle("Resource", request.getLocale());
- User user = (User)request.getAttribute("org.jboss.portal.header.USER");
+ Principal principal = (Principal)request.getAttribute("org.jboss.portal.header.PRINCIPAL");
PortalURL dashboardURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DASHBOARD_URL");
PortalURL loginURL = (PortalURL)request.getAttribute("org.jboss.portal.header.LOGIN_URL");
PortalURL defaultPortalURL = (PortalURL)request.getAttribute("org.jboss.portal.header.DEFAULT_PORTAL_URL");
@@ -15,7 +17,7 @@
%>
<%
- if (user == null)
+ if (principal == null)
{
%>
@@ -52,8 +54,9 @@
document.getElementById('loginIframe').src = '';
/* ]]> */
</script>
-<%= rb.getString("LOGGED") %>: <%= user.getUserName() %><br/><br/>
+<%= rb.getString("LOGGED") %>: <%= principal.getName() %><br/><br/>
+
<%
if (dashboardURL != null)
{
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11062 - in branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal: images and 1 other directory.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-16 21:58:52 -0400 (Mon, 16 Jun 2008)
New Revision: 11062
Added:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-left2.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-middle2.gif
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-right2.gif
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
Log:
portlet header to match new style, maybe too much blue
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-left2.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-left2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-middle2.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-middle2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-right2.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/images/portlet-top-right2.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-06-17 00:49:05 UTC (rev 11061)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-06-17 01:58:52 UTC (rev 11062)
@@ -490,16 +490,16 @@
*/
.portlet-titlebar-left {
- background-image: url( images/portlet-top-left.gif );
+ background-image: url( images/portlet-top-left2.gif );
background-repeat: no-repeat;
width: 9px;
height: 29px;
min-width: 9px;
- background-position: bottom;
+ background-position: 0 1px;
}
.portlet-titlebar-center {
- background-image: url( images/portlet-top-middle.gif );
+ background-image: url( images/portlet-top-middle2.gif );
background-repeat: repeat-x;
height: 29px;
background-position: bottom;
@@ -507,12 +507,12 @@
}
.portlet-titlebar-right {
- background-image: url( images/portlet-top-right.gif );
+ background-image: url( images/portlet-top-right2.gif );
background-repeat: no-repeat;
width: 10px;
height: 30px;
min-width: 10px;
- background-position: bottom left;
+ background-position: -1px 1px;
}
.portlet-content-left {
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11061 - branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-16 20:49:05 -0400 (Mon, 16 Jun 2008)
New Revision: 11061
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
Log:
small bug in update property on dashboard
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2008-06-16 15:24:56 UTC (rev 11060)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/main/org/jboss/portal/core/admin/ui/actions/PropertyAction.java 2008-06-17 00:49:05 UTC (rev 11061)
@@ -105,7 +105,7 @@
public void updateProperty()
{
String propertyName = otherPropertyName.trim();
-
+ String value = "";
//
if (propertyName.length() == 0 && selectedProperty != null)
{
@@ -115,10 +115,8 @@
//
if (propertyName.length() > 0)
{
- String value = getPropertyValue().trim();
- if (value == null)
- {
- value = "";
+ if (getPropertyValue() != null){
+ value = getPropertyValue().trim();
}
pomgr.getSelectedObject().setDeclaredProperty(propertyName, value);
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11060 - branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-16 11:24:56 -0400 (Mon, 16 Jun 2008)
New Revision: 11060
Modified:
branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml
Log:
- Removed leak from 2.7 code base. Thanks, Jason Porter!
Modified: branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2008-06-16 14:51:18 UTC (rev 11059)
+++ branches/JBoss_Portal_Branch_2_6/core-wsrp/src/resources/portal-wsrp-admin-war/WEB-INF/jsf/producer/producer.xhtml 2008-06-16 15:24:56 UTC (rev 11060)
@@ -12,9 +12,6 @@
<h:selectBooleanCheckbox value="#{producer.registrationRequiredForFullDescription}"/>
<h:outputText value="#{i18n.producer_config_sd_requires_reg}"/>
- <h:selectBooleanCheckbox value="#{producer.strictMode}"/>
- <h:outputText value="#{i18n.producer_config_strict}"/>
-
<h:selectBooleanCheckbox value="#{producer.registrationRequired}" immediate="true"
onchange="this.form.submit()"
valueChangeListener="#{producer.requireRegistrationListener}"/>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11059 - branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-16 10:51:18 -0400 (Mon, 16 Jun 2008)
New Revision: 11059
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
Log:
remove submenu visual bug
Modified: branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-06-16 13:54:56 UTC (rev 11058)
+++ branches/JBoss_Portal_Branch_2_7/core/src/bin/portal-core-war/themes/renewal/portal_style.css 2008-06-16 14:51:18 UTC (rev 11059)
@@ -315,6 +315,7 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
+
}
ul#tabsHeader #current ul a {
@@ -322,6 +323,7 @@
font-family: Verdana, Arial, Helvetica, Sans-Serif, sans-serif;
font-weight: normal;
color: #5078aa;
+ background-image: none;
}
ul#tabsHeader li:hover ul,
@@ -343,6 +345,10 @@
margin-right: 0px;
}
+ul#tabsHeader ul li#current ul li {
+ background-image: none;
+}
+
ul#tabsHeader ul li:hover {
background: #C0D3DC;
}
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11058 - in modules/identity/trunk/idm/src/main/java/org/jboss: idm/event and 3 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-16 09:54:56 -0400 (Mon, 16 Jun 2008)
New Revision: 11058
Added:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityOperationType.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/
modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEvent.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventBroadcaster.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventEmitter.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventListener.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/
modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdentityTypeNotSupportedException.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdmException.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/OperationNotSupportedException.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/RelationshipNotSupportedException.java
Removed:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdmException.java
Modified:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityStore.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupEntity.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupIdentityStore.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/Relationship.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/UserEntity.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Group.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/User.java
Log:
- some refactorings
- added interfaces for events
- paginated and ordered searches
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityOperationType.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityOperationType.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityOperationType.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,34 @@
+/*
+* 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.idm;
+
+/**
+ * Operation type supported by IdentityStore
+ *
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface IdentityOperationType
+{
+ String getName();
+}
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityStore.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityStore.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityStore.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -22,6 +22,9 @@
package org.jboss.idm;
+import org.jboss.idm.exceptions.IdmException;
+import org.jboss.idm.exceptions.IdentityTypeNotSupportedException;
+
import java.util.Collection;
import java.util.Map;
import java.util.Set;
@@ -34,7 +37,40 @@
*/
public interface IdentityStore
{
+ /**
+ * Operations related to the base set of methods in IdentityStore interface
+ */
+ public enum OperationType implements IdentityOperationType
+ {
+ // createIdentity
+ create,
+
+ // removeIdentity
+ remove,
+
+ // updateAttribute, updateAttributes, addAttributes
+ updateAttributes,
+
+ // resolveRelationships
+ resolveRelationships,
+
+ // createRelationship
+ modifyRelationships,
+
+ // pagination in findIdentities
+ paginatedSearch,
+
+ // ordering in findIdentities
+ orderedSearch;
+
+
+ public String getName()
+ {
+ return this.name();
+ }
+ }
+
// Informations about identity store and its capabilities
/**
@@ -43,6 +79,28 @@
String getId();
/**
+ * @param identityType
+ * @return supported operations for given identity type
+ * @throws IdentityTypeNotSupportedException
+ */
+ public Set<IdentityOperationType> getSupportedOperations(IdentityType identityType) throws IdentityTypeNotSupportedException;
+
+ /**
+ * @param operationType
+ * @param identityType
+ * @return if given operation on given identity type is supported
+ * @throws IdentityTypeNotSupportedException
+ */
+ boolean isOperationSupported(IdentityOperationType operationType, IdentityType identityType) throws IdentityTypeNotSupportedException;
+
+ /**
+ * @param operationType
+ * @return set of identity types that can be processed by this identity store with a given operation
+ * @throws IdmException
+ */
+ public Set<IdentityType> getSupportedIdentities(IdentityOperationType operationType);
+
+ /**
* @return set of identity types that can be persisted in this store
*/
Set<IdentityType> getSupportedIdentities();
@@ -84,6 +142,13 @@
void removeIdentity(Identity identity) throws IdmException;
/**
+ * @param identityType
+ * @return a number of stored identities with a given type
+ * @throws IdmException
+ */
+ int getIdentitiesCount(IdentityType identityType) throws IdmException;
+
+ /**
* Find identity with a given name
*
* @param name
@@ -102,27 +167,65 @@
Identity findIdentity(Object id) throws IdmException;
/**
- * Find identities with a given attributes values
+ * Find identities with a given type paginated and ordered. If the paginatedSearch or orderedSearch operations
+ * are not supported in this store implementation, dedicated parameters will take no effect
*
+ * @param identityType
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
+ * @return
+ * @throws IdmException
+ */
+ Collection<Identity> findIdentities(IdentityType identityType,
+ int offset, int limit,
+ String orderedByAttributeName, boolean ascending) throws IdmException;
+
+ /**
+ * Find identities with a given attributes values. If the paginatedSearch or orderedSearch operations
+ * are not supported in this store implementation, dedicated parameters will take no effect
+ *
+ * @param identityType
* @param attributes
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
* @return
* @throws IdmException
*/
- Collection findIdentities(Map<String, String[]> attributes) throws IdmException;
+ Collection<Identity> findIdentities(IdentityType identityType, Map<String, String[]> attributes,
+ int offset, int limit,
+ String orderedByAttributeName, boolean ascending) throws IdmException;
-
/**
* Find identites that have relationship with given identity. Relationships are directional (from parent to child).
+ * If the paginatedSearch or orderedSearch operations
+ * are not supported in this store implementation, dedicated parameters will take no effect
*
* @param identity
* @param relationshipType
* @param parent defines if given identity is parent or child side in the relationship - default is true (parent)
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
* @return
* @throws IdmException
*/
- Collection findIdentities(Identity identity, RelationshipType relationshipType, boolean parent) throws IdmException;
+ Collection<Identity> findIdentities(Identity identity, RelationshipType relationshipType, boolean parent,
+ int offset, int limit,
+ String orderedByAttributeName, boolean ascending) throws IdmException;
/**
+ * @param identityType
+ * @return names of supported attributes
+ * @throws IdmException
+ */
+ Set<String> getSupportedAttributeNames(IdentityType identityType) throws IdmException;
+
+ /**
* Get attributes for the given identity
*
* @param identity
@@ -144,7 +247,7 @@
*
* @param identity
* @param attributes
- * @throws IdmException
+ * @throws org.jboss.idm.exceptions.IdmException
*/
void addAttributes(Identity identity, Map<String, String[]> attributes) throws IdmException;
@@ -154,7 +257,7 @@
* @param identity
* @param attributes
*/
- void removeAttributes(Identity identity, Set<String> attributes);
+ void removeAttributes(Identity identity, Set<String> attributes) throws IdmException;
/**
* Create directional relationship of a given type between identities
@@ -196,4 +299,6 @@
*/
Set<RelationshipType> resolveRelationships(Identity fromIdentity, Identity toIdentity) throws IdmException;
+
+
}
Deleted: modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdmException.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdmException.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdmException.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -1,49 +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.idm;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public class IdmException extends Exception
-{
- public IdmException()
- {
- }
-
- public IdmException(String message)
- {
- super(message);
- }
-
- public IdmException(String message, Throwable cause)
- {
- super(message, cause);
- }
-
- public IdmException(Throwable cause)
- {
- super(cause);
- }
-}
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEvent.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEvent.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEvent.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,31 @@
+/*
+* 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.idm.event;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class IdentityEvent
+{
+}
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventBroadcaster.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventBroadcaster.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventBroadcaster.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * 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.idm.event;
+
+/**
+ * Interface that allow event firing.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface IdentityEventBroadcaster
+{
+ /**
+ * Fire an event.
+ *
+ * @param event the event to fire
+ */
+ void fireEvent(IdentityEvent event);
+}
\ No newline at end of file
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventEmitter.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventEmitter.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventEmitter.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,46 @@
+/******************************************************************************
+ * 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.idm.event;
+
+/**
+ * Interface that allows registration management of identity event listeners.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface IdentityEventEmitter
+{
+ /**
+ * Add a listener.
+ *
+ * @param listener the listener for all identity events
+ */
+ void addListener(IdentityEventListener listener);
+
+ /**
+ * Remove a listener.
+ *
+ * @param listener the listener
+ */
+ void removeListener(IdentityEventListener listener);
+}
\ No newline at end of file
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventListener.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventListener.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/event/IdentityEventListener.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,39 @@
+/******************************************************************************
+ * 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.idm.event;
+
+/**
+ * An event listener.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface IdentityEventListener
+{
+ /**
+ * Fire event on the listener.
+ *
+ * @param event the identity event
+ */
+ void onEvent(IdentityEvent event);
+}
\ No newline at end of file
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdentityTypeNotSupportedException.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdentityTypeNotSupportedException.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdentityTypeNotSupportedException.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,31 @@
+/*
+* 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.idm.exceptions;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class IdentityTypeNotSupportedException extends IdmException
+{
+}
Copied: modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdmException.java (from rev 11052, modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdmException.java)
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdmException.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/IdmException.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,49 @@
+/*
+* 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.idm.exceptions;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class IdmException extends Exception
+{
+ public IdmException()
+ {
+ }
+
+ public IdmException(String message)
+ {
+ super(message);
+ }
+
+ public IdmException(String message, Throwable cause)
+ {
+ super(message, cause);
+ }
+
+ public IdmException(Throwable cause)
+ {
+ super(cause);
+ }
+}
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/OperationNotSupportedException.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/OperationNotSupportedException.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/OperationNotSupportedException.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,33 @@
+/*
+* 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.idm.exceptions;
+
+import org.jboss.idm.exceptions.IdmException;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class OperationNotSupportedException extends IdmException
+{
+}
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/RelationshipNotSupportedException.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/RelationshipNotSupportedException.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/exceptions/RelationshipNotSupportedException.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -0,0 +1,31 @@
+/*
+* 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.idm.exceptions;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public class RelationshipNotSupportedException
+{
+}
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupEntity.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupEntity.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupEntity.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -23,6 +23,7 @@
package org.jboss.idm.model;
import org.jboss.idm.IdentityType;
+import org.jboss.idm.Identity;
import java.util.Map;
import java.util.Collection;
@@ -31,7 +32,7 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-public interface GroupEntity
+public interface GroupEntity extends Identity
{
Object getId();
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupIdentityStore.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupIdentityStore.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupIdentityStore.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -41,6 +41,5 @@
// TODO: Set of needed methods
- // TODO: Mechanism for extensions and dynamic discovery of supported extended operations
}
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/Relationship.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/Relationship.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/Relationship.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -30,6 +30,7 @@
*/
public interface Relationship
{
+
GroupEntity getFrom();
GroupEntity getTo();
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/UserEntity.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/UserEntity.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/UserEntity.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -22,6 +22,8 @@
package org.jboss.idm.model;
+import org.jboss.idm.Identity;
+
import java.util.Map;
import java.util.Collection;
@@ -29,7 +31,7 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-public interface UserEntity
+public interface UserEntity extends Identity
{
Object getId();
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Group.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Group.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Group.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -38,61 +38,26 @@
EntityType getType();
/**
- * @return map containing group attributes
+ * @return group display name
*/
- Map<String, String[]> getAttributes();
+ String getDisplayName();
/**
- * Update user attribute values
- * @param attrName
- * @param values
- * @return
+ * @return description
*/
- boolean updateAttribute(String attrName, String[] values);
+ String getDescription();
/**
+ * @return map containing group attributes
+ */
+ Map<String, String[]> getAttributes();
+
+ /**
* @return id of parent group for the relations of RelationType.HIERARCHICAL. If the parent id is null, this object
* is a child of a root group in the store
*/
Object getParentId();
- /**
- * @return set of users assigned to this group
- */
- Set<User> getUsers();
+
- /**
- * @return set of groups that are either children of this group or implied for this group
- */
- Set<Group> getGroups();
-
- /**
- * @param type of the relation
- * @return set of groups that have given relation type with this group and the direction of the relation is towords
- * this group
- */
- Set<Group> getGroups(GroupRelationshipType type);
-
- /**
- * @param group
- * @return returns a relationship type between this and given group.
- */
- GroupRelationshipType getRelationship(Group group);
-
- /**
- * Assign a set of groups to this group. All other group associations (with this relation type) for this group
- * will be overrwitten
- * @param toGroups
- * @param type
- * @return
- */
- boolean assignGroups(Set<Group> toGroups, GroupRelationshipType type);
-
- /**
- * Assign a set of users to this group. All other user associations will be overwritten for this group
- * @param users
- * @return
- */
- boolean assignUsers(Set<User> users);
-
}
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -22,8 +22,13 @@
package org.jboss.portal.identity.api;
+import org.jboss.idm.exceptions.IdentityTypeNotSupportedException;
+
import java.util.Set;
import java.util.Map;
+import java.util.Collection;
+import org.jboss.idm.exceptions.IdmException;
+import org.jboss.idm.exceptions.IdentityTypeNotSupportedException
/**
* IdentityModule exposes operations to creat/destroy/find users and roles. Methods to manipulate those objects and
@@ -34,10 +39,54 @@
*/
public interface IdentityModule
{
- // Users
/**
+ * Operations related to the base set of methods in IdentityStore interface
+ */
+ public enum OperationType
+ {
+
+ create,
+
+ remove,
+
+ updateAttributes,
+
+ modifyRelationships,
+
+ paginatedSearch,
+
+ orderedSearch;
+
+ }
+
+ /**
+ * @param entityType
+ * @return supported operations for given identity type
+ * @throws IdentityTypeNotSupportedException
+ */
+ public Set<OperationType> getSupportedOperations(EntityType entityType) throws IdentityTypeNotSupportedException;
+
+ /**
+ * @param operationType
+ * @param entityType
+ * @return if given operation on given identity type is supported
+ * @throws IdentityTypeNotSupportedException
+ */
+ boolean isOperationSupported(OperationType operationType, EntityType entityType) throws IdentityTypeNotSupportedException;
+
+ /**
+ * @param operationType
+ * @return set of identity types that can be processed by this identity store with a given operation
+ * @throws IdmException
+ */
+ public Set<EntityType> getSupportedEntities(OperationType operationType);
+
+
+ // Users
+ /**
* Create new user in the data store
+ *
* @param userName
* @return
*/
@@ -45,6 +94,7 @@
/**
* Remove user from the the data store
+ *
* @param user
* @return
*/
@@ -52,6 +102,8 @@
/**
* Find user with a given user name
+ *
+ *
* @param userName
* @return
*/
@@ -66,16 +118,70 @@
/**
* Find users with a given properties values
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
* @param properties
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
* @return
*/
- Set<Group> findUsers(Map<String, String[]> properties);
+ Collection<Group> findUsers(Map<String, String[]> properties,
+ int offset, int limit, String orderedByAttributeName, boolean ascending);
+ /**
+ * Update user attribute values
+ *
+ * @param user
+ * @param attrName
+ * @param values
+ * @return
+ */
+ boolean updateAttribute(User user, String attrName, String[] values);
+
+ /**
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
+ * @param user
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
+ * @return a set of groups that this user belongs to
+ */
+ Collection<Group> getGroups(User user, int offset, int limit, String orderedByAttributeName, boolean ascending);
+
+ /**
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
+ * @param user
+ * @param entityType
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
+ * @return a set of groups with a given groupType that this user belongs to
+ */
+ Collection<Group> getGroups(User user, EntityType entityType,
+ int offset, int limit, String orderedByAttributeName, boolean ascending);
+
+ /**
+ * Assign a set of groups to this user. All other group associations will be overwritten
+ *
+ * @param user
+ * @param groups
+ * @return
+ */
+ boolean assignGroups(User user, Set<Group> groups);
+
+
// Groups
/**
* Create new group in the data store
+ *
* @param groupName
* @return
*/
@@ -83,6 +189,7 @@
/**
* Remove group from the data store
+ *
* @param group
* @return
*/
@@ -90,6 +197,7 @@
/**
* Find group with a given name
+ *
* @param name
* @return
*/
@@ -97,6 +205,7 @@
/**
* Find Group with a given object id
+ *
* @param id
* @return
*/
@@ -104,6 +213,7 @@
/**
* Find Group with a given group type
+ *
* @param entityType
* @return
*/
@@ -111,8 +221,91 @@
/**
* Find groups with a given attributes values
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
* @param properties
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
* @return
*/
- Set<Group> findGroups(Map<String, String[]> properties);
+ Collection<Group> findGroups(Map<String, String[]> properties,
+ int offset, int limit, String orderedByAttributeName, boolean ascending);
+
+ /**
+ * Update user attribute values
+ *
+ * @param attrName
+ * @param values
+ * @return
+ */
+ boolean updateAttribute(Group group, String attrName, String[] values);
+
+ /**
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
+ * @param group
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
+ * @return set of users assigned to this group. Depending on the underlaying implementation and datastore it may
+ * affect performance
+ */
+ Collection<User> getUsers(Group group, int offset, int limit, String orderedByAttributeName, boolean ascending);
+
+ /**
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
+ * @param group
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
+ * @return set of groups that are either children of this group or implied for this group
+ */
+ Collection<Group> getGroups(Group group, int offset, int limit, String orderedByAttributeName, boolean ascending);
+
+ /**
+ * If the paginatedSearch or orderedSearch operations are not supported, dedicated parameters will take no effect
+ *
+ * @param group
+ * @param type of the relation
+ * @param offset
+ * @param limit 0 means unlimited page size
+ * @param orderedByAttributeName can be null
+ * @param ascending default true
+ * @return set of groups that have given relation type with this group and the direction of the relation is towords
+ * this group
+ */
+ Collection<Group> getGroups(Group group, GroupRelationshipType type,
+ int offset, int limit, String orderedByAttributeName, boolean ascending);
+
+ /**
+ * @param fromGroup
+ * @param toGroup
+ * @return returns a relationship type between this and given group.
+ */
+ GroupRelationshipType getRelationship(Group fromGroup, Group toGroup);
+
+ /**
+ * Assign a set of groups to this group. All other group associations (with this relation type) for this group
+ * will be overrwitten
+ *
+ * @param fromGroup
+ * @param toGroups
+ * @param type
+ * @return
+ */
+ boolean assignGroups(Group fromGroup, Set<Group> toGroups, GroupRelationshipType type);
+
+ /**
+ * Assign a set of users to this group. All other user associations will be overwritten for this group
+ *
+ * @param group
+ * @param users
+ * @return
+ */
+ boolean assignUsers(Group group, Set<User> users);
}
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/User.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/User.java 2008-06-16 13:20:15 UTC (rev 11057)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/User.java 2008-06-16 13:54:56 UTC (rev 11058)
@@ -35,34 +35,13 @@
{
/**
- * @return map containing user attributes
+ * @return user email
*/
- Map<String, String[]> getAttributes();
+ String getEmail();
/**
- * Update user attribute values
- * @param attrName
- * @param values
- * @return
+ * @return map containing user attributes
*/
- boolean updateAttribute(String attrName, String[] values);
+ Map<String, String[]> getAttributes();
- /**
- * @return a set of groups that this user belongs to
- */
- Set<Group> getGroups();
-
- /**
- * @param entityType
- * @return a set of groups with a given groupType that this user belongs to
- */
- Set<Group> getGroups(EntityType entityType);
-
- /**
- * Assign a set of groups to this user. All other group associations will be overwritten
- * @param groups
- * @return
- */
- boolean assignGroups(Set<Group> groups);
-
}
17 years, 10 months
- 1
- 0