JBoss Portal SVN: r11087 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-06-18 23:42:22 -0400 (Wed, 18 Jun 2008)
New Revision: 11087
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
Log:
removing unncecessary oracle trademark marks
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-18 22:01:58 UTC (rev 11086)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/installation.xml 2008-06-19 03:42:22 UTC (rev 11087)
@@ -89,7 +89,7 @@
<sect3>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: <trademark class="registered">MySQL</trademark> 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: <trademark class="registered">MySQL</trademark> 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, and <trademark class="registered">Oracle</trademark> Database 9 and 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -117,7 +117,7 @@
<sect3>
<title>Datasource Descriptors</title>
<para>
- The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4 and 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
+ The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4 and 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and Oracle databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
</para>
<mediaobject>
<imageobject>
@@ -384,7 +384,7 @@
<sect2>
<title>Database Setup</title>
<para>
- A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, <trademark class="registered">Oracle</trademark> Database 9, and <trademark class="registered">Oracle</trademark> Database 10. JBoss Portal can use any database that is supported by Hibernate.
+ A database is required for JBoss Portal to run. JBoss EAP and JBoss AS include an embedded Hypersonic SQL database that JBoss Portal can use; however, this is only recommended for developer use. The following databases are recommended for production use, and have had test suites run against them: MySQL 4 and 5, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL 8, and Oracle Database 9 and 10. JBoss Portal can use any database that is supported by Hibernate.
</para>
<para>
To configure a database to use with JBoss Portal:
@@ -412,7 +412,7 @@
<sect2>
<title>Datasource Configuration</title>
<para>
- The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4 and 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and <trademark class="registered">Oracle</trademark> databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
+ The JBoss Portal binary download that was extracted in <xref linkend="install_binarydownload"/>, contains pre-configured Datasource descriptors for the more popular databases. Datasource descriptors are provided for the MySQL 4 and 5, PostgreSQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, and Oracle databases, and can be found in the <filename>setup</filename> subdirectory where the JBoss Portal binary was extracted to:
</para>
<mediaobject>
<imageobject>
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-06-18 22:01:58 UTC (rev 11086)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/xmldescriptors.xml 2008-06-19 03:42:22 UTC (rev 11087)
@@ -1556,7 +1556,7 @@
</mediaobject>
</para>
<para>
- The <filename>jboss-portal-<replaceable>version</replaceable>/setup/</filename> directory contains sample Datasource descriptors for the MySQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL, and <trademark class="registered">Oracle</trademark> databases, which can be customized for your own database:
+ The <filename>jboss-portal-<replaceable>version</replaceable>/setup/</filename> directory contains sample Datasource descriptors for the MySQL, <trademark class="registered">Microsoft</trademark> <trademark class="registered">SQL Server</trademark>, PostgreSQL, and Oracle databases, which can be customized for your own database:
</para>
<para>
<mediaobject>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11086 - in branches/JBoss_Portal_Branch_2_7: cms and 10 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2008-06-18 18:01:58 -0400 (Wed, 18 Jun 2008)
New Revision: 11086
Modified:
branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
branches/JBoss_Portal_Branch_2_7/cms/build.xml
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java
branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
branches/JBoss_Portal_Branch_2_7/core-management/build.xml
branches/JBoss_Portal_Branch_2_7/core/build.xml
branches/JBoss_Portal_Branch_2_7/workflow/build.xml
branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java
branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java
branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
Log:
- Started upgrading jBPM to 3.2.2.
- Might not work yet (mostly synchronization commit)
- More generification.
- Minor documentation.
- Started fixing wsrp tests. More work needed to upgrade to PC 2.0.0
Modified: branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/build/build-thirdparty.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -49,7 +49,7 @@
<componentref name="jboss-portal/modules/common" version="1.2.0"/>
<componentref name="jboss-portal/modules/web" version="1.2.0"/>
- <componentref name="jboss-portal/modules/test" version="1.0.1"/>
+ <componentref name="jboss-portal/modules/test" version="1.1.0"/>
<componentref name="jboss-portal/modules/portlet" version="trunk-SNAPSHOT"/>
<componentref name="jboss-portal/modules/identity" version="1.0-SNAPSHOT"/>
<componentref name="antlr" version="2.7.6.ga"/>
@@ -117,7 +117,7 @@
<componentref name="sun-servlet" version="2.4"/>
<componentref name="sun-jaxb" version="2.0"/>
<componentref name="xdoclet" version="1.2.3"/>
- <componentref name="jbpm/jaronly" version="3.1.2"/>
+ <componentref name="jbpm/jpdl" version="3.2.2"/>
<componentref name="freemarker" version="2.3.9"/>
<componentref name="wutka-dtdparser" version="1.2.1"/>
<componentref name="portals-bridges" version="1.0.3"/>
@@ -127,8 +127,8 @@
<componentref name="jboss/web" version="2.1.0.GA"/>
<!-- For the presentation branch only, not the mainstream branch -->
- <componentref name="gwt" version="1.4.60"/>
- <componentref name="mygwt" version="0.3.0"/>
+ <!-- <componentref name="gwt" version="1.4.60"/>
+ <componentref name="mygwt" version="0.3.0"/> -->
</build>
Modified: branches/JBoss_Portal_Branch_2_7/cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/build.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/cms/build.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -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;
@@ -92,20 +85,20 @@
<path refid="jboss.portal/modules/test.classpath"/>
<path refid="jboss.portal/modules/portlet.classpath"/>
<path refid="jboss.portal/modules/identity.classpath"/>
- <path refid="apache.logging.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="apache.collections.classpath"/>
- <path refid="apache.lucene.classpath"/>
- <path refid="apache.ant.classpath"/>
+ <path refid="apache.logging.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="apache.lucene.classpath"/>
+ <path refid="apache.ant.classpath"/>
<path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.cache.classpath"/>
+ <path refid="jboss.cache.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="jboss.microcontainer.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
<path refid="ehcache.ehcache.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
- <path refid="jakarta.io.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="jakarta.io.classpath"/>
<path refid="junit.junit.classpath"/>
<path refid="jackrabbit.jackrabbit.classpath"/>
<path refid="slf4j.slf4j.classpath"/>
@@ -115,10 +108,10 @@
<!-- cms optimization integration -->
<path refid="jgroups.jgroups.classpath"/>
<path refid="sun.servlet.classpath"/>
- <!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <!-- jbpm integration -->
+ <path refid="jbpm.jpdl.classpath"/>
</path>
-
+
<path id="javac.classpath">
<pathelement location="${build.classes}"/>
</path>
@@ -132,11 +125,11 @@
<path refid="jboss.portal-jems.classpath"/>
<path refid="jboss.portal-search.classpath"/>
<!-- fine grained security integration -->
- <path refid="jboss.portal-security.classpath"/>
+ <path refid="jboss.portal-security.classpath"/>
<!-- clustered testcases related -->
- <path refid="jboss.portal-api.classpath"/>
- <!-- workflow integration -->
- <path refid="jboss.portal-workflow.classpath"/>
+ <path refid="jboss.portal-api.classpath"/>
+ <!-- workflow integration -->
+ <path refid="jboss.portal-workflow.classpath"/>
</path>
@@ -202,17 +195,17 @@
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/>
<fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/>
-
+
<!-- cms optimization integration -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
- <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
-
- <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
+
+ <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
</jar>
-
+
<copy todir="${build.resources}/test/jcr/">
<fileset dir="${source.bin}" includes="ziptest.zip"/>
- <fileset dir="${source.bin}" includes="prueba.zip"/>
+ <fileset dir="${source.bin}" includes="prueba.zip"/>
<fileset dir="${source.bin}" includes="headerpage.html"/>
<fileset dir="${source.bin}" includes="headerpage_good.html"/>
</copy>
@@ -221,25 +214,24 @@
<!--
generates artifacts used for tests, requires output to be previously run
-->
- <target name="package-tests" depends="init">
- <jar jarfile="${build.lib}/test-cms-cluster.sar" manifest="${build.etc}/portal-cms-lib-sar.mf">
- <fileset dir="${build.resources}/portal-cms-sar"/>
- <fileset dir="${build.lib}" includes="portal-cms-lib.jar"/>
- <fileset dir="${jcr.jcr.root}/lib" includes="jcr-1.0.jar"/>
- <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/>
- <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
+ <target name="package-tests" depends="init">
+ <jar jarfile="${build.lib}/test-cms-cluster.sar" manifest="${build.etc}/portal-cms-lib-sar.mf">
+ <fileset dir="${build.resources}/portal-cms-sar"/>
+ <fileset dir="${build.lib}" includes="portal-cms-lib.jar"/>
+ <fileset dir="${jcr.jcr.root}/lib" includes="jcr-1.0.jar"/>
+ <fileset dir="${apache.collections.root}/lib" includes="commons-collections.jar"/>
+ <fileset dir="${apache.lucene.root}/lib" includes="lucene.jar"/>
- <!-- cms optimization integration -->
- <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
- <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
-
- <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
+ <!-- cms optimization integration -->
+ <fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
+ <fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
- <!-- add the jboss-service.xml and hibernate configuration -->
- <fileset dir="${build.resources}/test/cms/clustering/sar"/>
-
- <!-- add dependencies -->
- <!--
+ <fileset dir="${slf4j.slf4j.lib}" includes="slf4j-log4j12.jar"/>
+
+ <!-- add the jboss-service.xml and hibernate configuration -->
+ <fileset dir="${build.resources}/test/cms/clustering/sar"/>
+
+ <!-- add dependencies --> <!--
<fileset dir="${jboss.portal-core.lib}" includes="portal-core-lib.jar"/>
<fileset dir="${jboss.portal/modules/common.lib}" includes="portal-common-lib.jar"/>
<fileset dir="${jboss.portal-jems.lib}" includes="portal-jems-lib.jar"/>
@@ -248,61 +240,58 @@
<fileset dir="${jboss.portlet-api.lib}" includes="portal-api-lib.jar"/>
<fileset dir="${jboss.portal-security.lib}" includes="portal-security-lib.jar"/>
-->
- <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/>
- <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/>
- <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/>
- <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/>
- </jar>
- <jar jarfile="${build.lib}/test-cms-cluster.war">
- <fileset dir="${build.resources}/test/cms/clustering/test-cms-clustering-war"/>
- <fileset dir="${build.classes}" includes="org/jboss/portal/test/cms/clustering/**"/>
- </jar>
- </target>
-
- <target name="deploy-tests"
+ <fileset dir="${jboss.portal-core-cms.lib}" includes="portal-core-cms-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-lib.jar"/>
+ <fileset dir="${jboss.portal/modules/identity.lib}" includes="portal-identity-sso-lib.jar"/>
+ <fileset dir="${jboss.portal-workflow.lib}" includes="portal-workflow-lib.jar"/>
+ </jar>
+ <jar jarfile="${build.lib}/test-cms-cluster.war">
+ <fileset dir="${build.resources}/test/cms/clustering/test-cms-clustering-war"/>
+ <fileset dir="${build.classes}" includes="org/jboss/portal/test/cms/clustering/**"/>
+ </jar>
+ </target>
+
+ <target name="deploy-tests"
description="Deploy."
depends="output">
-
- <!-- deploying the test datasources -->
- <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml" todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/>
- <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml" todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/>
- <!-- install test sars needed for the testsuite framework -->
- <!--
+ <!-- deploying the test datasources -->
+ <copy file="${build.resources}/test/cms/clustering/datasource/ports01-ds.xml"
+ todir="${jboss.home}/server/ports-01/deploy" overwrite="true"/>
+ <copy file="${build.resources}/test/cms/clustering/datasource/ports02-ds.xml"
+ todir="${jboss.home}/server/ports-02/deploy" overwrite="true"/>
+
+ <!-- install test sars needed for the testsuite framework --><!--
<copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
<copy file="${jboss.portal-portlet.lib}/test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
-->
-
- <!--
- <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
- <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
- -->
-
- <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/>
+
+ <!--
+ <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-01/deploy"/>
+ <copy file="${jboss.portal-test.lib}/portal-test.sar" todir="${jboss.home}/server/ports-02/deploy"/>
+ -->
+
+ <copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-01/deploy"/>
<copy file="${build.lib}/test-cms-cluster.sar" todir="${jboss.home}/server/ports-02/deploy"/>
- </target>
-
- <target name="undeploy-tests"
+ </target>
+
+ <target name="undeploy-tests"
description="UnDeploy."
- depends="output">
- <!-- install test sars needed for the testsuite framework -->
- <!--
+ depends="output">
+ <!-- install test sars needed for the testsuite framework --> <!--
<delete file="${jboss.home}/server/ports-01/deploy/test.sar"/>
<delete file="${jboss.home}/server/ports-02/deploy/test.sar"/>
- -->
- <!--
+ --> <!--
<delete file="${jboss.home}/server/ports-01/deploy/portal-test.sar"/>
<delete file="${jboss.home}/server/ports-02/deploy/portal-test.sar"/>
-->
-
- <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/>
- <delete file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/>
- </target>
- <!-- ================================================================== -->
- <!-- Cleaning -->
- <!-- ================================================================== -->
+ <delete file="${jboss.home}/server/ports-01/deploy/test-cms-cluster.sar"/>
+ <delete file="${jboss.home}/server/ports-02/deploy/test-cms-cluster.sar"/>
+ </target>
+ <!-- ================================================================== --><!-- Cleaning --><!-- ================================================================== -->
+
<!-- Clean up all build output -->
<target name="clean" depends="_default:clean">
<!-- Add module specific elements here. -->
@@ -331,107 +320,106 @@
<!-- Test. -->
<!-- ================================================================== -->
<target name="clustered-tests" depends="init">
- <execute-tests>
- <x-sysproperty>
- <sysproperty key="test.root" value="${build.lib}"/>
- <sysproperty key="test.uri" value="/test/redirect/"/>
- </x-sysproperty>
- <x-test>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.clustering.FileUpdateTest"/>
- </x-test>
- <x-classpath>
- <path refid="apache.logging.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.cache.classpath"/>
- <path refid="apache.xerces.classpath"/>
- <path refid="oswego.concurrent.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
- <path refid="hibernate.hibernate.classpath"/>
- <path refid="ehcache.ehcache.classpath"/>
- <path refid="jbossas/core.libs.classpath"/>
- <path refid="apache.log4j.classpath"/>
- <path refid="jakarta.io.classpath"/>
- <path refid="apache.collections.classpath"/>
- <path refid="apache.lucene.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="slf4j.slf4j.classpath"/>
- <path refid="sun.jaf.classpath"/>
- <path refid="xdoclet.xdoclet.classpath"/>
- <path refid="jcr.jcr.classpath"/>
- <path refid="dom4j.dom4j.classpath"/>
- <path refid="antlr.antlr.classpath"/>
- <path refid="asm.asm.classpath"/>
- <path refid="cglib.cglib.classpath"/>
- <path refid="apache.httpclient.classpath"/>
- <path refid="jboss.portal/modules/common.classpath"/>
- <path refid="jboss.portal/modules/test.classpath"/>
- <pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/>
- <path refid="jboss.portal-server.classpath"/>
- <path refid="jboss.portal-jems.classpath"/>
- <pathelement location="${build.lib}/portal-cms-lib.jar"/>
- <pathelement location="${build.resources}/portal-cms-sar"/>
- <pathelement location="${build.resources}/test"/>
- <pathelement location="${build.resources}/hibernate"/>
- <pathelement location="${jboss.portal/modules/test.resources}"/>
- <!-- jbosscachepersistence manager integration -->
- <path refid="jackrabbit.jackrabbit.classpath"/>
- <path refid="jboss.cache.classpath"/>
- <path refid="jgroups.jgroups.classpath"/>
- <!-- for clustering related -->
- <pathelement location="${source.java}"/>
- <pathelement location="${build.classes}"/>
- <pathelement location="${build.resources}"/>
- <path refid="library.classpath"/>
- <path refid="dependentmodule.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="apache.httpclient.classpath"/>
- <path refid="jboss.serialization.classpath"/>
- <path refid="apache.codec.classpath"/>
- </x-classpath>
- </execute-tests>
+ <execute-tests>
+ <x-sysproperty>
+ <sysproperty key="test.root" value="${build.lib}"/>
+ <sysproperty key="test.uri" value="/test/redirect/"/>
+ </x-sysproperty>
+ <x-test>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.clustering.FileUpdateTest"/>
+ </x-test>
+ <x-classpath>
+ <path refid="apache.logging.classpath"/>
+ <path refid="jboss.jbossxb.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="apache.xerces.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="jboss.microcontainer.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
+ <path refid="ehcache.ehcache.classpath"/>
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="apache.log4j.classpath"/>
+ <path refid="jakarta.io.classpath"/>
+ <path refid="apache.collections.classpath"/>
+ <path refid="apache.lucene.classpath"/>
+ <path refid="junit.junit.classpath"/>
+ <path refid="slf4j.slf4j.classpath"/>
+ <path refid="sun.jaf.classpath"/>
+ <path refid="xdoclet.xdoclet.classpath"/>
+ <path refid="jcr.jcr.classpath"/>
+ <path refid="dom4j.dom4j.classpath"/>
+ <path refid="antlr.antlr.classpath"/>
+ <path refid="asm.asm.classpath"/>
+ <path refid="cglib.cglib.classpath"/>
+ <path refid="apache.httpclient.classpath"/>
+ <path refid="jboss.portal/modules/common.classpath"/>
+ <path refid="jboss.portal/modules/test.classpath"/>
+ <pathelement location="${jboss.portal/modules/test.lib}/portal-test-jboss-lib.jar"/>
+ <path refid="jboss.portal-server.classpath"/>
+ <path refid="jboss.portal-jems.classpath"/>
+ <pathelement location="${build.lib}/portal-cms-lib.jar"/>
+ <pathelement location="${build.resources}/portal-cms-sar"/>
+ <pathelement location="${build.resources}/test"/>
+ <pathelement location="${build.resources}/hibernate"/>
+ <pathelement location="${jboss.portal/modules/test.resources}"/>
+ <!-- jbosscachepersistence manager integration -->
+ <path refid="jackrabbit.jackrabbit.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="jgroups.jgroups.classpath"/>
+ <!-- for clustering related -->
+ <pathelement location="${source.java}"/>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <path refid="library.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="apache.httpclient.classpath"/>
+ <path refid="jboss.serialization.classpath"/>
+ <path refid="apache.codec.classpath"/>
+ </x-classpath>
+ </execute-tests>
</target>
<target name="tests" depends="init">
<execute-tests>
<x-sysproperty>
- <!--
+ <!--
<jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,address=8787,server=y,suspend=y"/>
- -->
- <!--
+ --> <!--
prefer IPv4 when running test with jdk1.5 on linux.
This supposedly is a java bug as per jgroups page.
-->
- <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
+ <jvmarg value="-Djava.net.preferIPv4Stack=true"/>
</x-sysproperty>
<x-test>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryBootStrap"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRegEx"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.TestRepositoryUtil"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreate"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileUpdate"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileArchiveUpload"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetVersion"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGet"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetList"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCopy"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSearch"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileUpdate"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileArchiveUpload"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetVersion"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGet"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileGetList"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCopy"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreateFailed"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileDelete"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSearch"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/>
-
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestWriteAccess"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/>
-
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/>
- <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCreate"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderDelete"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderGet"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderUpdate"/>
+
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestReadAccess"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestWriteAccess"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.security.TestManageAccess"/>
+
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestApprovedPublish"/>
+ <test todir="${test.reports}" name="org.jboss.portal.test.cms.workflow.TestDeniedPublish"/>
</x-test>
<x-classpath>
<path refid="apache.logging.classpath"/>
@@ -447,7 +435,7 @@
<path refid="jakarta.io.classpath"/>
<path refid="apache.collections.classpath"/>
<path refid="apache.lucene.classpath"/>
- <path refid="junit.junit.classpath"/>
+ <path refid="junit.junit.classpath"/>
<path refid="slf4j.slf4j.classpath"/>
<path refid="sun.jaf.classpath"/>
<path refid="xdoclet.xdoclet.classpath"/>
@@ -471,24 +459,24 @@
<pathelement location="${jboss.portal/modules/test.resources}"/>
<!-- jbosscachepersistence manager integration -->
<path refid="jackrabbit.jackrabbit.classpath"/>
- <path refid="nekohtml.nekohtml.classpath"/>
- <path refid="jboss.cache.classpath"/>
- <path refid="jgroups.jgroups.classpath"/>
- <!-- fine grained security integration -->
- <path refid="jboss.portal/modules/identity.classpath"/>
- <path refid="jboss.portal-security.classpath"/>
- <!-- workflow integration -->
- <path refid="jbpm.jaronly.classpath"/>
- <path refid="beanshell.beanshell.classpath"/>
- <path refid="jboss.portal-workflow.classpath"/>
+ <path refid="nekohtml.nekohtml.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="jgroups.jgroups.classpath"/>
+ <!-- fine grained security integration -->
+ <path refid="jboss.portal/modules/identity.classpath"/>
+ <path refid="jboss.portal-security.classpath"/>
+ <!-- workflow integration -->
+ <path refid="jbpm.jpdl.classpath"/>
+ <path refid="beanshell.beanshell.classpath"/>
+ <path refid="jboss.portal-workflow.classpath"/>
</x-classpath>
</execute-tests>
</target>
<target name="reports" depends="init">
<mkdir dir="${build.reports}"/>
- <mkdir dir="${build.reports}/html"/>
- <property name="test.reports" value="${module.output}/tests"/>
+ <mkdir dir="${build.reports}/html"/>
+ <property name="test.reports" value="${module.output}/tests"/>
<junitreport todir="${build.reports}">
<fileset dir="${test.reports}">
<include name="TEST-*.xml"/>
@@ -497,14 +485,14 @@
</junitreport>
</target>
<target name="reports-noframes" depends="init">
- <mkdir dir="${build.reports}"/>
- <mkdir dir="${build.reports}/html"/>
- <property name="test.reports" value="${module.output}/tests"/>
- <junitreport todir="${build.reports}">
- <fileset dir="${test.reports}">
- <include name="TEST-*.xml"/>
- </fileset>
- <report format="noframes" todir="${build.reports}/html"/>
- </junitreport>
- </target>
+ <mkdir dir="${build.reports}"/>
+ <mkdir dir="${build.reports}/html"/>
+ <property name="test.reports" value="${module.output}/tests"/>
+ <junitreport todir="${build.reports}">
+ <fileset dir="${test.reports}">
+ <include name="TEST-*.xml"/>
+ </fileset>
+ <report format="noframes" todir="${build.reports}/html"/>
+ </junitreport>
+ </target>
</project>
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublish.java 2008-06-18 22:01:58 UTC (rev 11086)
@@ -38,27 +38,28 @@
* Called when content is added to the CMS, and needs to be approved by the managers before it can be published to go
* live
*
- * @param content
- * @return returns the process id of the workflow process set in motion
+ * @param content the content to be approved
+ * @return the process id of the workflow process set in motion
+ * @throws WorkflowException if an error occured during the approval process
*/
public long requestApproval(Content content) throws WorkflowException;
/**
* Called when a manager either approves or rejects the publishing of a specific content to go live
*
- * @param processId
+ * @param processId the id of the approval process we are interested in
* @param manager userId of the manager
* @param approved true if approved, false if rejected
*/
public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException;
-
- /**
- * Called when a manager either approves the publishing of a specific content to go live, but at the same time
- * adds his/her own modifications to the original content
+
+ /**
+ * Called when a manager either approves the publishing of a specific content to go live, but at the same time adds
+ * his/her own modifications to the original content
*
- * @param processId
- * @param manager userId of the manager
- * @param approved true if approved, false if rejected
+ * @param processId the process id of the workflow we're interesting in
+ * @param manager userId of the manager
+ * @param modifiedContent modified content
*/
public void processManagerResponse(long processId, String manager, String modifiedContent) throws WorkflowException;
@@ -69,7 +70,7 @@
* @return
* @throws WorkflowException
*/
- public Collection getPendingQueue(String filePath) throws WorkflowException;
+ public Collection<Content> getPendingQueue(String filePath) throws WorkflowException;
/**
* Retrieves a queue of unapproved content for everything in the CMS.
@@ -77,7 +78,7 @@
* @return
* @throws WorkflowException
*/
- public Collection getAllPendingInQueue() throws WorkflowException;
+ public Collection<Content> getAllPendingInQueue() throws WorkflowException;
/**
* Returns role names of Roles that are designated to be Managers in this workflow. Managers approve/deny all content
@@ -85,5 +86,5 @@
*
* @return a Set of role names
*/
- public Set getManagers();
+ public Set<String> getManagers();
}
Modified: branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/cms/src/main/org/jboss/portal/cms/workflow/ApprovePublishImpl.java 2008-06-18 22:01:58 UTC (rev 11086)
@@ -75,7 +75,7 @@
private String processName = null;
private String managerRoles = null;
private String[] managers = null;
- private Set managerSet = null;
+ private Set<String> managerSet = null;
private boolean overwrite = false;
private String from = null;
private String subject = null;
@@ -156,7 +156,7 @@
//process managers that can serve as approvers/rejecters
StringTokenizer st = new StringTokenizer(this.managerRoles, ",");
this.managers = new String[st.countTokens()];
- this.managerSet = new HashSet();
+ this.managerSet = new HashSet<String>();
for (int i = 0; i < managers.length; i++)
{
this.managers[i] = st.nextToken();
@@ -164,10 +164,10 @@
}
this.membershipModule = (MembershipModule)identityServiceController.getIdentityContext().
- getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
+ getObject(IdentityContext.TYPE_MEMBERSHIP_MODULE);
this.userModule = (UserModule)identityServiceController.getIdentityContext().
- getObject(IdentityContext.TYPE_USER_MODULE);
+ getObject(IdentityContext.TYPE_USER_MODULE);
}
/**
@@ -256,7 +256,7 @@
/** @param identityServiceController */
public void setIdentityServiceController(
- IdentityServiceController identityServiceController)
+ IdentityServiceController identityServiceController)
{
this.identityServiceController = identityServiceController;
}
@@ -357,13 +357,6 @@
return processId;
}
- /**
- * Called when a manager either approves or rejects the publishing of a specific content to go live
- *
- * @param processId
- * @param manager userId of the manager
- * @param approved true if approved, false if rejected
- */
public void processManagerResponse(long processId, String manager, boolean approved) throws WorkflowException
{
JbpmContext jbpmContext = null;
@@ -436,15 +429,7 @@
IOTools.safeClose(jbpmContext);
}
}
-
- /**
- * Called when a manager either approves the publishing of a specific content to go live, but at the same time
- * adds his/her own modifications to the original content
- *
- * @param processId
- * @param manager userId of the manager
- * @param approved true if approved, false if rejected
- */
+
public void processManagerResponse(long processId, String manager, String modifiedContent) throws WorkflowException
{
JbpmContext jbpmContext = null;
@@ -463,28 +448,28 @@
return;
}
- processInstance.getContextInstance().setVariable("approved", new Boolean(true));
+ processInstance.getContextInstance().setVariable("approved", true);
processInstance.getContextInstance().setVariable("modifiedContent", modifiedContent);
- Collection allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
+ @SuppressWarnings("unchecked")
+ Collection<TaskInstance> allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
if (allTasks != null)
{
- for (Iterator itr = allTasks.iterator(); itr.hasNext();)
+ for (TaskInstance currentTask : allTasks)
{
- TaskInstance cour = (TaskInstance)itr.next();
- if (this.isManager(manager, cour.getActorId()))
+ if (this.isManager(manager, currentTask.getActorId()))
{
isManager = true;
- log.debug("Manager=" + cour.getActorId() + "(" + processId + ")");
+ log.debug("Manager=" + currentTask.getActorId() + "(" + processId + ")");
//check and make sure this task instance is not marked for deletion
- if (cour.getVariable(processInstance.getId() + ":" + cour.getId()) != null)
+ if (currentTask.getVariable(processInstance.getId() + ":" + currentTask.getId()) != null)
{
continue;
}
-
- cour.start();
- cour.end("approval");
+
+ currentTask.start();
+ currentTask.end("approval");
break;
}
}
@@ -503,8 +488,7 @@
if (!isManager)
{
- WorkflowException we = new WorkflowException("You are not authorized to Approve/Deny content publish requests");
- throw we;
+ throw new WorkflowException("You are not authorized to Approve/Deny content publish requests");
}
IOTools.safeClose(jbpmContext);
}
@@ -517,9 +501,9 @@
* @return
* @throws WorkflowException
*/
- public Collection getPendingQueue(String filePath) throws WorkflowException
+ public Collection<Content> getPendingQueue(String filePath) throws WorkflowException
{
- Collection pendingQueue = new ArrayList();
+ Collection<Content> pendingQueue = new ArrayList<Content>();
JbpmContext jbpmContext = null;
try
{
@@ -527,17 +511,18 @@
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDef = graphSession.findLatestProcessDefinition(this.processName);
- List processInstances = graphSession.findProcessInstances(processDef.getId());
+ @SuppressWarnings("unchecked")
+ List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDef.getId());
+
if (processInstances != null)
{
- for (int i = 0; i < processInstances.size(); i++)
+ for (ProcessInstance processInstance : processInstances)
{
- ProcessInstance cour = (ProcessInstance)processInstances.get(i);
//iterate through a list of currently pending approval tasks
- if (!cour.hasEnded())
+ if (!processInstance.hasEnded())
{
- Content content = (Content)cour.getContextInstance().getVariable("content");
+ Content content = (Content)processInstance.getContextInstance().getVariable("content");
//apply proper criteria to extract pending content only for the specified file
if (content != null)
@@ -547,7 +532,7 @@
if (criteriaPath.trim().equals(filePath.trim()))
{
- content.setProcessId(String.valueOf(cour.getId()));
+ content.setProcessId(String.valueOf(processInstance.getId()));
pendingQueue.add(content);
}
}
@@ -568,9 +553,9 @@
* @return
* @throws WorkflowException
*/
- public Collection getAllPendingInQueue() throws WorkflowException
+ public Collection<Content> getAllPendingInQueue() throws WorkflowException
{
- Collection pendingQueue = new ArrayList();
+ Collection<Content> pendingQueue = new ArrayList<Content>();
JbpmContext jbpmContext = null;
try
{
@@ -578,22 +563,23 @@
GraphSession graphSession = jbpmContext.getGraphSession();
ProcessDefinition processDef = graphSession.findLatestProcessDefinition(this.processName);
- List processInstances = graphSession.findProcessInstances(processDef.getId());
+ @SuppressWarnings("unchecked")
+ List<ProcessInstance> processInstances = graphSession.findProcessInstances(processDef.getId());
+
if (processInstances != null)
{
- for (int i = 0; i < processInstances.size(); i++)
+ for (ProcessInstance processInstance : processInstances)
{
- ProcessInstance cour = (ProcessInstance)processInstances.get(i);
//iterate through a list of currently pending approval tasks
- if (!cour.hasEnded())
+ if (!processInstance.hasEnded())
{
- Content content = (Content)cour.getContextInstance().getVariable("content");
+ Content content = (Content)processInstance.getContextInstance().getVariable("content");
//apply proper criteria to extract pending content only for the specified file
if (content != null)
{
- content.setProcessId(String.valueOf(cour.getId()));
+ content.setProcessId(String.valueOf(processInstance.getId()));
pendingQueue.add(content);
}
}
@@ -608,7 +594,7 @@
}
/** @return */
- public Set getManagers()
+ public Set<String> getManagers()
{
return this.managerSet;
}
@@ -626,7 +612,7 @@
boolean isManager = false;
Set userRoles = this.membershipModule.getRoles(
- this.userModule.findUserByUserName(user));
+ this.userModule.findUserByUserName(user));
if (userRoles != null)
{
for (Iterator itr = userRoles.iterator(); itr.hasNext();)
Modified: branches/JBoss_Portal_Branch_2_7/core/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/core/build.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -121,7 +121,7 @@
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <path refid="jbpm.jpdl.classpath"/>
<path refid="sun.jaxb.classpath"/>
</path>
@@ -344,7 +344,7 @@
<fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/>
<fileset dir="${tagsoup.tagsoup.lib}" includes="tagsoup.jar"/>
<fileset dir="${jboss/backport.concurrent.lib}" includes="jboss-backport-concurrent.jar"/>
- <fileset dir="${jbpm.jaronly.lib}" includes="jbpm.jar,jbpm-identity.jar"/>
+ <fileset dir="${jbpm.jpdl.lib}" includes="jbpm.jar,jbpm-identity.jar"/>
</copy>
<copy todir="${build.resources}/jboss-portal/lib" failonerror="false">
Modified: branches/JBoss_Portal_Branch_2_7/core-cms/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/build.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -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">
+ ]>
<!--+======================================================================+-->
<!--| JBoss Portal (The OpenSource Portal) Build File |-->
@@ -117,8 +117,8 @@
<path refid="trove.trove.classpath"/>
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
- <!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <!-- jbpm integration -->
+ <path refid="jbpm.jpdl.classpath"/>
</path>
<!-- Configure modules -->
@@ -132,7 +132,7 @@
<path refid="jboss.portal-security.classpath"/>
<path refid="jboss.portal-theme.classpath"/>
<path refid="jboss.portal-core.classpath"/>
- <path refid="jboss.portal-workflow.classpath"/>
+ <path refid="jboss.portal-workflow.classpath"/>
<path refid="jboss.portal-core-admin.classpath"/>
</path>
@@ -159,11 +159,11 @@
<path refid="ehcache.ehcache.classpath"/>
<path refid="hibernate.hibernate.classpath"/>
</path>
-
+
<path id="aop.classpath">
<pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
- <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
- <path refid="javassist.javassist.classpath"/>
+ <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
+ <path refid="javassist.javassist.classpath"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="trove.trove.classpath"/>
<path refid="qdox.qdox.classpath"/>
@@ -177,16 +177,16 @@
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"
- classname="org.jboss.portal.common.ant.Explode"
- classpathref="explode.task.classpath"/>
+ <taskdef
+ name="explode"
+ classname="org.jboss.portal.common.ant.Explode"
+ classpathref="explode.task.classpath"/>
</target>
<!--+====================================================================+-->
@@ -213,23 +213,23 @@
<!--| the output which is ment to be released or used by external |-->
<!--| modules. |-->
<!--+====================================================================+-->
-
- <target name="explode" depends="init">
- <explode
- file="${build.lib}/portal-cms.sar"
- todir="${build.lib}"
- name="portal-cms-exploded.sar"
- />
- </target>
-
- <target name="explode-ha" depends="init">
- <explode
- file="${build.lib}/portal-cms-ha.sar"
- todir="${build.lib}"
- name="portal-cms-ha-exploded.sar"
- />
+
+ <target name="explode" depends="init">
+ <explode
+ file="${build.lib}/portal-cms.sar"
+ todir="${build.lib}"
+ name="portal-cms-exploded.sar"
+ />
</target>
+ <target name="explode-ha" depends="init">
+ <explode
+ file="${build.lib}/portal-cms-ha.sar"
+ todir="${build.lib}"
+ name="portal-cms-ha-exploded.sar"
+ />
+ </target>
+
<target name="artifacts"
description="Generate all target output."
depends="compile">
@@ -253,13 +253,13 @@
<fileset dir="${jcr.jcr.lib}" includes="jcr-1.0.jar"/>
<fileset dir="${apache.collections.lib}" includes="commons-collections.jar"/>
<fileset dir="${apache.lucene.lib}" includes="lucene.jar"/>
- <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
-
+ <fileset dir="${apache.ant.lib}" includes="ant.jar"/>
+
<!-- cms indexing integration -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-index-filters.jar"/>
<fileset dir="${nekohtml.nekohtml.lib}" includes="nekohtml.jar"/>
-
+
<!-- cms optimization integration - this contains a clustered cache enabled version -->
<fileset dir="${jackrabbit.jackrabbit.lib}" includes="jackrabbit-core.jar"/>
<fileset dir="${jgroups.jgroups.lib}" includes="jgroups.jar"/>
@@ -272,46 +272,46 @@
<fileset dir="${build.resources}/portal-cms-war"/>
</copy>
</target>
-
-
+
+
<!-- Build the portal-cms-ha.sar -->
<target name="output-ha" depends="artifacts">
- <copy todir="${build.resources}/portal-cms-ha.sar">
- <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/>
- </copy>
+ <copy todir="${build.resources}/portal-cms-ha.sar">
+ <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/>
+ </copy>
- <copy todir="${build.resources}/portal-cms-ha.sar">
- <filterset>
- <filtersfile file="../build/etc/clustered.properties"/>
- </filterset>
- <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/>
- </copy>
+ <copy todir="${build.resources}/portal-cms-ha.sar">
+ <filterset>
+ <filtersfile file="../build/etc/clustered.properties"/>
+ </filterset>
+ <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/>
+ </copy>
- <implode
- dir="${build.resources}/portal-cms-ha.sar"
- tofile="${build.lib}/portal-cms-ha.sar"/>
-
- </target>
+ <implode
+ dir="${build.resources}/portal-cms-ha.sar"
+ tofile="${build.lib}/portal-cms-ha.sar"/>
+ </target>
+
<!-- Build the portal-cms.sar -->
<target name="output" depends="artifacts">
- <!-- Build configurations -->
+ <!-- Build configurations -->
<copy todir="${build.resources}/portal-cms.sar">
- <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/>
- </copy>
-
- <copy todir="${build.resources}/portal-cms.sar">
- <filterset>
- <filtersfile file="../build/etc/single.properties"/>
- </filterset>
- <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/>
+ <fileset dir="${build.resources}/portal-cms" excludes="**/*.xml"/>
</copy>
+
+ <copy todir="${build.resources}/portal-cms.sar">
+ <filterset>
+ <filtersfile file="../build/etc/single.properties"/>
+ </filterset>
+ <fileset dir="${build.resources}/portal-cms" includes="**/*.xml"/>
+ </copy>
<!-- Build archives -->
<implode
- dir="${build.resources}/portal-cms.sar"
- tofile="${build.lib}/portal-cms.sar"/>
- </target>
+ dir="${build.resources}/portal-cms.sar"
+ tofile="${build.lib}/portal-cms.sar"/>
+ </target>
<!-- create artifacts for running the portlet tests (except TCK) target output should have already been executed -->
<target name="package-tests" depends="init">
@@ -359,45 +359,45 @@
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<copy file="${build.lib}/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/>
</target>
-
+
<target name="deploy-ha"
description="Deploy high availability."
depends="output-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy file="${build.lib}/portal-cms-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy file="${build.lib}/portal-cms-ha.sar" todir="${jboss.home}/server/${portal-ha.deploy.dir}"/>
</target>
-
- <target name="deploy-explode"
- description="Deploy."
- depends="output,explode">
- <require file="${jboss.home}/server/${portal.deploy.dir}"/>
- <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-cms.sar" overwrite="true">
- <fileset dir="${build.lib}/portal-cms-exploded.sar"/>
- </copy>
- </target>
-
- <target name="deploy-ha-explode" description="Deploy." depends="output-ha,explode-ha">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar/portal-cms-ha.sar" overwrite="true">
- <fileset dir="${build.lib}/portal-cms-ha-exploded.sar"/>
- </copy>
- </target>
-
+
+ <target name="deploy-explode"
+ description="Deploy."
+ depends="output,explode">
+ <require file="${jboss.home}/server/${portal.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar/portal-cms.sar" overwrite="true">
+ <fileset dir="${build.lib}/portal-cms-exploded.sar"/>
+ </copy>
+ </target>
+
+ <target name="deploy-ha-explode" description="Deploy." depends="output-ha,explode-ha">
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <copy todir="${jboss.home}/server/${portal-ha.deploy.dir}/jboss-portal-ha.sar/portal-cms-ha.sar" overwrite="true">
+ <fileset dir="${build.lib}/portal-cms-ha-exploded.sar"/>
+ </copy>
+ </target>
+
<!--
- | Undeploy the application
- -->
+ | Undeploy the application
+ -->
<target name="undeploy"
description="Undeploy."
depends="init">
<require file="${jboss.home}/server/${portal.deploy.dir}"/>
<delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cms.sar"/>
</target>
-
+
<target name="undeploy-ha"
description="Undeploy."
depends="init">
- <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
- <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-cms-ha.sar"/>
+ <require file="${jboss.home}/server/${portal-ha.deploy.dir}"/>
+ <delete file="${jboss.home}/server/${portal-ha.deploy.dir}/portal-cms-ha.sar"/>
</target>
<target name="tests" depends="init, _buildmagic:configure:deployment">
Modified: branches/JBoss_Portal_Branch_2_7/core-management/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/core-management/build.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -116,7 +116,7 @@
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
- <path refid="jbpm.jaronly.classpath"/>
+ <path refid="jbpm.jpdl.classpath"/>
</path>
<!-- Configure modules -->
Modified: branches/JBoss_Portal_Branch_2_7/workflow/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/workflow/build.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/workflow/build.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -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$ -->
@@ -89,25 +89,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.jpdl.classpath"/>
</path>
-
-
+
<path id="javac.classpath">
<pathelement location="${build.classes}"/>
</path>
@@ -117,8 +116,8 @@
<!-- 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>
@@ -135,29 +134,29 @@
<!--+=======================================+-->
<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"/>
+ </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 |-->
<!--| |-->
@@ -185,11 +184,11 @@
<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 +202,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 +211,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,18 +225,18 @@
<!--
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 -->
@@ -272,30 +271,30 @@
<!-- ================================================================== -->
<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"/>
+ <path refid="jbpm.jpdl.classpath"/>
+ <pathelement location="${build.lib}/portal-workflow-lib.jar"/>
+ <pathelement location="${build.resources}/test"/>
</x-classpath>
</execute-tests>
</target>
Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/service/JbpmThreadService.java 2008-06-18 22:01:58 UTC (rev 11086)
@@ -23,8 +23,10 @@
package org.jboss.portal.workflow.service;
import org.jbpm.JbpmConfiguration;
+/*
import org.jbpm.msg.command.CommandExecutorThread;
import org.jbpm.scheduler.impl.SchedulerThread;
+*/
/**
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
@@ -39,14 +41,17 @@
private WorkflowService workflowService = null;
- private CommandExecutorThread commandExecutorThread = null;
+ /*private CommandExecutorThread commandExecutorThread = null;
- private SchedulerThread schedulerThread = null;
+ private SchedulerThread schedulerThread = null;*/
public void start()
{
JbpmConfiguration jbpmConfiguration = workflowService.getJbpmConfiguration();
+ jbpmConfiguration.getJobExecutor().start();
+
+/*
commandExecutorThread = new CommandExecutorThread(jbpmConfiguration);
commandExecutorThread.setPriority(priority);
commandExecutorThread.start();
@@ -54,11 +59,12 @@
schedulerThread = new SchedulerThread(jbpmConfiguration);
schedulerThread.setPriority(priority);
schedulerThread.setInterval(schedulerInterval);
- schedulerThread.start();
+ schedulerThread.start();*/
}
public void stop()
{
+ workflowService.getJbpmConfiguration().getJobExecutor().stop();
}
public int getSchedulerInterval()
Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/workflow/src/main/org/jboss/portal/workflow/test/PortalCMSPublish.java 2008-06-18 22:01:58 UTC (rev 11086)
@@ -220,31 +220,30 @@
}
//here act as an Admin and approve/reject one of the tasks
- Collection allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
+ Collection<TaskInstance> allTasks = processInstance.getTaskMgmtInstance().getTaskInstances();
String[] transitions = {"approval", "rejection"};
java.util.Random random = new java.util.Random(12343);
boolean markedForRejection = false;
- for (Iterator itr = allTasks.iterator(); itr.hasNext();)
+ for (TaskInstance task : allTasks)
{
- TaskInstance cour = (TaskInstance)itr.next();
if (markedForRejection)
{
- cour.end(transitions[1]);
+ task.end(transitions[1]);
continue;
}
- if (cour.getActorId().equals(manager))
+ if (task.getActorId().equals(manager))
{
- System.out.println("Manager=" + cour.getActorId() + "(" + processId + ")");
+ System.out.println("Manager=" + task.getActorId() + "(" + processId + ")");
int randomIndex = Math.abs(random.nextInt() % 2);
if (randomIndex == 1)
{
//kill this task
markedForRejection = true;
- cour.end(transitions[randomIndex]);
+ task.end(transitions[randomIndex]);
}
else
{
- cour.end(transitions[randomIndex]);
+ task.end(transitions[randomIndex]);
break;
}
}
@@ -281,9 +280,11 @@
try
{
String[] managers = {"Admin", "eric.brown(a)jboss.com", "sohil.shah(a)jboss.com"};
- for (int i = 0; i < managers.length; i++)
+ int i = 0;
+ while (i < managers.length)
{
executeTask(this.path, this.processId, managers[i], this.reject);
+ i++;
}
}
catch (Exception e)
Modified: branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/workflow/src/resources/portal-workflow-sar/META-INF/jboss-service.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -22,54 +22,51 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
<server>
- <!-- Hibernate service -->
- <mbean
- code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
- name="portal:service=Hibernate,type=Workflow"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <!-- Hibernate service -->
+ <mbean code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate,type=Workflow"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
<depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
<attribute name="DoChecking">true</attribute>
<attribute name="ConfigLocation">conf/hibernate/workflow/hibernate.cfg.xml</attribute>
<attribute name="JNDIName">java:/portal/workflow/WorkFlowSessionFactory</attribute>
</mbean>
-
- <mbean
- code="org.jboss.portal.workflow.service.JbpmThreadService"
- name="portal:service=Thread,type=WorkflowService">
- <depends optional-attribute-name="WorkflowService"
- proxy-type="attribute">portal:service=Workflow,type=WorkflowService</depends>
+
+ <mbean code="org.jboss.portal.workflow.service.JbpmThreadService"
+ name="portal:service=Thread,type=WorkflowService">
+ <depends optional-attribute-name="WorkflowService" proxy-type="attribute">
+ portal:service=Workflow,type=WorkflowService
+ </depends>
<attribute name="SchedulerInterval">60000</attribute>
</mbean>
<!-- Workflow service -->
- <mbean
- code="org.jboss.portal.workflow.service.WorkflowServiceImpl"
- name="portal:service=Workflow,type=WorkflowService"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <mbean code="org.jboss.portal.workflow.service.WorkflowServiceImpl"
+ name="portal:service=Workflow,type=WorkflowService"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends>portal:service=Hibernate,type=Workflow</depends>
+ <depends>portal:service=Hibernate,type=Workflow</depends>
<attribute name="JbpmConfigurationXml">
- <![CDATA[
- <jbpm-configuration>
- <jbpm-context>
- <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
- <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
- <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
- </jbpm-context>
- <string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/>
- <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/>
- <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/>
- <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/>
- <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/>
- <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/>
- <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/>
- </jbpm-configuration>
- ]]>
- </attribute>
+ <![CDATA[
+ <jbpm-configuration>
+ <jbpm-context>
+ <service name="persistence" factory="org.jbpm.persistence.db.DbPersistenceServiceFactory" />
+ <service name="scheduler" factory="org.jbpm.scheduler.db.DbSchedulerServiceFactory" />
+ <service name="message" factory="org.jbpm.msg.db.DbMessageServiceFactory" />
+ </jbpm-context>
+ <string name="resource.hibernate.cfg.xml" value="conf/hibernate/workflow/hibernate.cfg.xml"/>
+ <string name="resource.business.calendar" value="org/jbpm/calendar/jbpm.business.calendar.properties"/>
+ <string name="resource.default.modules" value="org/jbpm/graph/def/jbpm.default.modules.properties"/>
+ <string name="resource.converter" value="org/jbpm/db/hibernate/jbpm.converter.properties"/>
+ <string name="resource.action.types" value="org/jbpm/graph/action/action.types.xml"/>
+ <string name="resource.node.types" value="org/jbpm/graph/node/node.types.xml"/>
+ <string name="resource.varmapping" value="org/jbpm/context/exe/jbpm.varmapping.xml"/>
+ </jbpm-configuration>
+ ]]>
+ </attribute>
<attribute name="JNDIName">java:/portal/WorkflowService</attribute>
</mbean>
-
</server>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/build.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/build.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -21,7 +21,12 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!DOCTYPE project [<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"><!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"><!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent"><!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"><!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"><!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">]>
+<!DOCTYPE project [<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
+ <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
+ <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
+ <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
+ <!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">]>
<!-- $Id$ -->
@@ -634,7 +639,7 @@
</target>
<target name="tests-local" depends="clean,output">
- <server:start name="default"/>
+ <!--<server:start name="default"/>-->
<antcall target="agent-deploy"/>
<antcall target="protocolv1-producer-test"/>
<antcall target="protocolv1-consumer-test"/>
@@ -643,7 +648,7 @@
<antcall target="consumer-test"/>
<antcall target="producer-configuration-test"/>
<antcall target="agent-undeploy"/>
- <server:stop name="default"/>
+ <!--<server:stop name="default"/>-->
<antcall target="reports"/>
</target>
Modified: branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-18 20:53:27 UTC (rev 11085)
+++ branches/JBoss_Portal_Branch_2_7/wsrp/src/resources/tests/test-wsrp-producer-sar/META-INF/jboss-service.xml 2008-06-18 22:01:58 UTC (rev 11086)
@@ -97,7 +97,7 @@
name="portal:service=PortletInvoker,type=Stateful" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="PortletInvoker" proxy-type="attribute">
+ <depends optional-attribute-name="Next" proxy-type="attribute">
portal:service=PortletInvoker,type=Container
</depends>
<depends optional-attribute-name="PersistenceManager" proxy-type="attribute">
@@ -111,15 +111,24 @@
</depends>
</mbean>
+ <!--<bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
+ </bean>
+ <mbean code="org.jboss.portal.portlet.container.ContainerPortletDispatcher"
+ name="portal:service=Dispatcher,type=Portlet,name=ContainerPortlet" xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ </mbean>-->
+
+
<!-- The portlet container invoker -->
<mbean code="org.jboss.portal.portlet.container.ContainerPortletInvoker"
name="portal:service=PortletInvoker,type=Container" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="StackFactory" proxy-type="attribute">
- portal:service=InterceptorStackFactory,type=Container
+ <depends optional-attribute-name="Next" proxy-type="attribute">
+ portal:service=Interceptor,type=Portlet,name=ContextDispatcher
</depends>
- <!--<depends optional-attribute-name="Registry" proxy-type="attribute">portal:service=WebAppRegistry</depends>-->
+ <depends>portal:service=InterceptorStackFactory,type=Container</depends>
</mbean>
<!-- Registration manager -->
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11085 - in branches/JBoss_Portal_Branch_2_7: core-admin/src/resources/portal-admin-war/WEB-INF/tags and 2 other directories.
by portal-commits＠lists.jboss.org
Author: wesleyhales
Date: 2008-06-18 16:53:27 -0400 (Wed, 18 Jun 2008)
New Revision: 11085
Added:
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.gif
Removed:
branches/JBoss_Portal_Branch_2_7/core-admin/src/bin/portal-admin-war/img/corners/
Modified:
branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html
Log:
cms front page touch up
Modified: branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2008-06-18 20:32:29 UTC (rev 11084)
+++ branches/JBoss_Portal_Branch_2_7/core-admin/src/resources/portal-admin-war/WEB-INF/tags/boxes.xhtml 2008-06-18 20:53:27 UTC (rev 11085)
@@ -5,19 +5,19 @@
<div class="#{class == null ? 'greyRounded' : class}">
<div class="box-header">
- <h:graphicImage url="/img/corners/7px/corner-left-top-grey.gif" alt="" styleClass="img-top-left"/>
+ <img src="/portal-core/images/corners/7px/corner-left-top-grey.gif" alt="" class="img-top-left"/>
<div class="box-header-content">
</div>
- <h:graphicImage url="/img/corners/7px/corner-right-top-grey.gif" alt="" styleClass="img-top-right"/>
+ <img src="/portal-core/images/corners/7px/corner-right-top-grey.gif" alt="" class="img-top-right"/>
</div>
<div class="box-content">
<ui:insert/>
</div>
<div class="box-footer">
- <h:graphicImage url="/img/corners/7px/corner-left-bottom-white.gif" alt="" styleClass="img-bottom-left"/>
+ <img src="/portal-core/images/corners/7px/corner-left-bottom-white.gif" alt="" class="img-bottom-left"/>
<div class="box-footer-content">
</div>
- <h:graphicImage url="/img/corners/7px/corner-right-bottom-white.gif" alt="" styleClass="img-bottom-right"/>
+ <img src="/portal-core/images/corners/7px/corner-right-bottom-white.gif" alt="" class="img-bottom-right"/>
</div>
</div>
Added: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.gif
===================================================================
(Binary files differ)
Property changes on: branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/images/info-banner.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
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-18 20:32:29 UTC (rev 11084)
+++ branches/JBoss_Portal_Branch_2_7/core-cms/src/bin/portal-cms-sar/portal/cms/conf/default-content/default/index.html 2008-06-18 20:53:27 UTC (rev 11085)
@@ -8,8 +8,7 @@
}
#welcomegreybox {
- width: 674px;
- text-align: center;
+ width: 626px;
}
.welcomegreyboxTD {
@@ -123,91 +122,23 @@
.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!"/>
</div>
-
+<br/>
<div id="welcomegreybox">
- <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>
-
- <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>
-
- <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.</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"/>
+ <img src="default/images/info-banner.gif" width="626" height="73" border="0" usemap="#Map" style="margin:0 0 0 7px">
+ <map name="Map">
+ <area shape="rect" coords="1,1,201,72" href="/portal/content/default/support.html">
+ <area shape="rect" coords="201,0,439,73" href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=215">
+ <area shape="rect" coords="439,1,626,73" href="/portal/content/default/project.html">
+ </map>
</div>
- <br style="clear:left"/>
+<br/>
-<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">
+ <!--<div class="box-content" style="width:624px">
<img src="default/images/homeimg_jbosslogo.png" alt="JBoss, a division of Red Hat" width="143" class="welcomelogo"
height="64" align="left"/>
@@ -222,12 +153,7 @@
<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>
+ </div>-->
+
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11084 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-18 16:32:29 -0400 (Wed, 18 Jun 2008)
New Revision: 11084
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
Log:
oups
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-18 18:23:17 UTC (rev 11083)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-core-sar/META-INF/jboss-service.xml 2008-06-18 20:32:29 UTC (rev 11084)
@@ -332,8 +332,7 @@
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
</mbean>
- <bean name="PortletContainerDispatcher" class="org.jboss.portal.portlet.container.ContainerPortletDispatcher">
- </bean>
+
<mbean code="org.jboss.portal.portlet.container.ContainerPortletDispatcher"
name="portal:service=Dispatcher,type=Portlet,name=ContainerPortlet" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11083 - in modules/web/trunk: web and 23 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-06-18 14:23:17 -0400 (Wed, 18 Jun 2008)
New Revision: 11083
Added:
modules/web/trunk/web/src/test/resources/config/jetty/
modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml
modules/web/trunk/web/src/test/resources/config/jetty/realm.properties
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml
modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml
modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml
modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties
modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml
Modified:
modules/web/trunk/build/pom.xml
modules/web/trunk/web/pom.xml
modules/web/trunk/web/src/test/build.xml
modules/web/trunk/web/src/test/resources/config/servers.xml
Log:
Update to use Cargo 1.0-alpha-3.
Add generic support for Jetty.
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
+++ modules/web/trunk/build/pom.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -28,16 +28,18 @@
<version.concurrent>1.3.4</version.concurrent>
<version.sun.servlet>2.4</version.sun.servlet>
<version.apache.tomcat>5.5.12</version.apache.tomcat>
+ <version.jetty>6.1.7</version.jetty>
+ <version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.apache.log4j>1.2.14</version.apache.log4j>
- <version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.0-SNAPSHOT</version.jboss.portal.common>
- <version.jboss.unit>1.2.0.Beta2</version.jboss.unit>
+ <version.jboss.portal.common>1.2.0</version.jboss.portal.common>
+ <version.jboss.unit>1.2.0-SNAPSHOT</version.jboss.unit>
+ <version.jboss-reflect>2.0.0.Beta12</version.jboss-reflect>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
- <version.cargo>0.9-portal</version.cargo>
+ <version.cargo>1.0-alpha-3</version.cargo>
<version.junit>3.8.1</version.junit>
<version.ant>1.7.0</version.ant>
</properties>
@@ -106,6 +108,16 @@
<version>${version.apache.tomcat}</version>
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ <version>${version.jetty}</version>
+ </dependency>
+ <dependency>
+ <groupId>concurrent</groupId>
+ <artifactId>concurrent</artifactId>
+ <version>${version.concurrent}</version>
+ </dependency>
+ <dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
<version>${version.apache.log4j}</version>
@@ -160,6 +172,17 @@
</dependency>
<dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.jboss-reflect}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.jboss.microcontainer}</version>
+ </dependency>
+
+ <dependency>
<groupId>concurrent</groupId>
<artifactId>concurrent</artifactId>
<version>${version.concurrent}</version>
@@ -181,13 +204,29 @@
<version>${version.apache.commons-httpclient}</version>
</dependency>
<dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.0-FCS</version>
+ </dependency>
+ <dependency>
+ <groupId>saxpath</groupId>
+ <artifactId>saxpath</artifactId>
+ <version>1.0-FCS</version>
+ </dependency>
+ <dependency>
<groupId>cargo</groupId>
<artifactId>cargo-manager</artifactId>
<type>war</type>
+ <version>0.9-portal</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-jetty-deployer</artifactId>
+ <type>war</type>
<version>${version.cargo}</version>
</dependency>
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
Modified: modules/web/trunk/web/pom.xml
===================================================================
--- modules/web/trunk/web/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
+++ modules/web/trunk/web/pom.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -37,11 +37,14 @@
<artifactId>catalina</artifactId>
</dependency>
<dependency>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty</artifactId>
+ </dependency>
+ <dependency>
<groupId>apache-log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
-
<!-- SCOPE TEST -->
<dependency>
<groupId>concurrent</groupId>
@@ -103,6 +106,16 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<scope>test</scope>
@@ -113,11 +126,30 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>saxpath</groupId>
+ <artifactId>saxpath</artifactId>
+ </dependency>
+ <dependency>
<groupId>cargo</groupId>
<artifactId>cargo-manager</artifactId>
<type>war</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-jetty-deployer</artifactId>
+ <type>war</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
+ <version>${version.cargo}</version>
+ </dependency>
</dependencies>
<build>
@@ -136,12 +168,18 @@
<!--stuff to run servers for tests-->
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
<version>${version.cargo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
<scope>test</scope>
@@ -197,6 +235,9 @@
<property name="dependency.xml-apis.jar" value="${maven.dependency.apache-xerces.xml-apis.jar.path}"/>
<property name="dependency.jbossxb.jar" value="${maven.dependency.org.jboss.jbossxb.jar.path}"/>
+ <!-- Cargo Jetty deployer -->
+ <property name="dependency.cargo.jetty-deployer" value="${maven.dependency.org.codehaus.cargo.cargo-jetty-deployer.war.path}"/>
+
<ant antfile="${basedir}/src/test/build.xml">
<target name="tests"/>
</ant>
Modified: modules/web/trunk/web/src/test/build.xml
===================================================================
--- modules/web/trunk/web/src/test/build.xml 2008-06-18 17:07:29 UTC (rev 11082)
+++ modules/web/trunk/web/src/test/build.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -21,7 +21,9 @@
<target name="tests.call.all" unless="tests">
<antcall target="tests.jboss"/>
+<!-- <antcall target="tests.jboss5"/> -->
<antcall target="tests.tomcat"/>
+ <antcall target="tests.jetty"/>
</target>
<target name="tests.call.single" if="tests">
@@ -32,9 +34,15 @@
<target name="tests.jboss">
<antcall target="tests.jboss-4.2"/>
</target>
+<!-- <target name="tests.jboss5">
+ <antcall target="tests.jboss-5.0"/>
+ </target> -->
<target name="tests.tomcat">
<antcall target="tests.tomcat-6.0"/>
</target>
+ <target name="tests.jetty">
+ <antcall target="tests.jetty-6"/>
+ </target>
<target name="prepare_env">
@@ -79,6 +87,14 @@
</not>
</and>
</condition>
+<!-- <condition property="JBOSS_5_0_HOME" value="${env.JBOSS_5_0_HOME}">
+ <and>
+ <isset property="env.JBOSS_5_0_HOME"/>
+ <not>
+ <isset property="JBOSS_5_0_HOME"/>
+ </not>
+ </and>
+ </condition> -->
<condition property="TOMCAT_6_0_HOME" value="${env.TOMCAT_6_0_HOME}">
<and>
<isset property="env.TOMCAT_6_0_HOME"/>
@@ -87,6 +103,14 @@
</not>
</and>
</condition>
+ <condition property="JETTY_6_1_HOME" value="${env.JETTY_6_1_HOME}">
+ <and>
+ <isset property="env.JETTY_6_1_HOME"/>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
<fail message="Please set the environment variable JBOSS_4_2_0_HOME or JBOSS_4_2_1_HOME or JBOSS_4_2_2_HOME">
<condition>
@@ -104,6 +128,16 @@
</condition>
</fail>
+<!-- <fail message="Please set the environment variable JBOSS_5_0_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JBOSS_5_0_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail> -->
+
<fail message="Please set the environment variable TOMCAT_6_0_HOME">
<condition>
<and>
@@ -114,6 +148,17 @@
</condition>
</fail>
+ <fail message="Please set the environment variable JETTY_6_1_HOME">
+ <condition>
+ <and>
+ <not>
+ <isset property="JETTY_6_1_HOME"/>
+ </not>
+ </and>
+ </condition>
+ </fail>
+
+
</target>
<target name="package-tests">
@@ -166,6 +211,12 @@
<path location="${target}/web-web-${project.version}.jar"/>
</path>
+<!-- <path id="jboss-5.0">
+ <path refid="portal-common"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ </path> -->
+
<path id="tomcat-6.0">
<path refid="portal-common"/>
<path refid="jboss-unit"/>
@@ -186,6 +237,12 @@
<path location="${target}/web-web-${project.version}.jar"/>
</path>
+ <path id="jetty-6.1">
+ <path refid="portal-common"/>
+ <path refid="jboss-unit"/>
+ <path refid="jboss-microcontainer"/>
+ </path>
+
<!-- SPI Test case-->
<mkdir dir="${test.temp.lib}"/>
@@ -249,6 +306,36 @@
<fileset dir="${target}/test-classes/spi/generic/app-war"/>
</jar>
+ <!-- **************************** -->
+ <!-- Jetty 6.1 container servlet -->
+ <!-- **************************** -->
+
+ <copy todir="${test.support}/jetty-6.1-container-servlet/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jetty-6.1"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jetty-6.1-container-servlet"/>
+
+ <!-- **************************** -->
+ <!-- Jetty 6.1 lifecyle listener -->
+ <!-- **************************** -->
+
+
+ <copy todir="${test.support}/jetty-6.1-lifecycle-listener/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jetty-6.1"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jetty-6.1-lifecycle-listener"/>
+
+ <!-- ****************** -->
+ <!-- Jetty 6.1 generic -->
+ <!-- ****************** -->
+
+ <!-- -->
+ <mkdir dir="${test.support}/jetty-6.1-generic/server-war/WEB-INF/lib"/>
+ <copy todir="${test.support}/jetty-6.1-generic/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jetty-6.1"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jetty-6.1-generic"/>
+
<!-- *************************** -->
<!-- JBoss 4.2 container servlet -->
<!-- *************************** -->
@@ -283,7 +370,7 @@
<fileset dir="${target}/test-classes/spi/generic/app-war"/>
</jar>
- <!--endpoint test case-->
+ <!--endpoint test case-->
<jar jarfile="${test.temp.lib}/portal-test-endpoint-lib.jar">
<fileset dir="${target}/test-classes/">
@@ -295,6 +382,47 @@
<fileset dir="${target}/test-classes/portal-test-endpoint-jar"/>
</jar>
+ <!-- *************************** -->
+ <!-- JBoss 5.0 container servlet -->
+ <!-- *************************** -->
+
+ <!--
+ <copy todir="${test.support}/jboss-5.0-container-servlet/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jboss-5.0-container-servlet"/>
+ -->
+
+ <!-- ***************** -->
+ <!-- JBoss 5.0 generic -->
+ <!-- ***************** -->
+
+ <!--
+ <copy todir="${test.support}/jboss-5.0-generic/server-war/WEB-INF/lib" flatten="true">
+ <path refid="jboss-5.0"/>
+ </copy>
+ <mkdir dir="${test.temp.lib}/jboss-5.0-generic"/>
+
+ <war jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-server.war">
+ <fileset dir="${test.support}/jboss-5.0-container-servlet/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/app-war"/>
+ </jar>
+ <war jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-server.war">
+ <fileset dir="${test.support}/jboss-5.0-generic/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/jboss-5.0-generic/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/generic/app-war"/>
+ </jar>
+ <war jarfile="${test.temp.lib}/jboss-5.0-container-servlet/test-request-server.war">
+ <fileset dir="${test.support}/jboss-5.0-container-servlet/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-request-lib.jar"/>
+ </war>
+ -->
+
<!-- ********** -->
<!-- Tomcat 6.0 -->
<!-- ********** -->
@@ -326,6 +454,31 @@
</war>
<!-- ********* -->
+ <!-- JETTY 6.1 -->
+ <!-- ********* -->
+ <war jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-server.war">
+ <fileset dir="${test.support}/jetty-6.1-container-servlet/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/app-war"/>
+ </jar>
+ <jar jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/app-war"/>
+ </jar>
+ <war jarfile="${test.temp.lib}/jetty-6.1-generic/test-spi-server.war">
+ <fileset dir="${test.support}/jetty-6.1-generic/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-spi-lib.jar"/>
+ </war>
+ <jar jarfile="${test.temp.lib}/jetty-6.1-generic/test-spi-app.war">
+ <fileset dir="${target}/test-classes/spi/generic/app-war"/>
+ </jar>
+ <war jarfile="${test.temp.lib}/jetty-6.1-container-servlet/test-request-server.war">
+ <fileset dir="${test.support}/jetty-6.1-container-servlet/server-war"/>
+ <lib dir="${test.temp.lib}" includes="portal-test-request-lib.jar"/>
+ </war>
+
+ <!-- ********* -->
<!-- JBoss 4.2 -->
<!-- ********* -->
@@ -338,7 +491,7 @@
<fileset dir="${test.support}/jboss-4.2-endpoint/default-servlet-mapping-war"/>
<lib dir="${test.temp.lib}" includes="portal-test-endpoint-lib.jar"/>
</war>
-
+
<copy todir="${test.support}/jboss-4.2-endpoint/path-mapping-war/WEB-INF/lib" flatten="true">
<path refid="jboss-4.2"/>
</copy>
@@ -392,6 +545,8 @@
</sharedClasspath>
<configuration>
+ <property name="cargo.rmi.port" value="1299"/>
+ <property name="cargo.jboss.server.xml" value="/tmp/server.xml"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<deployable type="war" file="${cargo.war}"/>
@@ -406,7 +561,7 @@
log="${cargo.log.dir}/cargo.${test.id}.startup.log"
action="stop">
<configuration>
- <property name="cargo.rmi.port" value="1099"/>
+ <property name="cargo.rmi.port" value="1299"/>
</configuration>
</cargo>
</target>
@@ -497,14 +652,100 @@
<param name="test.jboss-4.2.name" value="RemoteJBoss_4_2_2"/>
<param name="test.jboss-4.2.home" value="${JBOSS_4_2_2_HOME}"/>
</antcall>
+ </target>
+<!-- <target name="cargo.jboss-5.0.start" depends="cargo.setup">
+ <cargo
+ containerId="jboss5x"
+ home="${test.jboss-5.0.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ action="start"
+ wait="${cargo.wait}">
+ <sharedClasspath>
+ <path location="${dependency.portal-common.jar}"/>
+ <path location="${dependency.jboss-unit.jar}"/>
+ <path location="${dependency.jboss-unit-remote.jar}"/>
+ <path location="${target}/web-web-${project.version}.jar"/>
+
+ </sharedClasspath>
+ <configuration>
+ <property name="cargo.rmi.port" value="1299"/>
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <deployable type="war" file="${test.spi.server.path}"/>
+ </configuration>
+ </cargo>
</target>
+ <target name="cargo.jboss-5.0.stop" depends="cargo.setup">
+ <cargo
+ containerId="jboss5x"
+ home="${test.jboss-5.0.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.startup.log"
+ action="stop">
+ <configuration>
+ <property name="cargo.rmi.port" value="1299"/>
+ </configuration>
+ </cargo>
+ </target>
+ <target name="tests.jboss-5.0.container-servlet" if="${test.jboss-5.0.home.variable-name}">
+ <echo message="Starting JBoss 5.0 container-servlet tests with ${test.jboss-5.0.home}"/>
+ <antcall target="cargo.jboss-5.0.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="test.spi.server.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.remote.server.name" value="${test.jboss-5.0.name}"/>
+ <param name="test.remote.archive.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="cargo.jboss-5.0.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.jboss-5.0.generic" if="${test.jboss-5.0.home.variable-name}">
+ <echo message="Starting JBoss 5.0 generic tests with ${test.jboss-5.0.home}"/>
+ <antcall target="cargo.jboss-5.0.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="test.spi.server.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.remote.server.name" value="${test.jboss-5.0.name}"/>
+ <param name="test.remote.archive.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="cargo.jboss-5.0.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.jboss-5.0">
+ <antcall target="tests.jboss-5.0.container-servlet">
+ <param name="test.id" value="JBoss-5_0-spi-container-servlet"/>
+ <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
+ <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/>
+ <param name="test.archive.path" value="jboss-5.0-container-servlet/test-spi-server.war"/>
+ </antcall>
+ <antcall target="tests.jboss-5.0.generic">
+ <param name="test.id" value="JBoss-5_0-spi-generic"/>
+ <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
+ <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/>
+ <param name="test.archive.path" value="jboss-5.0-generic/test-spi-server.war"/>
+ </antcall>
+ <antcall target="tests.jboss-5.0.container-servlet">
+ <param name="test.id" value="JBoss-5_0-request-container-servlet"/>
+ <param name="test.jboss-5.0.name" value="RemoteJBoss_5_0"/>
+ <param name="test.jboss-5.0.home" value="${JBOSS_5_0_HOME}"/>
+ <param name="test.jboss-5.0.home.variable-name" value="JBOSS_5_0_HOME"/>
+ <param name="test.archive.path" value="jboss-5.0-container-servlet/test-request-server.war"/>
+ </antcall>
+ </target> -->
+
<target name="cargo.tomcat-6.0.start" depends="cargo.setup">
<cargo
- containerId="tomcat5x"
+ containerId="tomcat6x"
home="${test.tomcat-6.0.home}"
output="${cargo.log.dir}/cargo.${test.id}.server.log"
log="${cargo.log.dir}/cargo.${test.id}.start.log"
@@ -518,7 +759,9 @@
<configuration>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
+ <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8222"/>
<!--<property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000"/>-->
+
<deployable type="war" file="${test.temp.lib}/manager.war"/>
<deployable type="war" file="${cargo.war}"/>
</configuration>
@@ -527,7 +770,7 @@
<target name="cargo.tomcat-6.0.stop" depends="cargo.setup">
<cargo
- containerId="tomcat5x"
+ containerId="tomcat6x"
home="${test.tomcat-6.0.home}"
log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
action="stop">
@@ -591,10 +834,114 @@
</antcall>
</target>
+ <target name="cargo.jetty-6.start" depends="cargo.setup">
+ <cargo
+ containerId="jetty6x"
+ home="${test.jetty-6.home}"
+ output="${cargo.log.dir}/cargo.${test.id}.server.log"
+ log="${cargo.log.dir}/cargo.${test.id}.start.log"
+ action="start"
+ wait="${cargo.wait}">
+ <extraClasspath>
+ <path location="${dependency.portal-common-common.jar}"/>
+ <path location="${dependency.jboss-unit.jar}"/>
+ <path location="${dependency.jboss-unit-remote.jar}"/>
+ <path location="${target}/web-web-${project.version}.jar"/>
+
+ <path location="${dependency.log4j.jar}"/>
+ <path location="${dependency.concurrent.jar}"/>
+ <path location="${dependency.portal-common.jar}"/>
+ <path location="${dependency.activation.jar}"/>
+ <path location="${dependency.junit.jar}"/>
+ <path location="${dependency.jboss-logging-spi.jar}"/>
+
+ <path location="${target}/web-web-${project.version}.jar"/>
+
+ </extraClasspath>
+ <configuration>
+ <property name="cargo.servlet.port" value="8080"/>
+ <property name="cargo.logging" value="high"/>
+ <property name="cargo.jvmargs" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=8222"/>
+ <!-- overwrite these files to give jetty the propery security setup -->
+ <configfile file="${basedir}/src/test/resources/config/jetty/jetty.xml" todir="etc"/>
+ <configfile file="${basedir}/src/test/resources/config/jetty/realm.properties" todir="etc"/>
+ <deployable type="war" file="${cargo.war}"/>
+ <deployable type="war" file="${dependency.cargo.jetty-deployer}">
+ <property name="context" value="cargo-jetty-deployer"/>
+ </deployable>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="cargo.jetty-6.stop" depends="cargo.setup">
+ <cargo
+ containerId="jetty6x"
+ home="${test.jetty-6.home}"
+ log="${cargo.log.dir}/cargo.${test.id}.shutdown.log"
+ action="stop">
+ <configuration>
+ </configuration>
+ </cargo>
+ </target>
+
+ <target name="tests.jetty-6.container-servlet" if="${test.jetty-6.home.variable-name}">
+ <echo message="Starting Jetty 6 container-servlet tests with ${test.jetty-6.home}"/>
+ <antcall target="cargo.jetty-6.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="test.spi.server.path" value="${test.archive.path}"/>
+ <param name="cargo.war" value="${test.war}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.remote.server.name" value="${test.jetty-6.name}"/>
+ <param name="test.remote.archive.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="cargo.jetty-6.stop">
+ </antcall>
+ </target>
+
+
+ <target name="tests.jetty-6.generic" if="${test.jetty-6.home.variable-name}">
+ <fail unless="test.jetty-6.home" message="Please set the environment variable JETTY_6_1_HOME"/>
+ <echo message="Starting Jetty 6 generic tests with ${test.jetty-6.home}"/>
+ <antcall target="cargo.jetty-6.start">
+ <param name="cargo.wait" value="false"/>
+ <param name="cargo.war" value="${test.war}"/>
+ </antcall>
+ <antcall target="tests.remote">
+ <param name="test.remote.server.name" value="${test.jetty-6.name}"/>
+ <param name="test.remote.archive.path" value="${test.archive.path}"/>
+ </antcall>
+ <antcall target="cargo.jetty-6.stop">
+ </antcall>
+ </target>
+
+ <target name="tests.jetty-6">
+<!-- <antcall target="tests.jetty-6.container-servlet">
+ <param name="test.id" value="Jetty-6_1-spi-container-servlet"/>
+ <param name="test.jetty-6.name" value="RemoteJetty_6_1"/>
+ <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/>
+ <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/>
+ <param name="test.archive.path" value="${test.temp.lib}/jetty-6.1-container-servlet/test-spi-server.war"/>
+ </antcall> -->
+ <antcall target="tests.jetty-6.generic">
+ <param name="test.id" value="Jetty-6_1-spi-generic"/>
+ <param name="test.jetty-6.name" value="RemoteJetty_6_1"/>
+ <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/>
+ <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/>
+ <param name="test.war" value="${test.temp.lib}/jetty-6.1-generic/test-spi-server.war"/>
+ <param name="test.archive.path" value="jetty-6.1-generic"/>
+ </antcall>
+<!-- <antcall target="tests.jetty-6.container-servlet">
+ <param name="test.id" value="Jetty-6_0-request-container-servlet"/>
+ <param name="test.jetty-6.name" value="RemoteJetty_6_1"/>
+ <param name="test.jetty-6.home" value="${JETTY_6_1_HOME}"/>
+ <param name="test.jetty-6.home.variable-name" value="JETTY_6_1_HOME"/>
+ <param name="test.archive.path" value="jetty-6.1-container-servlet/test-request-server.war"/>
+ </antcall> -->
+ </target>
+
<target name="tests.tomcat-6.0">
-
<!-- spi tests -->
-
<antcall target="tests.tomcat-6.0.spi">
<param name="test.tomcat-6.0.name" value="RemoteTomcat_6_0"/>
<param name="test.tomcat-6.0.home" value="${TOMCAT_6_0_HOME}"/>
@@ -637,6 +984,8 @@
<target name="tests.remote">
+ <echo message="test.temp.lib : ${test.temp.lib}"/>
+ <echo message="test.remote.archive.path : ${test.remote.archive.path}"/>
<taskdef name="jboss-unit" classname="org.jboss.unit.tooling.ant.JBossUnitTask" classpath="${plugin_classpath}"/>
Added: modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/config/jetty/jetty.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,195 @@
+<?xml version="1.0"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+
+<!-- =============================================================== -->
+<!-- Configure the Jetty Server -->
+<!-- -->
+<!-- Documentation of this file format can be found at: -->
+<!-- http://docs.codehaus.org/display/JETTY/jetty.xml -->
+<!-- -->
+<!-- =============================================================== -->
+
+<Configure id="Server" class="org.mortbay.jetty.Server">
+
+ <!-- =========================================================== -->
+ <!-- Server Thread Pool -->
+ <!-- =========================================================== -->
+ <Set name="ThreadPool">
+ <!-- Default bounded blocking threadpool
+ -->
+ <New class="org.mortbay.thread.BoundedThreadPool">
+ <Set name="minThreads">10</Set>
+ <Set name="lowThreads">50</Set>
+ <Set name="maxThreads">250</Set>
+ </New>
+
+ <!-- Optional Java 5 bounded threadpool with job queue
+ <New class="org.mortbay.thread.concurrent.ThreadPool">
+ <Arg type="int">0</Arg>
+ <Set name="corePoolSize">10</Set>
+ <Set name="maximumPoolSize">250</Set>
+ </New>
+ -->
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Set connectors -->
+ <!-- =========================================================== -->
+ <!-- One of each type! -->
+ <!-- =========================================================== -->
+
+ <!-- Use this connector for many frequently idle connections
+ and for threadless continuations.
+ -->
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.nio.SelectChannelConnector">
+ <Set name="port"><SystemProperty name="jetty.port" default="8080"/></Set>
+ <Set name="maxIdleTime">30000</Set>
+ <Set name="Acceptors">2</Set>
+ <Set name="confidentialPort">8443</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- Use this connector if NIO is not available.
+ <Call name="addConnector">
+ <Arg>
+ <New class="org.mortbay.jetty.bio.SocketConnector">
+ <Set name="port">8081</Set>
+ <Set name="maxIdleTime">50000</Set>
+ <Set name="lowResourceMaxIdleTime">1500</Set>
+ </New>
+ </Arg>
+ </Call>
+ -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+ <!-- To add a HTTPS SSL listener -->
+ <!-- see jetty-ssl.xml to add an ssl connector. use -->
+ <!-- java -jar start.jar etc/jetty.xml etc/jetty-ssl.xml -->
+ <!-- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
+
+ <!-- =========================================================== -->
+ <!-- Set up global session ID manager -->
+ <!-- =========================================================== -->
+ <!--
+ <Set name="sessionIdManager">
+ <New class="org.mortbay.jetty.servlet.HashSessionIdManager">
+ <Set name="workerName">node1</Set>
+ </New>
+ </Set>
+ -->
+
+ <!-- =========================================================== -->
+ <!-- Set handler Collection Structure -->
+ <!-- =========================================================== -->
+ <Set name="handler">
+ <New id="Handlers" class="org.mortbay.jetty.handler.HandlerCollection">
+ <Set name="handlers">
+ <Array type="org.mortbay.jetty.Handler">
+ <Item>
+ <New id="Contexts" class="org.mortbay.jetty.handler.ContextHandlerCollection"/>
+ </Item>
+ <Item>
+ <New id="DefaultHandler" class="org.mortbay.jetty.handler.DefaultHandler"/>
+ </Item>
+ <Item>
+ <New id="RequestLog" class="org.mortbay.jetty.handler.RequestLogHandler"/>
+ </Item>
+ </Array>
+ </Set>
+ </New>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure the context deployer -->
+ <!-- A context deployer will deploy contexts described in -->
+ <!-- configuration files discovered in a directory. -->
+ <!-- The configuration directory can be scanned for hot -->
+ <!-- deployments at the configured scanInterval. -->
+ <!-- -->
+ <!-- This deployer is configured to deploy contexts configured -->
+ <!-- in the $JETTY_HOME/contexts directory -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.ContextDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="configurationDir"><SystemProperty name="config.home" default="."/>/contexts</Set>
+ <Set name="scanInterval">1</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure the webapp deployer. -->
+ <!-- A webapp deployer will deploy standard webapps discovered -->
+ <!-- in a directory at startup, without the need for additional -->
+ <!-- configuration files. It does not support hot deploy or -->
+ <!-- non standard contexts (see ContextDeployer above). -->
+ <!-- -->
+ <!-- This deployer is configured to deploy webapps from the -->
+ <!-- $JETTY_HOME/webapps directory -->
+ <!-- -->
+ <!-- Normally only one type of deployer need be used. -->
+ <!-- -->
+ <!-- =========================================================== -->
+ <Call name="addLifeCycle">
+ <Arg>
+ <New class="org.mortbay.jetty.deployer.WebAppDeployer">
+ <Set name="contexts"><Ref id="Contexts"/></Set>
+ <Set name="webAppDir"><SystemProperty name="config.home" default="."/>/webapps</Set>
+ <Set name="parentLoaderPriority">false</Set>
+ <Set name="extract">true</Set>
+ <Set name="allowDuplicates">false</Set>
+ <Set name="defaultsDescriptor"><SystemProperty name="jetty.home" default="."/>/etc/webdefault.xml</Set>
+ </New>
+ </Arg>
+ </Call>
+
+ <!-- =========================================================== -->
+ <!-- Configure Authentication Realms -->
+ <!-- Realms may be configured for the entire server here, or -->
+ <!-- they can be configured for a specific web app in a context -->
+ <!-- configuration (see $(jetty.home)/contexts/test.xml for an -->
+ <!-- example). -->
+ <!-- =========================================================== -->
+ <Set name="UserRealms">
+ <Array type="org.mortbay.jetty.security.UserRealm">
+ <Item>
+ <New class="org.mortbay.jetty.security.HashUserRealm">
+ <Set name="name">Test Realm</Set>
+ <Set name="config"><SystemProperty name="config.home" default="."/>/etc/realm.properties</Set>
+ </New>
+ </Item>
+ </Array>
+ </Set>
+
+ <!-- =========================================================== -->
+ <!-- Configure Request Log -->
+ <!-- Request logs may be configured for the entire server here, -->
+ <!-- or they can be configured for a specific web app in a -->
+ <!-- contexts configuration (see $(jetty.home)/contexts/test.xml -->
+ <!-- for an example). -->
+ <!-- =========================================================== -->
+ <Ref id="RequestLog">
+ <Set name="requestLog">
+ <New id="RequestLogImpl" class="org.mortbay.jetty.NCSARequestLog">
+ <Arg><SystemProperty name="jetty.logs" default="./logs"/>/yyyy_mm_dd.request.log</Arg>
+ <Set name="retainDays">90</Set>
+ <Set name="append">true</Set>
+ <Set name="extended">false</Set>
+ <Set name="LogTimeZone">GMT</Set>
+ </New>
+ </Set>
+ </Ref>
+
+ <!-- =========================================================== -->
+ <!-- extra options -->
+ <!-- =========================================================== -->
+ <Set name="stopAtShutdown">true</Set>
+ <!-- ensure/prevent Server: header being sent to browsers -->
+ <Set name="sendServerVersion">true</Set>
+
+</Configure>
Added: modules/web/trunk/web/src/test/resources/config/jetty/realm.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/config/jetty/realm.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/config/jetty/realm.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,23 @@
+#
+# This file defines users passwords and roles for a HashUserRealm
+#
+# The format is
+# <username>: <password>[,<rolename> ...]
+#
+# Passwords may be clear text, obfuscated or checksummed. The class
+# org.mortbay.util.Password should be used to generate obfuscated
+# passwords or password checksums
+#
+# If DIGEST Authentication is used, the password must be in a recoverable
+# format, either plain text or OBF:.
+#
+jetty: MD5:164c88b302622e17050af52c89945d44,user
+admin: CRYPT:ad1ks..kc.1Ug,server-administrator,content-administrator,admin
+other: OBF:1xmk1w261u9r1w1c1xmq
+plain: plain
+user: password
+
+admin: admin,manager
+
+# This entry is for digest auth. The credential is a MD5 hash of username:realmname:password
+digest: MD5:6e120743ad67abfbc385bc2bb754e297
Modified: modules/web/trunk/web/src/test/resources/config/servers.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/config/servers.xml 2008-06-18 17:07:29 UTC (rev 11082)
+++ modules/web/trunk/web/src/test/resources/config/servers.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -10,7 +10,7 @@
</service>
<deployer>
<remote>
- <name>tomcat5x</name>
+ <name>tomcat6x</name>
<host>localhost</host>
<port>8080</port>
</remote>
@@ -22,6 +22,28 @@
</node>
</server>
<server>
+ <server-name>RemoteJetty_6_1</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jetty6x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ <authentication>
+ <username>admin</username>
+ <password>admin</password>
+ </authentication>
+ </deployer>
+ </node>
+ </server>
+ <server>
<server-name>RemoteJBoss_4_2_0</server-name>
<node>
<node-id>default</node-id>
@@ -75,4 +97,22 @@
</deployer>
</node>
</server>
+ <server>
+ <server-name>RemoteJBoss_5_0</server-name>
+ <node>
+ <node-id>default</node-id>
+ <service>
+ <service-name>TestDriverServer</service-name>
+ <interface>org.jboss.unit.remote.driver.RemoteTestDriver</interface>
+ <uri>socket://localhost:5400</uri>
+ </service>
+ <deployer>
+ <remote>
+ <name>jboss5x</name>
+ <host>localhost</host>
+ <port>8080</port>
+ </remote>
+ </deployer>
+ </node>
+ </server>
</servers>
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,2 @@
+<Context privileged="true" crossContext="true">
+</Context>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/log4j.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,13 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+log4j.rootCategory=ALL, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/classes/logging.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,13 @@
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = test-spi.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,2 @@
+<Context privileged="true"> <!-- crossContext="true" -->
+</Context>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/jboss-web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+<jboss-web>
+ <class-loading java2ClassLoadingCompliance="false">
+ <loader-repository>test:loader=portlet</loader-repository>
+ </class-loading>
+</jboss-web>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-container-servlet/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,54 @@
+<?xml version="1.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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>org/jboss/portal/test/web/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.jboss.portal.web.impl.tomcat.TC6ContainerServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,2 @@
+<Context crossContext="true">
+</Context>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/jboss-web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE jboss-web PUBLIC
+ "-//JBoss//DTD Web Application 4.2//EN"
+ "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd">
+<jboss-web>
+ <class-loading java2ClassLoadingCompliance="false">
+ <loader-repository>test:loader=portlet</loader-repository>
+ </class-loading>
+</jboss-web>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jboss-5.0-generic/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,58 @@
+<?xml version="1.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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>org/jboss/portal/test/web/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-class>org.jboss.portal.web.impl.generic.PortletContainerBootstrapServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>BootstrapServlet</servlet-name>
+ <url-pattern>/jbossportlet</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,2 @@
+<Context privileged="true" crossContext="true">
+</Context>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/log4j.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,13 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+log4j.rootCategory=ALL, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/classes/logging.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,13 @@
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = test-spi.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/jetty-web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
+<Configure class="org.mortbay.jetty.webapp.WebAppContext">
+
+ <Set name="Handler">
+ <New id="Jetty6Handler" class="org.jboss.portal.web.impl.jetty.Jetty6Handler">
+ </New>
+ </Set>
+</Configure>
+
+
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-container-servlet/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,54 @@
+<?xml version="1.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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>org/jboss/portal/test/web/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>ContainerServlet</servlet-name>
+ <servlet-class>org.jboss.portal.web.impl.jetty.Jetty6ContainerServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>SPITestServlet</servlet-name>
+ <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>SPITestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+</web-app>
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/META-INF/context.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,2 @@
+<Context crossContext="true">
+</Context>
\ No newline at end of file
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/log4j.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,13 @@
+### ====================================================================== ###
+## ##
+## JBoss Bootstrap Log4j Configuration ##
+## ##
+### ====================================================================== ###
+
+log4j.rootCategory=ALL, CONSOLE
+
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.Threshold=DEBUG
+log4j.appender.CONSOLE.Target=System.out
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+log4j.appender.CONSOLE.layout.ConversionPattern=%d{ABSOLUTE} %-5p [%c{1}] %m%n
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/classes/logging.properties 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,13 @@
+handlers = org.apache.juli.FileHandler, java.util.logging.ConsoleHandler
+
+############################################################
+# Handler specific properties.
+# Describes specific configuration info for Handlers.
+############################################################
+
+org.apache.juli.FileHandler.level = FINE
+org.apache.juli.FileHandler.directory = ${catalina.base}/logs
+org.apache.juli.FileHandler.prefix = test-spi.
+
+java.util.logging.ConsoleHandler.level = FINE
+java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
Added: modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml
===================================================================
--- modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml (rev 0)
+++ modules/web/trunk/web/src/test/resources/support/jetty-6.1-generic/server-war/WEB-INF/web.xml 2008-06-18 18:23:17 UTC (rev 11083)
@@ -0,0 +1,58 @@
+<?xml version="1.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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_location</param-name>
+ <param-value>org/jboss/portal/test/web/server-beans.xml</param-value>
+ </context-param>
+ <context-param>
+ <param-name>jboss.portal.mc.beans_resource_type</param-name>
+ <param-value>classloader</param-value>
+ </context-param>
+ <listener>
+ <listener-class>org.jboss.portal.common.mc.bootstrap.WebBootstrap</listener-class>
+ </listener>
+ <servlet>
+ <servlet-name>TestServlet</servlet-name>
+ <servlet-class>org.jboss.portal.test.web.TestServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>BootstrapServlet</servlet-name>
+ <servlet-class>org.jboss.portal.web.impl.generic.PortletContainerBootstrapServlet</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>TestServlet</servlet-name>
+ <url-pattern>/</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>BootstrapServlet</servlet-name>
+ <url-pattern>/jbossportlet</url-pattern>
+ </servlet-mapping>
+</web-app>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11082 - in modules/test/trunk: build and 16 other directories.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-06-18 13:07:29 -0400 (Wed, 18 Jun 2008)
New Revision: 11082
Modified:
modules/test/trunk/build/pom.xml
modules/test/trunk/docs/pom.xml
modules/test/trunk/docs/user-guide/pom.xml
modules/test/trunk/mc/pom.xml
modules/test/trunk/pom.xml
modules/test/trunk/remote/pom.xml
modules/test/trunk/remote/src/test/build.xml
modules/test/trunk/test/agent/pom.xml
modules/test/trunk/test/core/pom.xml
modules/test/trunk/test/generic/pom.xml
modules/test/trunk/test/jboss/pom.xml
modules/test/trunk/test/opends/pom.xml
modules/test/trunk/tooling/ant/pom.xml
modules/test/trunk/tooling/core/pom.xml
modules/test/trunk/tooling/examples/maven2/pom.xml
modules/test/trunk/tooling/maven2/pom.xml
modules/test/trunk/tooling/pom.xml
modules/test/trunk/unit/pom.xml
Log:
Update to use cargo 1.0-alpha-3.
Fix snapshot version to use '-' instead of '.'
Modified: modules/test/trunk/build/pom.xml
===================================================================
--- modules/test/trunk/build/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/build/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>JBoss Portal Test Module</name>
<url>http://www.jboss.com/products/jbossmc</url>
@@ -27,7 +27,7 @@
<properties>
<version.jboss.microcontainer>2.0.0.Beta9</version.jboss.microcontainer>
<version.apache.httpclient>3.0.1</version.apache.httpclient>
- <version.cargo>0.9-portal</version.cargo>
+ <version.cargo>1.0-alpha-3</version.cargo>
<version.sun.opends>legacy</version.sun.opends>
<version.jboss.hibernate>3.2.3.GA</version.jboss.hibernate>
<version.dom4j>1.6.1</version.dom4j>
@@ -80,7 +80,14 @@
<snapshots>
<enabled>true</enabled>
</snapshots>
- </pluginRepository>
+ </pluginRepository>
+ <pluginRepository>
+ <id>java.net maven repository</id>
+ <url>http://download.java.net/maven/2/</url>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ </pluginRepository>
</pluginRepositories>
<build>
@@ -149,8 +156,8 @@
</dependency>
<dependency>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
<dependency>
Modified: modules/test/trunk/docs/pom.xml
===================================================================
--- modules/test/trunk/docs/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/docs/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -4,13 +4,13 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Docs Aggregator</name>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<modules>
Modified: modules/test/trunk/docs/user-guide/pom.xml
===================================================================
--- modules/test/trunk/docs/user-guide/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/docs/user-guide/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -60,7 +60,7 @@
<groupId>org.jboss.unit</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>User_Guide_(${translation})</name>
Modified: modules/test/trunk/mc/pom.xml
===================================================================
--- modules/test/trunk/mc/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/mc/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/pom.xml
===================================================================
--- modules/test/trunk/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Test</name>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/test/trunk/remote/pom.xml
===================================================================
--- modules/test/trunk/remote/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/remote/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -148,15 +148,26 @@
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-ant</artifactId>
<version>${version.cargo}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>ant</groupId>
+ <artifactId>ant</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
- <groupId>cargo</groupId>
+ <groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-core-uberjar</artifactId>
<version>${version.cargo}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.ant</groupId>
+ <artifactId>ant</artifactId>
+ <version>${version.ant}</version>
+ </dependency>
</dependencies>
<executions>
<execution>
Modified: modules/test/trunk/remote/src/test/build.xml
===================================================================
--- modules/test/trunk/remote/src/test/build.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/remote/src/test/build.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -142,6 +142,7 @@
<sharedClasspath>
</sharedClasspath>
<configuration>
+ <property name="cargo.rmi.port" value="1099"/>
<property name="cargo.servlet.port" value="8080"/>
<property name="cargo.logging" value="high"/>
<property name="cargo.jvmargs" value="${cargo.jvmargs.value}"/>
Modified: modules/test/trunk/test/agent/pom.xml
===================================================================
--- modules/test/trunk/test/agent/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/test/agent/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,8 @@
<dependencies>
<dependency>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
@@ -117,4 +117,4 @@
<properties>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: modules/test/trunk/test/core/pom.xml
===================================================================
--- modules/test/trunk/test/core/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/test/core/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,8 @@
<dependencies>
<dependency>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
Modified: modules/test/trunk/test/generic/pom.xml
===================================================================
--- modules/test/trunk/test/generic/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/test/generic/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,8 @@
<dependencies>
<dependency>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
Modified: modules/test/trunk/test/jboss/pom.xml
===================================================================
--- modules/test/trunk/test/jboss/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/test/jboss/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -13,8 +13,8 @@
<dependencies>
<dependency>
- <groupId>cargo</groupId>
- <artifactId>core</artifactId>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-core-uberjar</artifactId>
</dependency>
<dependency>
<groupId>sun-opends</groupId>
Modified: modules/test/trunk/test/opends/pom.xml
===================================================================
--- modules/test/trunk/test/opends/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/test/opends/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -88,4 +88,4 @@
<properties>
</properties>
-</project>
\ No newline at end of file
+</project>
Modified: modules/test/trunk/tooling/ant/pom.xml
===================================================================
--- modules/test/trunk/tooling/ant/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/tooling/ant/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/core/pom.xml
===================================================================
--- modules/test/trunk/tooling/core/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/tooling/core/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/examples/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/examples/maven2/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/tooling/examples/maven2/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -11,7 +11,7 @@
<dependency>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
</dependency>
</dependencies>
@@ -39,7 +39,7 @@
<plugin>
<groupId>org.jboss.unit</groupId>
<artifactId>jboss-unit-tooling-maven2</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<executions>
<execution>
<phase>test</phase>
Modified: modules/test/trunk/tooling/maven2/pom.xml
===================================================================
--- modules/test/trunk/tooling/maven2/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/tooling/maven2/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/test/trunk/tooling/pom.xml
===================================================================
--- modules/test/trunk/tooling/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/tooling/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,10 +11,10 @@
<artifactId>jboss-unit-tooling-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Unit Tooling (aggregator)</name>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<modules>
<module>core</module>
<module>ant</module>
<module>maven2</module>
</modules>
-</project>
\ No newline at end of file
+</project>
Modified: modules/test/trunk/unit/pom.xml
===================================================================
--- modules/test/trunk/unit/pom.xml 2008-06-18 15:02:37 UTC (rev 11081)
+++ modules/test/trunk/unit/pom.xml 2008-06-18 17:07:29 UTC (rev 11082)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.unit</groupId>
<artifactId>module-parent</artifactId>
- <version>1.2.0.SNAPSHOT</version>
+ <version>1.2.0-SNAPSHOT</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11081 - modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-18 11:02:37 -0400 (Wed, 18 Jun 2008)
New Revision: 11081
Modified:
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/EntityType.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/GroupRelationshipType.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/Session.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/User.java
Log:
Remove references to the idm from portal api
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/EntityType.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/EntityType.java 2008-06-18 13:57:20 UTC (rev 11080)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/EntityType.java 2008-06-18 15:02:37 UTC (rev 11081)
@@ -22,9 +22,6 @@
package org.jboss.portal.identity.api;
-import org.jboss.idm.IdentityType;
-import org.jboss.idm.RelationshipType;
-
import java.util.Set;
import java.util.Map;
import java.util.HashMap;
@@ -35,7 +32,7 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-public enum EntityType implements IdentityType
+public enum EntityType
{
// User
USER,
@@ -55,23 +52,23 @@
// Community of users
COMMUNITY;
- private final static Map<IdentityType, Set<RelationshipType>> administrationRelationships = new HashMap<IdentityType, Set<RelationshipType>>();
- private final static Map<IdentityType, Set<RelationshipType>> organizationRelationships = new HashMap<IdentityType, Set<RelationshipType>>();
- private final static Map<IdentityType, Set<RelationshipType>> businessRelationships = new HashMap<IdentityType, Set<RelationshipType>>();
- private final static Map<IdentityType, Set<RelationshipType>> jeeRelationships = new HashMap<IdentityType, Set<RelationshipType>>();
- private final static Map<IdentityType, Set<RelationshipType>> communityRelationships = new HashMap<IdentityType, Set<RelationshipType>>();
+ private final static Map<EntityType, Set<GroupRelationshipType>> administrationRelationships = new HashMap<EntityType, Set<GroupRelationshipType>>();
+ private final static Map<EntityType, Set<GroupRelationshipType>> organizationRelationships = new HashMap<EntityType, Set<GroupRelationshipType>>();
+ private final static Map<EntityType, Set<GroupRelationshipType>> businessRelationships = new HashMap<EntityType, Set<GroupRelationshipType>>();
+ private final static Map<EntityType, Set<GroupRelationshipType>> jeeRelationships = new HashMap<EntityType, Set<GroupRelationshipType>>();
+ private final static Map<EntityType, Set<GroupRelationshipType>> communityRelationships = new HashMap<EntityType, Set<GroupRelationshipType>>();
static
{
- Set<RelationshipType> all = new HashSet<RelationshipType>();
+ Set<GroupRelationshipType> all = new HashSet<GroupRelationshipType>();
all.add(GroupRelationshipType.HIERARCHICAL);
all.add(GroupRelationshipType.IMPLY);
- Set<RelationshipType> imply = new HashSet<RelationshipType>();
+ Set<GroupRelationshipType> imply = new HashSet<GroupRelationshipType>();
imply.add(GroupRelationshipType.IMPLY);
- Set<RelationshipType> hierarchical = new HashSet<RelationshipType>();
+ Set<GroupRelationshipType> hierarchical = new HashSet<GroupRelationshipType>();
hierarchical.add(GroupRelationshipType.HIERARCHICAL);
// USER
@@ -148,9 +145,9 @@
return this.name();
}
- public boolean isRelationshipSupported(IdentityType identityType, RelationshipType relationshipType)
+ public boolean isRelationshipSupported(EntityType identityType, GroupRelationshipType relationshipType)
{
- Set<RelationshipType> relTypes = getRelationships().get(identityType);
+ Set<GroupRelationshipType> relTypes = getRelationships().get(identityType);
if (relTypes != null && relTypes.contains(relationshipType))
{
@@ -160,17 +157,17 @@
return false;
}
- public Set<IdentityType> getSupportedIdentities(RelationshipType relationshipType)
+ public Set<EntityType> getSupportedIdentities(GroupRelationshipType relationshipType)
{
return getRelationships().keySet();
}
- public Set<IdentityType> getSupportedIdentities()
+ public Set<EntityType> getSupportedIdentities()
{
return getRelationships().keySet();
}
- public Set<RelationshipType> getSupportedRelationships(IdentityType identityType)
+ public Set<GroupRelationshipType> getSupportedRelationships(EntityType identityType)
{
Set types = getRelationships().get(identityType);
@@ -184,7 +181,7 @@
}
- private Map<IdentityType, Set<RelationshipType>> getRelationships()
+ private Map<EntityType, Set<GroupRelationshipType>> getRelationships()
{
if (this.getName().equals(ADMINISTRATION.getName()))
{
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-18 13:57:20 UTC (rev 11080)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Group.java 2008-06-18 15:02:37 UTC (rev 11081)
@@ -22,8 +22,6 @@
package org.jboss.portal.identity.api;
-import org.jboss.idm.Identity;
-
import java.util.Map;
import java.util.Set;
@@ -32,12 +30,33 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-public interface Group extends Identity
+public interface Group
{
+ /**
+ * @return id of this identity
+ */
+ Object getId();
+
+ /**
+ * FQDN identifies the context of this object
+ *
+ * @return full qualified domain name for this identity
+ */
+ String getFQDN();
+
+ /**
+ * @return type of this identity
+ */
EntityType getType();
/**
+ * @return name of this identity
+ */
+ String getName();
+
+
+ /**
* @return group display name
*/
String getDisplayName();
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/GroupRelationshipType.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/GroupRelationshipType.java 2008-06-18 13:57:20 UTC (rev 11080)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/GroupRelationshipType.java 2008-06-18 15:02:37 UTC (rev 11081)
@@ -26,13 +26,9 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-public enum GroupRelationshipType implements org.jboss.idm.RelationshipType
+public enum GroupRelationshipType
{
HIERARCHICAL,
IMPLY;
- public String getName()
- {
- return this.name();
- }
}
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-18 13:57:20 UTC (rev 11080)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java 2008-06-18 15:02:37 UTC (rev 11081)
@@ -22,18 +22,9 @@
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
- * their relationships are exposed directly in Group and User classes.
- *
+ * IdentityModule
+ *
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java 2008-06-18 13:57:20 UTC (rev 11080)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java 2008-06-18 15:02:37 UTC (rev 11081)
@@ -22,7 +22,7 @@
package org.jboss.portal.identity.api;
-import org.jboss.idm.exceptions.IdmException;
+import org.jboss.portal.identity.IdentityException;
import java.util.Collection;
import java.util.Map;
@@ -37,17 +37,17 @@
/**
* Close this session
*/
- void close() throws IdmException;
+ void close() throws IdentityException;
/**
* Save all pending changes
*/
- void save() throws IdmException;
+ void save() throws IdentityException;
/**
* Clear this session
*/
- void clear() throws IdmException;
+ void clear() throws IdentityException;
/**
* Check if this session is open
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-18 13:57:20 UTC (rev 11080)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/User.java 2008-06-18 15:02:37 UTC (rev 11081)
@@ -31,10 +31,27 @@
* @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
* @version : 0.1 $
*/
-public interface User extends Identity
+public interface User //extends Identity
{
/**
+ * @return id of this identity
+ */
+ Object getId();
+
+ /**
+ * FQDN identifies the context of this object
+ *
+ * @return full qualified domain name for this identity
+ */
+ String getFQDN();
+
+ /**
+ * @return name of this identity
+ */
+ String getName();
+
+ /**
* @return user email
*/
String getEmail();
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11080 - modules/identity/trunk/idm/src/main/java/org/jboss/idm.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-18 09:57:20 -0400 (Wed, 18 Jun 2008)
New Revision: 11080
Modified:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java
Log:
bad formatting
Modified: modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java 2008-06-18 13:48:19 UTC (rev 11079)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java 2008-06-18 13:57:20 UTC (rev 11080)
@@ -68,46 +68,46 @@
}
/**
- * @param identityType
- * @return supported operations for given identity type
- * @throws org.jboss.idm.exceptions.IdentityTypeNotSupportedException
- */
- public Set<IdentityOperationType> getSupportedOperations(IdentityType identityType) throws IdentityTypeNotSupportedException;
+ * @param identityType
+ * @return supported operations for given identity type
+ * @throws org.jboss.idm.exceptions.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
+ * @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 with a given operation
- * @throws org.jboss.idm.exceptions.IdmException
- */
- public Set<IdentityType> getSupportedIdentities(IdentityOperationType operationType);
+ /**
+ * @param operationType
+ * @return set of identity types that can be processed with a given operation
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ public Set<IdentityType> getSupportedIdentities(IdentityOperationType operationType);
- /**
- * @return set of identity types that can be persisted
- */
- Set<IdentityType> getSupportedIdentities();
+ /**
+ * @return set of identity types that can be persisted
+ */
+ Set<IdentityType> getSupportedIdentities();
- /**
- * @param identityType
- * @return boolean describing if given identity type can be persisted or retrieved using this identity store
- */
- boolean isIdentitySupported(IdentityType identityType);
+ /**
+ * @param identityType
+ * @return boolean describing if given identity type can be persisted or retrieved using this identity store
+ */
+ boolean isIdentitySupported(IdentityType identityType);
- /**
- * @param fromType
- * @param toType
- * @param relationshipType
- * @return true is given relationship can be persisted or retrieved
- * @throws org.jboss.idm.exceptions.IdmException
- */
- boolean isRelationshipSupported(IdentityType fromType, IdentityType toType, RelationshipType relationshipType) throws IdmException;
+ /**
+ * @param fromType
+ * @param toType
+ * @param relationshipType
+ * @return true is given relationship can be persisted or retrieved
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ boolean isRelationshipSupported(IdentityType fromType, IdentityType toType, RelationshipType relationshipType) throws IdmException;
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11079 - in branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core: portlet and 1 other directory.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2008-06-18 09:48:19 -0400 (Wed, 18 Jun 2008)
New Revision: 11079
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java
branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java
Log:
Portlet 2.0 adaptation
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2008-06-18 13:21:20 UTC (rev 11078)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/model/instance/command/render/RenderPortletInstanceCommand.java 2008-06-18 13:48:19 UTC (rev 11079)
@@ -25,6 +25,7 @@
import org.jboss.portal.Mode;
import org.jboss.portal.WindowState;
import org.jboss.portal.common.NotYetImplemented;
+import org.jboss.portal.common.util.MultiValuedPropertyMap;
import org.jboss.portal.core.controller.ControllerException;
import org.jboss.portal.core.controller.ControllerResponse;
import org.jboss.portal.core.controller.command.info.CommandInfo;
@@ -40,6 +41,7 @@
import org.jboss.portal.portlet.invocation.response.ErrorResponse;
import org.jboss.portal.portlet.invocation.response.FragmentResponse;
import org.jboss.portal.portlet.invocation.response.PortletInvocationResponse;
+import org.jboss.portal.portlet.invocation.response.ResponseProperties;
import org.jboss.portal.theme.LayoutService;
import org.jboss.portal.theme.PageService;
import org.jboss.portal.theme.PortalLayout;
@@ -47,11 +49,15 @@
import org.jboss.portal.theme.page.PageResult;
import org.jboss.portal.theme.page.WindowContext;
import org.jboss.portal.theme.page.WindowResult;
+import org.w3c.dom.Element;
import java.util.Collections;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
+import javax.portlet.MimeResponse;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision$
@@ -84,12 +90,24 @@
String header = "";
if (response instanceof FragmentResponse)
{
- throw new NotYetImplemented("On the TODO List");
- /*
FragmentResponse fragment = (FragmentResponse)response;
content = fragment.getContent();
- header = fragment.getHeader();
- */
+ ResponseProperties properties = fragment.getProperties();
+ if (properties != null)
+ {
+ // header handling
+ MultiValuedPropertyMap<Element> headers = properties.getMarkupHeaders();
+ List<Element> headElements = headers.getValues(MimeResponse.MARKUP_HEAD_ELEMENT);
+ if (headElements != null)
+ {
+ StringBuffer buffer = new StringBuffer(124 * headElements.size());
+ for (Element element : headElements)
+ {
+ buffer.append(element);
+ }
+ header = buffer.toString();
+ }
+ }
}
else if (response instanceof ErrorResponse)
{
Modified: branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-18 13:21:20 UTC (rev 11078)
+++ branches/JBoss_Portal_Branch_2_7/core/src/main/org/jboss/portal/core/portlet/PortletRequestEncoder.java 2008-06-18 13:48:19 UTC (rev 11079)
@@ -125,6 +125,8 @@
{
if (interactionState instanceof ParametersStateString)
{
+ // We don't encode navigational state in portlet URL we can interpret as we store the nav state in the portal session
+ /**
if (navigationalState != null)
{
throw new IllegalArgumentException("Cannot handle case with both non opaque interaction and navigational state");
@@ -133,6 +135,7 @@
// Add the parameters
Map<String, String[]> parameters = ((ParametersStateString)interactionState).getParameters();
configure(parameters);
+ */
}
else
{
17 years, 10 months
- 1
- 0
JBoss Portal SVN: r11078 - in modules/identity/trunk/idm/src/main/java/org/jboss: idm/generic and 2 other directories.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2008-06-18 09:21:20 -0400 (Wed, 18 Jun 2008)
New Revision: 11078
Added:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityRepository.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/Session.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Capabilities.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java
Removed:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java
modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/
Modified:
modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityStore.java
modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java
Log:
small refactoring
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/FeaturesDescription.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,114 @@
+/*
+* 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;
+
+import org.jboss.idm.exceptions.IdentityTypeNotSupportedException;
+import org.jboss.idm.exceptions.IdmException;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface FeaturesDescription
+{
+ /**
+ * 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();
+ }
+ }
+
+ /**
+ * @param identityType
+ * @return supported operations for given identity type
+ * @throws org.jboss.idm.exceptions.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 with a given operation
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ public Set<IdentityType> getSupportedIdentities(IdentityOperationType operationType);
+
+ /**
+ * @return set of identity types that can be persisted
+ */
+ Set<IdentityType> getSupportedIdentities();
+
+ /**
+ * @param identityType
+ * @return boolean describing if given identity type can be persisted or retrieved using this identity store
+ */
+ boolean isIdentitySupported(IdentityType identityType);
+
+ /**
+ * @param fromType
+ * @param toType
+ * @param relationshipType
+ * @return true is given relationship can be persisted or retrieved
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ boolean isRelationshipSupported(IdentityType fromType, IdentityType toType, RelationshipType relationshipType) throws IdmException;
+
+
+
+}
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityRepository.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityRepository.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityRepository.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,38 @@
+/*
+* 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 interface IdentityRepository
+{
+
+ Session createSession();
+
+ FeaturesDescription getSupportedFeatures();
+
+}
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-18 09:26:13 UTC (rev 11077)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/IdentityStore.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -37,40 +37,8 @@
*/
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
/**
@@ -78,50 +46,13 @@
*/
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
+ * @return FeaturesDescription object describing what operation are supported by this store
*/
- boolean isOperationSupported(IdentityOperationType operationType, IdentityType identityType) throws IdentityTypeNotSupportedException;
+ FeaturesDescription getSupportedFeatures();
- /**
- * @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();
-
- /**
- * @param identityType
- * @return boolean describing if given identity type can be persisted or retrieved using this identity store
- */
- boolean isIdentitySupported(IdentityType identityType);
-
- /**
- * @param fromType
- * @param toType
- * @param relationshipType
- * @return true is given relationship can be persisted or retrieved using this identity store
- * @throws IdmException
- */
- boolean isRelationshipSupported(IdentityType fromType, IdentityType toType, RelationshipType relationshipType) throws IdmException;
-
-
-
// Operations
/**
Added: modules/identity/trunk/idm/src/main/java/org/jboss/idm/Session.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/Session.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/Session.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,241 @@
+/*
+* 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;
+
+import org.jboss.idm.exceptions.IdmException;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface Session
+{
+
+ /**
+ * Close this session
+ */
+ void close() throws IdmException;
+
+ /**
+ * Save all pending changes
+ */
+ void save() throws IdmException;
+
+ /**
+ * Clear this session
+ */
+ void clear() throws IdmException;
+
+ /**
+ * Check if this session is open
+ * @return
+ */
+ boolean isOpen();
+
+ /**
+ * @return IdentityRepository this session was created for
+ */
+ IdentityRepository getRepository();
+
+
+ // Operations
+
+ /**
+ * Create new identity with a given name
+ *
+ * @param name
+ * @return
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ Identity createIdentity(String name) throws IdmException;
+
+ /**
+ * Remove given identity
+ *
+ * @param identity
+ * @throws IdmException
+ */
+ 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
+ * @return
+ * @throws IdmException
+ */
+ Identity findIdentity(String name) throws IdmException;
+
+ /**
+ * Find identity with a given id
+ *
+ * @param id
+ * @return
+ * @throws IdmException
+ */
+ Identity findIdentity(Object id) throws IdmException;
+
+ /**
+ * 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<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<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
+ * @return
+ * @throws IdmException
+ */
+ Map<String, String[]> getAttributes(Identity identity) throws IdmException;
+
+ /**
+ * Update attributes with new values - previous values will be overwritten
+ * @param identity
+ * @param attributes
+ * @throws IdmException
+ */
+ void updateAttributes(Identity identity, Map<String, String[]> attributes) throws IdmException;
+
+ /**
+ * Add new attributes - if attribute with given name already exists the values will be appended
+ *
+ * @param identity
+ * @param attributes
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ void addAttributes(Identity identity, Map<String, String[]> attributes) throws IdmException;
+
+ /**
+ * Remove attributes
+ *
+ * @param identity
+ * @param attributes
+ */
+ void removeAttributes(Identity identity, Set<String> attributes) throws IdmException;
+
+ /**
+ * Create directional relationship of a given type between identities
+ *
+ * @param fromIdentity
+ * @param toIdentity
+ * @param relationshipType
+ * @throws IdmException
+ */
+ void createRelationship(Identity fromIdentity, Identity toIdentity, RelationshipType relationshipType) throws IdmException;
+
+ /**
+ * Remove relationship between identities. Relationships can be directional so order of parameters matters
+ *
+ * @param fromIdentity
+ * @param toIdentity
+ * @param relationshipType
+ * @throws IdmException
+ */
+ void removeRelationship(Identity fromIdentity, Identity toIdentity, RelationshipType relationshipType) throws IdmException;
+
+ /**
+ * Remove all relationships between identities. Direction of relationships doesn't matter - all active relationships
+ * will be removed
+ *
+ * @param identity1
+ * @param identity2
+ * @throws IdmException
+ */
+ void removeRelationships(Identity identity1, Identity identity2) throws IdmException;
+
+ /**
+ * Resolve relationship types between two identities. Relationships can be directional so order of parameters matters
+ *
+ * @param fromIdentity
+ * @param toIdentity
+ * @return
+ * @throws IdmException
+ */
+ Set<RelationshipType> resolveRelationships(Identity fromIdentity, Identity toIdentity) throws IdmException;
+}
Copied: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model (from rev 11052, modules/identity/trunk/idm/src/main/java/org/jboss/idm/model)
Deleted: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupEntity.java 2008-06-13 23:50:28 UTC (rev 11052)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -1,52 +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.model;
-
-import org.jboss.idm.IdentityType;
-
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface GroupEntity
-{
- Object getId();
-
- String getName();
-
- IdentityType getType();
-
- Map<String, String[]> getAttributes();
-
- Object getParentId();
-
- Collection<Relationship> getFromRelations();
-
- Collection<Relationship> getToRelations();
-
- Collection<UserEntity> getUserEntities();
-
-}
Copied: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java (from rev 11077, modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupEntity.java)
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupEntity.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,53 @@
+/*
+* 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.generic.model;
+
+import org.jboss.idm.IdentityType;
+import org.jboss.idm.Identity;
+
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface GroupEntity extends Identity
+{
+ Object getId();
+
+ String getName();
+
+ IdentityType getType();
+
+ Map<String, String[]> getAttributes();
+
+ Object getParentId();
+
+ Collection<Relationship> getFromRelations();
+
+ Collection<Relationship> getToRelations();
+
+ Collection<UserEntity> getUserEntities();
+
+}
Deleted: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupIdentityStore.java 2008-06-13 23:50:28 UTC (rev 11052)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -1,46 +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.model;
-
-import org.jboss.idm.IdentityStore;
-import org.jboss.idm.IdentityType;
-
-import java.util.Set;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface GroupIdentityStore extends IdentityStore
-{
-
- boolean isUserStore();
-
- boolean supportExternalGroupRelationships();
-
-
- // TODO: Set of needed methods
-
- // TODO: Mechanism for extensions and dynamic discovery of supported extended operations
-
-}
Copied: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java (from rev 11077, modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/GroupIdentityStore.java)
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/GroupIdentityStore.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,42 @@
+/*
+* 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.generic.model;
+
+import org.jboss.idm.IdentityStore;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface GroupIdentityStore extends IdentityStore
+{
+
+ boolean isUserStore();
+
+ boolean supportExternalGroupRelationships();
+
+
+ // TODO: Set of needed methods
+
+
+}
Deleted: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/Relationship.java 2008-06-13 23:50:28 UTC (rev 11052)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -1,39 +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.model;
-
-import org.jboss.idm.RelationshipType;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface Relationship
-{
- GroupEntity getFrom();
-
- GroupEntity getTo();
-
- RelationshipType getType();
-
-}
Copied: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java (from rev 11077, modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/Relationship.java)
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/Relationship.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,40 @@
+/*
+* 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.generic.model;
+
+import org.jboss.idm.RelationshipType;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface Relationship
+{
+
+ GroupEntity getFrom();
+
+ GroupEntity getTo();
+
+ RelationshipType getType();
+
+}
Deleted: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/UserEntity.java 2008-06-13 23:50:28 UTC (rev 11052)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -1,43 +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.model;
-
-import java.util.Map;
-import java.util.Collection;
-
-/**
- * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
- * @version : 0.1 $
- */
-public interface UserEntity
-{
-
- Object getId();
-
- String getUserName();
-
- Map<String, String[]> getAttributes();
-
- Collection<GroupEntity> getGroupEntities();
-
-}
\ No newline at end of file
Copied: modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java (from rev 11077, modules/identity/trunk/idm/src/main/java/org/jboss/idm/model/UserEntity.java)
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/idm/generic/model/UserEntity.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,45 @@
+/*
+* 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.generic.model;
+
+import org.jboss.idm.Identity;
+
+import java.util.Map;
+import java.util.Collection;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface UserEntity extends Identity
+{
+
+ Object getId();
+
+ String getUserName();
+
+ Map<String, String[]> getAttributes();
+
+ Collection<GroupEntity> getGroupEntities();
+
+}
\ No newline at end of file
Added: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Capabilities.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Capabilities.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Capabilities.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,78 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.identity.api;
+
+import org.jboss.idm.exceptions.IdentityTypeNotSupportedException;
+
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface Capabilities
+{
+
+ /**
+ * 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 org.jboss.idm.exceptions.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 with a given operation
+ * @throws org.jboss.idm.exceptions.IdmException
+ */
+ public Set<EntityType> getSupportedEntities(OperationType operationType);
+
+}
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-18 09:26:13 UTC (rev 11077)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/IdentityModule.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -41,271 +41,15 @@
{
/**
- * Operations related to the base set of methods in IdentityStore interface
+ * @return Capabilities object describing operations supported by identity module with current configuration
*/
- public enum OperationType
- {
+ Capabilities getCapabilities();
- create,
-
- remove,
-
- updateAttributes,
-
- modifyRelationships,
-
- paginatedSearch,
-
- orderedSearch;
-
- }
-
/**
- * @param entityType
- * @return supported operations for given identity type
- * @throws IdentityTypeNotSupportedException
+ * @return new session
*/
- public Set<OperationType> getSupportedOperations(EntityType entityType) throws IdentityTypeNotSupportedException;
+ Session createSession();
- /**
- * @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
- */
- User createUser(String userName);
-
- /**
- * Remove user from the the data store
- *
- * @param user
- * @return
- */
- boolean removeUser(User user);
-
- /**
- * Find user with a given user name
- *
- *
- * @param userName
- * @return
- */
- User findUser(String userName);
-
- /**
- * Find user with a given id
- * @param id
- * @return
- */
- User findUser(Object id);
-
- /**
- * 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
- */
- 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
- */
- Group createGroup(String groupName, EntityType type);
-
- /**
- * Remove group from the data store
- *
- * @param group
- * @return
- */
- boolean removeGroup(Group group);
-
- /**
- * Find group with a given name
- *
- * @param name
- * @return
- */
- Group findGroup(String name);
-
- /**
- * Find Group with a given object id
- *
- * @param id
- * @return
- */
- Group findGroup(Object id);
-
- /**
- * Find Group with a given group type
- *
- * @param entityType
- * @return
- */
- Group findGroup(EntityType entityType);
-
- /**
- * 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
- */
- 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);
+
}
Added: modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java
===================================================================
--- modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java (rev 0)
+++ modules/identity/trunk/idm/src/main/java/org/jboss/portal/identity/api/Session.java 2008-06-18 13:21:20 UTC (rev 11078)
@@ -0,0 +1,284 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.identity.api;
+
+import org.jboss.idm.exceptions.IdmException;
+
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
+/**
+ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a>
+ * @version : 0.1 $
+ */
+public interface Session
+{
+ /**
+ * Close this session
+ */
+ void close() throws IdmException;
+
+ /**
+ * Save all pending changes
+ */
+ void save() throws IdmException;
+
+ /**
+ * Clear this session
+ */
+ void clear() throws IdmException;
+
+ /**
+ * Check if this session is open
+ * @return
+ */
+ boolean isOpen();
+
+
+ // Users
+ /**
+ * Create new user in the data store
+ *
+ * @param userName
+ * @return
+ */
+ User createUser(String userName);
+
+ /**
+ * Remove user from the the data store
+ *
+ * @param user
+ * @return
+ */
+ boolean removeUser(User user);
+
+ /**
+ * Find user with a given user name
+ *
+ *
+ * @param userName
+ * @return
+ */
+ User findUser(String userName);
+
+ /**
+ * Find user with a given id
+ * @param id
+ * @return
+ */
+ User findUser(Object id);
+
+ /**
+ * 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
+ */
+ 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
+ */
+ Group createGroup(String groupName, EntityType type);
+
+ /**
+ * Remove group from the data store
+ *
+ * @param group
+ * @return
+ */
+ boolean removeGroup(Group group);
+
+ /**
+ * Find group with a given name
+ *
+ * @param name
+ * @return
+ */
+ Group findGroup(String name);
+
+ /**
+ * Find Group with a given object id
+ *
+ * @param id
+ * @return
+ */
+ Group findGroup(Object id);
+
+ /**
+ * Find Group with a given group type
+ *
+ * @param entityType
+ * @return
+ */
+ Group findGroup(EntityType entityType);
+
+ /**
+ * 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
+ */
+ 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);
+}
17 years, 10 months
- 1
- 0