JBoss Portal SVN: r6355 - trunk/cms.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-20 17:00:51 -0500 (Tue, 20 Feb 2007)
New Revision: 6355
Modified:
trunk/cms/build.xml
Log:
Ouppsss sorry
Modified: trunk/cms/build.xml
===================================================================
--- trunk/cms/build.xml 2007-02-20 19:27:37 UTC (rev 6354)
+++ trunk/cms/build.xml 2007-02-20 22:00:51 UTC (rev 6355)
@@ -391,13 +391,13 @@
</x-sysproperty>
<x-test>
<!-- general cms setup related tests -->
- <!--test todir="${test.reports}" name="org.jboss.portal.test.cms.JackrabbitTestCase"/>
+ <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.TestRepositoryUtil"/>
<!-- cms file command tests -->
- <!--test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFileCreate"/>
+ <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.TestFileGet"/>
@@ -405,15 +405,15 @@
<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.TestFileDelete"/>
<test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSearch"/>
<!-- cms folder command tests -->
- <!--test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestFolderCopy"/>
+ <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.commands.TestFolderUpdate"/>
<!-- cms fine grained security related tests -->
<!--test todir="${test.reports}" name="org.jboss.portal.test.cms.commands.TestSecureFileGet"/-->
19 years, 2 months
JBoss Portal SVN: r6354 - in trunk: core and 4 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-20 14:27:37 -0500 (Tue, 20 Feb 2007)
New Revision: 6354
Modified:
trunk/cms/.classpath
trunk/core-admin/.classpath
trunk/core-cms/.classpath
trunk/core/.classpath
trunk/identity/.classpath
trunk/workflow/.classpath
Log:
Removed version number form jbpm jars
Modified: trunk/cms/.classpath
===================================================================
--- trunk/cms/.classpath 2007-02-20 13:08:08 UTC (rev 6353)
+++ trunk/cms/.classpath 2007-02-20 19:27:37 UTC (rev 6354)
@@ -40,8 +40,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
<classpathentry combineaccessrules="false" kind="src" path="/search"/>
<classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
- <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/jackrabbit/lib/jackrabbit-core.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/core/.classpath
===================================================================
--- trunk/core/.classpath 2007-02-20 13:08:08 UTC (rev 6353)
+++ trunk/core/.classpath 2007-02-20 19:27:37 UTC (rev 6354)
@@ -45,8 +45,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
<classpathentry combineaccessrules="false" kind="src" path="/format"/>
<classpathentry combineaccessrules="false" kind="src" path="/registration"/>
- <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/core-admin/.classpath
===================================================================
--- trunk/core-admin/.classpath 2007-02-20 13:08:08 UTC (rev 6353)
+++ trunk/core-admin/.classpath 2007-02-20 19:27:37 UTC (rev 6354)
@@ -7,12 +7,12 @@
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
<classpathentry kind="lib" path="/thirdparty/apache-myfaces/lib/myfaces-api.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
- <classpathentry kind="lib" path="/thirdparty/apache-tomahawk/lib/tomahawk.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/api"/>
<classpathentry combineaccessrules="false" kind="src" path="/core"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry combineaccessrules="false" kind="src" path="/portlet-federation"/>
+ <classpathentry kind="lib" path="/thirdparty/apache-tomahawk/lib/tomahawk.jar"/>
<classpathentry kind="output" path="output/classes"/>
</classpath>
Modified: trunk/core-cms/.classpath
===================================================================
--- trunk/core-cms/.classpath 2007-02-20 13:08:08 UTC (rev 6353)
+++ trunk/core-cms/.classpath 2007-02-20 19:27:37 UTC (rev 6354)
@@ -18,8 +18,8 @@
<classpathentry combineaccessrules="false" kind="src" path="/theme"/>
<classpathentry combineaccessrules="false" kind="src" path="/workflow"/>
<classpathentry kind="lib" path="/thirdparty/apache-fileupload/lib/commons-fileupload.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/search"/>
<classpathentry combineaccessrules="false" kind="src" path="/security"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: trunk/identity/.classpath
===================================================================
--- trunk/identity/.classpath 2007-02-20 13:08:08 UTC (rev 6353)
+++ trunk/identity/.classpath 2007-02-20 19:27:37 UTC (rev 6354)
@@ -17,7 +17,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/test"/>
- <classpathentry kind="lib" path="/thirdparty/apache-directory/lib/apacheds-protocol-shared-1.0-RC4.jar"/>
<classpathentry kind="lib" path="/thirdparty/sun-opends/lib/OpenDS.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/jbossxb/lib/jboss-xml-binding.jar"/>
<classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-microcontainer.jar"/>
Modified: trunk/workflow/.classpath
===================================================================
--- trunk/workflow/.classpath 2007-02-20 13:08:08 UTC (rev 6353)
+++ trunk/workflow/.classpath 2007-02-20 19:27:37 UTC (rev 6354)
@@ -5,7 +5,6 @@
<classpathentry combineaccessrules="false" kind="src" path="/jems"/>
<classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss.jar"/>
- <classpathentry kind="lib" path="/thirdparty/jbpm/lib/jbpm-3.1.2.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/>
<classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/>
@@ -13,5 +12,6 @@
<classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/>
<classpathentry combineaccessrules="false" kind="src" path="/common"/>
<classpathentry combineaccessrules="false" kind="src" path="/identity"/>
+ <classpathentry kind="lib" path="/thirdparty/jbpm/jaronly/lib/jbpm.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
19 years, 2 months
JBoss Portal SVN: r6353 - trunk/core/src/resources/portal-core-sar/conf.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-02-20 08:08:08 -0500 (Tue, 20 Feb 2007)
New Revision: 6353
Modified:
trunk/core/src/resources/portal-core-sar/conf/login-config.xml
Log:
- move optional sufficient login module below the main one
Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-20 04:35:37 UTC (rev 6352)
+++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-20 13:08:08 UTC (rev 6353)
@@ -35,6 +35,18 @@
<application-policy name="portal">
<authentication>
+
+ <!--To configure LDAP support with IdentityLoginModule please check documentation on how to
+ configure portal identity modules for this-->
+ <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
+ <module-option name="unauthenticatedIdentity">guest</module-option>
+ <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+ <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
+ <module-option name="additionalRole">Authenticated</module-option>
+ <module-option name="password-stacking">useFirstPass</module-option>
+ </login-module>
+
<!--Uncomment this if you want to fall down to users kept in DB after LDAP authentication fails
This may be usefull if you want to use Admin user provided with portal database schema-->
<!--Note that this may lead to the security risk - with LDAP when storing user profile information
@@ -50,7 +62,6 @@
<module-option name="additionalRole">Authenticated</module-option>
</login-module>-->
-
<!--Use can use this module instead of IdentityLoginModule to bind to LDAP. It simply extends JBossSX LdapExtLoginModule so
all configuration that can be applied to LdapExtLoginModule also can be applied here. For user that
was authenticated successfully it will try to take identity modules from portal, check if such user (and roles it belongs to)
@@ -85,18 +96,6 @@
<module-option name="searchScope">SUBTREE_SCOPE</module-option>
<module-option name="allowEmptyPasswords">false</module-option>
</login-module>-->
-
-
- <!--To configure LDAP support with IdentityLoginModule please check documentation on how to
- configure portal identity modules for this-->
- <login-module code="org.jboss.portal.identity.auth.IdentityLoginModule" flag="required">
- <module-option name="unauthenticatedIdentity">guest</module-option>
- <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
- <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
- <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
- <module-option name="additionalRole">Authenticated</module-option>
- <module-option name="password-stacking">useFirstPass</module-option>
- </login-module>
</authentication>
</application-policy>
</policy>
19 years, 2 months
JBoss Portal SVN: r6352 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-19 23:35:37 -0500 (Mon, 19 Feb 2007)
New Revision: 6352
Modified:
docs/trunk/referenceGuide/en/modules/wsrp.xml
Log:
- Updated documentation with respect to format change in -wsrp.xml.
Modified: docs/trunk/referenceGuide/en/modules/wsrp.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/wsrp.xml 2007-02-20 04:32:43 UTC (rev 6351)
+++ docs/trunk/referenceGuide/en/modules/wsrp.xml 2007-02-20 04:35:37 UTC (rev 6352)
@@ -207,9 +207,7 @@
<?xml version="1.0" standalone="yes"?>
<deployments>
<deployment>
- <wsrp-producer>
- <producer-id>bea</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="bea" expiration-cache="120">
<endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
<property>
@@ -269,7 +267,8 @@
<para>Let's now look at which information needs to be provided to configure access to a remote producer.</para>
<para>First, we need to provide an identifier for the producer we are configuring so that we can refer to it
- afterwards. This is accomplished via the <emphasis role="bold"><producer-id></emphasis> element.</para>
+ afterwards. This is accomplished via the mandatory <emphasis role="bold">id</emphasis> attribute of the
+ <emphasis role="bold"><wsrp-producer></emphasis> element.</para>
<para>JBoss Portal also needs to learn about the remote producer's endpoints to be able to connect to the
remote web services and perform WSRP invocations. Two options are currently supported to provide this
@@ -300,10 +299,10 @@
</itemizedlist>
</para>
- <para>Both <emphasis role="bold"><producer-id></emphasis> and either
+ <para>Both the <emphasis role="bold">id</emphasis> attribute and either
<emphasis role="bold"><endpoint-config></emphasis> or
- <emphasis role="bold"><endpoint-wsdl-url></emphasis>
- are required elements for a functional remote producer configuration.
+ <emphasis role="bold"><endpoint-wsdl-url></emphasis> elements
+ are required for a functional remote producer configuration.
</para>
</sect2>
@@ -316,7 +315,8 @@
<para>One such optional configuration concerns caching. To prevent useless roundtrips between the local
consumer and the remote producer, it is possible to cache some of the information sent by the producer (such
as the list of offered portlets) for a given duration. The rate at which the information is refreshed is
- defined by the <emphasis role="bold"><expiration-cache></emphasis> element which specifies the
+ defined by the <emphasis role="bold">expiration-cache</emphasis> attribute of the
+ <emphasis role="bold"><wsrp-producer></emphasis> element which specifies the
refreshing period in seconds. For example, providing a value of 120 for expiration-cache means that the
producer information will not be refreshed for 2 minutes after it has been somehow accessed. If no value
is provided, JBoss Portal will always access the remote producer regardless of whether the remote
@@ -355,9 +355,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployments>
<deployment>
- <wsrp-producer>
- <producer-id>MyProducer</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="MyProducer" expiration-cache="120">
<endpoint-config>
<service-description-url>http://www.someproducer.com/portal-wsrp/ServiceDescriptionService</service-description-url>
<markup-url>http://www.someproducer.com/portal-wsrp/MarkupService</markup-url>
@@ -377,9 +375,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<deployments>
<deployment>
- <wsrp-producer>
- <producer-id>AnotherProducer</producer-id>
- <expiration-cache>60</expiration-cache>
+ <wsrp-producer id="AnotherProducer" expiration-cache="60">
<endpoint-wsdl-url>http://example.com/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
<property>
19 years, 2 months
JBoss Portal SVN: r6351 - in trunk/wsrp: src/main/org/jboss/portal/test/wsrp/deployment and 7 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-19 23:32:43 -0500 (Mon, 19 Feb 2007)
New Revision: 6351
Added:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/
trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml
Removed:
trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml
Modified:
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java
trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
Log:
- Changed -wsrp.xml format to facilitate processing of producer info with respect to existence in the database.
- Updated test cases.
- Moved location of producer configuration file in preparation of adding more configuration files for hibernate.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/build.xml 2007-02-20 04:32:43 UTC (rev 6351)
@@ -122,6 +122,7 @@
<path refid="jboss.jbossxb.classpath"/>
<path refid="apache.httpclient.classpath"/>
<path refid="apache.logging.classpath"/>
+ <path refid="hibernate.hibernate.classpath"/>
</path>
@@ -342,6 +343,7 @@
<fileset dir="${build.resources.test}/test-deployment-lib-jar"/>
<fileset dir="${build.classes}/">
<include name="org/jboss/portal/test/wsrp/deployment/**"/>
+ <include name="org/jboss/portal/test/wsrp/framework/support/**"/>
</fileset>
</jar>
</target>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -55,7 +55,7 @@
URL wsrpXMLLocation = Thread.currentThread().getContextClassLoader().getResource("test-wsrp.xml");
assertNotNull(wsrpXMLLocation);
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WSRPDeploymentFactory();
+ ObjectModelFactory factory = new WSRPDeploymentFactory(new MockConsumerRegistry());
Object o = unmarshaller.unmarshal(wsrpXMLLocation.openStream(), factory, null);
assertNotNull(o);
assertTrue(o instanceof WSRPDeployment);
Added: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java (rev 0)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -0,0 +1,66 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2007, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+
+package org.jboss.portal.test.wsrp.deployment;
+
+import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
+import org.jboss.portal.test.wsrp.framework.support.MockWSRPConsumer;
+import org.jboss.portal.wsrp.WSRPConsumer;
+import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry;
+
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ * @since 2.6
+ */
+public class MockConsumerRegistry implements ConsumersRegistry
+{
+ private Map consumers = new HashMap(3);
+
+
+ public MockConsumerRegistry()
+ {
+ consumers.put("inDB", new MockWSRPConsumer());
+ consumers.put("inDB2", new MockWSRPConsumer());
+ }
+
+ public Collection getConfiguredConsumers()
+ {
+ return consumers.values();
+ }
+
+ public WSRPConsumer getConsumer(String id)
+ {
+ return (WSRPConsumer)consumers.get(id);
+ }
+
+ public FederatingPortletInvoker getFederatingPortletInvoker()
+ {
+ return null;
+ }
+
+}
Property changes on: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/MockConsumerRegistry.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -26,7 +26,7 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.SubDeployerSupport;
import org.jboss.portal.common.util.URLTools;
-import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
+import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
@@ -48,8 +48,7 @@
setEnhancedSuffixes(DEFAULT_ENHANCED_SUFFIXES);
}
- /** . */
- private FederatingPortletInvoker federatingPortletInvoker;
+ private ConsumersRegistry consumerRegistry;
/** . */
private URL deployedDefaultWSRPURL;
@@ -57,14 +56,14 @@
/** . */
private String defaultWSRPLocation;
- public FederatingPortletInvoker getFederatingPortletInvoker()
+ public ConsumersRegistry getConsumerRegistry()
{
- return federatingPortletInvoker;
+ return consumerRegistry;
}
- public void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker)
+ public void setConsumerRegistry(ConsumersRegistry consumerRegistry)
{
- this.federatingPortletInvoker = federatingPortletInvoker;
+ this.consumerRegistry = consumerRegistry;
}
public String getDefaultWSRPLocation()
@@ -84,7 +83,7 @@
try
{
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
- ObjectModelFactory factory = new WSRPDeploymentFactory();
+ ObjectModelFactory factory = new WSRPDeploymentFactory(consumerRegistry);
WSRPDeployment deployment = (WSRPDeployment)unmarshaller.unmarshal(di.localUrl.openStream(), factory, null);
di.metaData = deployment;
}
@@ -108,7 +107,7 @@
try
{
WSRPConsumerService service = (WSRPConsumerService)i.next();
- service.setFederatingPortletInvoker(federatingPortletInvoker);
+ service.setFederatingPortletInvoker(consumerRegistry.getFederatingPortletInvoker());
service.start();
}
catch (Exception e)
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -23,7 +23,7 @@
package org.jboss.portal.wsrp.deployment;
import org.jboss.deployment.SubDeployerExtMBean;
-import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
+import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -31,11 +31,11 @@
*/
public interface WSRPDeployerMBean extends SubDeployerExtMBean
{
- FederatingPortletInvoker getFederatingPortletInvoker();
+ String getDefaultWSRPLocation();
- void setFederatingPortletInvoker(FederatingPortletInvoker federatingPortletInvoker);
+ void setDefaultWSRPLocation(String defaultWSRPLocation);
- String getDefaultWSRPLocation();
+ ConsumersRegistry getConsumerRegistry();
- void setDefaultWSRPLocation(String defaultWSRPLocation);
+ void setConsumerRegistry(ConsumersRegistry consumerRegistry);
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -23,10 +23,13 @@
package org.jboss.portal.wsrp.deployment;
import org.jboss.logging.Logger;
+import org.jboss.portal.common.util.ParameterValidation;
+import org.jboss.portal.wsrp.WSRPConsumer;
import org.jboss.portal.wsrp.consumer.EndpointConfigurationInfo;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.RegistrationInfo;
import org.jboss.portal.wsrp.consumer.WSRPConsumerImpl;
+import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry;
import org.jboss.portal.wsrp.services.AbstractJNDIServiceFactory;
import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory;
import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
@@ -46,6 +49,9 @@
public class WSRPDeploymentFactory implements ObjectModelFactory
{
private final Logger log = Logger.getLogger(getClass());
+
+ private ConsumersRegistry consumerRegistry;
+
private static final boolean DEBUG = false;
/** . */
@@ -80,6 +86,12 @@
"wsrp-client/service/PortletManagementService");
}
+
+ public WSRPDeploymentFactory(ConsumersRegistry consumerRegistry)
+ {
+ this.consumerRegistry = consumerRegistry;
+ }
+
public Object newRoot(Object root, UnmarshallingContext nav, String nsURI, String localName, Attributes attrs)
{
return new WSRPDeployment();
@@ -95,9 +107,39 @@
{
if (WSRP_PRODUCER.equals(localName))
{
+ String id = attrs.getValue("id");
+ ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "producer identifier", "Configuring a producer");
+
+ // check that the consumer doesn't exist in the database first
+ WSRPConsumer consumer = consumerRegistry.getConsumer(id);
+ if (consumer != null)
+ {
+ // consumer already exists, do not further process this producer and use the DB configuration instead
+ return null;
+ }
+
+ // consumer didn't exist in the database, so create one and configure it
WSRPConsumerService service = new WSRPConsumerService();
- WSRPConsumerImpl consumer = new WSRPConsumerImpl();
+ consumer = new WSRPConsumerImpl();
+ ProducerInfo info = consumer.getProducerInfo();
+ info.setId(id);
+
+ String expirationCache = attrs.getValue("expiration-cache");
+ if (expirationCache != null)
+ {
+ try
+ {
+ Integer expirationCacheSeconds = new Integer(expirationCache);
+ info.setExpirationCacheSeconds(expirationCacheSeconds);
+ }
+ catch (NumberFormatException e)
+ {
+ System.out.println("Ignoring bad expiration cache value " + expirationCache);
+ }
+ }
+
service.setConsumer(consumer);
+
return service;
}
else
@@ -162,33 +204,6 @@
return null;
}
- public void setValue(WSRPConsumerService service, UnmarshallingContext nav, String nsURI, String localName,
- String value)
- {
- if (DEBUG)
- {
- System.out.println("setvalue service " + localName);
- }
-
- ProducerInfo prodInfo = service.getConsumer().getProducerInfo();
- if ("producer-id".equals(localName))
- {
- prodInfo.setId(value);
- }
- else if ("expiration-cache".equals(localName))
- {
- try
- {
- Integer expirationCacheMillis = new Integer(value);
- prodInfo.setExpirationCacheSeconds(expirationCacheMillis);
- }
- catch (NumberFormatException e)
- {
- System.out.println("Ignore bad expiration cache value " + value);
- }
- }
- }
-
public void setValue(PerEndpointSOAPInvokerServiceFactory serviceFactory, UnmarshallingContext nav, String nsURI,
String localName, String value)
{
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistry.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -22,9 +22,10 @@
package org.jboss.portal.wsrp.portlet.consumers;
+import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
-import java.util.List;
+import java.util.Collection;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -33,7 +34,10 @@
*/
public interface ConsumersRegistry
{
- List getConfiguredConsumers();
+ Collection getConfiguredConsumers();
WSRPConsumer getConsumer(String id);
+
+ FederatingPortletInvoker getFederatingPortletInvoker();
+
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-02-20 04:32:43 UTC (rev 6351)
@@ -23,11 +23,12 @@
package org.jboss.portal.wsrp.portlet.consumers;
+import org.hibernate.SessionFactory;
import org.jboss.portal.common.util.ParameterValidation;
-import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
-import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.jems.as.system.AbstractJBossService;
import org.jboss.portal.portlet.PortletInvoker;
+import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
+import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
import java.util.ArrayList;
@@ -35,6 +36,7 @@
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
+import java.util.SortedMap;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -46,6 +48,12 @@
/** Gives access to the Portal's portlet invokers */
private FederatingPortletInvoker federatingPortletInvoker;
+ private SortedMap consumers;
+
+ private SessionFactory sessionFactory;
+
+ private String sessionFactoryJNDIName;
+
public FederatingPortletInvoker getFederatingPortletInvoker()
{
return federatingPortletInvoker;
@@ -56,8 +64,52 @@
this.federatingPortletInvoker = federatingPortletInvoker;
}
- public List getConfiguredConsumers()
+ public String getSessionFactoryJNDIName()
{
+ return sessionFactoryJNDIName;
+ }
+
+ public void setSessionFactoryJNDIName(String sessionFactoryJNDIName)
+ {
+ this.sessionFactoryJNDIName = sessionFactoryJNDIName;
+ }
+
+ /*protected void startService() throws Exception
+ {
+ sessionFactory = (SessionFactory)new InitialContext().lookup(sessionFactoryJNDIName);
+
+ // load the configured consumers
+ consumers = new TreeMap();
+ Session session = sessionFactory.getCurrentSession();
+ Iterator producerInfos = session.createQuery("from ProducerInfo pi order by pi.id").iterate();
+ ProducerInfo producerInfo;
+ WSRPConsumer consumer;
+ while (producerInfos.hasNext())
+ {
+ producerInfo = (ProducerInfo)producerInfos.next();
+ consumer = new WSRPConsumerImpl();
+ consumer.setProducerInfo(producerInfo);
+ consumers.put(producerInfo.getId(), consumer);
+ if(producerInfo.isActive())
+ {
+ WSRPConsumerService service = new WSRPConsumerService();
+ service.setConsumer(consumer);
+ service.setFederatingPortletInvoker(federatingPortletInvoker);
+ service.start();
+ }
+ }
+ }
+
+ protected void stopService() throws Exception
+ {
+ sessionFactory = null;
+ consumers.clear();
+ consumers = null;
+ }*/
+
+ public Collection getConfiguredConsumers()
+ {
+// return Collections.unmodifiableCollection(consumers.values());
Collection invokers = federatingPortletInvoker.getFederatedInvokers();
if (invokers.isEmpty())
{
@@ -81,12 +133,17 @@
public WSRPConsumer getConsumer(String id)
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer id", null);
+ // return (WSRPConsumer) consumers.get(id);
return getConsumerFrom(federatingPortletInvoker.getFederatedInvoker(id));
}
- private WSRPConsumer getConsumerFrom(FederatedPortletInvoker
- service)
+ private WSRPConsumer getConsumerFrom(FederatedPortletInvoker service)
{
+ if (service == null)
+ {
+ return null;
+ }
+
PortletInvoker invoker = service.getPortletInvoker();
if (invoker instanceof WSRPConsumer)
{
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-20 04:32:43 UTC (rev 6351)
@@ -105,20 +105,38 @@
name="portal.wsrp:service=ProducerConfiguration" xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <attribute name="ConfigLocation">conf/config.xml</attribute>
+ <attribute name="ConfigLocation">conf/producer/config.xml</attribute>
</mbean>
<!-- Deployer for *-wsrp.xml files. Deploys default-wsrp.xml which contains the 'self' consumer -->
<mbean code="org.jboss.portal.wsrp.deployment.WSRPDeployer" name="portal.wsrp:service=WSRPDeployer">
<attribute name="DefaultWSRPLocation">default-wsrp.xml</attribute>
- <depends optional-attribute-name="FederatingPortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
+ <depends optional-attribute-name="ConsumerRegistry"
+ proxy-type="attribute">portal.wsrp:service=ConsumersRegistry</depends>
</mbean>
+ <!--<mbean
+ code="org.jboss.portal.jems.hibernate.SessionFactoryBinder"
+ name="portal:service=Hibernate,type=WSRPConsumer"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <depends>jboss.jca:service=DataSourceBinding,name=@portal.datasource.name@</depends>
+ --><!-- Uncomment in clustered mode : hibernate depends on its tree cache service @portal.single.xml.close@
+ <depends>portal:service=TreeCacheProvider,type=hibernate</depends>
+ @portal.single.xml.open@ --><!--
+ <attribute name="DoChecking">true</attribute>
+ <attribute name="ConfigLocation">conf/consumer/hibernate/hibernate.cfg.xml</attribute>
+ <attribute name="JNDIName">java:/portal/PortletSessionFactory</attribute>
+ </mbean>-->
+
<!-- Consumers registry for WSRP consumer configuration portlet -->
<mbean code="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService"
name="portal.wsrp:service=ConsumersRegistry"
xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
+ <!--<depends>portal:service=Hibernate,type=WSRPConsumer</depends>
+ <attribute name="SessionFactoryJNDIName">java:/portal/PortletSessionFactory</attribute>-->
<depends optional-attribute-name="FederatingPortletInvoker" proxy-type="attribute">portal:service=PortletInvoker,type=Federating</depends>
</mbean>
</server>
Deleted: trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml 2007-02-20 04:32:43 UTC (rev 6351)
@@ -1,29 +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. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<producer-configuration>
- <registration-configuration fullServiceDescriptionRequiresRegistration="true">
- <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator</registration-property-validator>
- </registration-configuration>
-</producer-configuration>
-
Copied: trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml (from rev 6343, trunk/wsrp/src/resources/portal-wsrp-sar/conf/config.xml)
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml (rev 0)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-02-20 04:32:43 UTC (rev 6351)
@@ -0,0 +1,29 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<producer-configuration>
+ <registration-configuration fullServiceDescriptionRequiresRegistration="true">
+ <registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator</registration-property-validator>
+ </registration-configuration>
+</producer-configuration>
+
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2007-02-20 04:32:43 UTC (rev 6351)
@@ -28,9 +28,7 @@
<deployments>
<deployment>
- <wsrp-producer>
- <producer-id>self</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="self" expiration-cache="120">
<!--
we need to use the individual endpoint configuration because the configuration via wsdl forces an
immediate attempt to access the web service description which is not available yet at this point of deployment
@@ -45,17 +43,13 @@
</wsrp-producer>
</deployment>
<!--<deployment>
- <wsrp-producer>
- <producer-id>NetUnity</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="NetUnity" expiration-cache="120">
<endpoint-wsdl-url>http://wsrp.netunitysoftware.com/WSRPTestService/WSRPTestService.asmx?Ope...</endpoint-wsdl-url>
<registration-data/>
</wsrp-producer>
</deployment>-->
<!--<deployment>
- <wsrp-producer>
- <producer-id>vignette</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="vignette" expiration-cache="120">
<endpoint-wsdl-url>http://wsrpdemo.vignette.com:8080/producer/wsdl</endpoint-wsdl-url>
<registration-data>
<property>
@@ -72,9 +66,7 @@
</wsrp-producer>
</deployment>-->
<!--<deployment>
- <wsrp-producer>
- <producer-id>bea</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="bea" expiration-cache="120">
<endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
<property>
@@ -86,9 +78,7 @@
</wsrp-producer>
</deployment>-->
<!--<deployment>
- <wsrp-producer>
- <producer-id>oracle</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="oracle" expiration-cache="120">
<endpoint-wsdl-url>http://portalstandards.oracle.com/portletapp/portlets?WSDL</endpoint-wsdl-url>
<registration-data/>
</wsrp-producer>
Modified: trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-02-19 21:49:56 UTC (rev 6350)
+++ trunk/wsrp/src/resources/tests/test-deployment-lib-jar/test-wsrp.xml 2007-02-20 04:32:43 UTC (rev 6351)
@@ -23,8 +23,7 @@
<deployments>
<deployment>
- <wsrp-producer>
- <producer-id>endpoint1</producer-id>
+ <wsrp-producer id="inDB">
<endpoint-config>
<service-description-url>service-description-1</service-description-url>
<markup-url>markup-1</markup-url>
@@ -34,9 +33,18 @@
</wsrp-producer>
</deployment>
<deployment>
- <wsrp-producer>
- <producer-id>endpoint2</producer-id>
+ <wsrp-producer id="endpoint1">
<endpoint-config>
+ <service-description-url>service-description-1</service-description-url>
+ <markup-url>markup-1</markup-url>
+ <registration-url>registration-1</registration-url>
+ <portlet-management-url>portlet-management-1</portlet-management-url>
+ </endpoint-config>
+ </wsrp-producer>
+ </deployment>
+ <deployment>
+ <wsrp-producer id="endpoint2">
+ <endpoint-config>
<service-description-url>service-description-2</service-description-url>
<markup-url>markup-2</markup-url>
<registration-url>registration-2</registration-url>
@@ -45,9 +53,17 @@
</wsrp-producer>
</deployment>
<deployment>
- <wsrp-producer>
- <producer-id>producer1</producer-id>
- <expiration-cache>120</expiration-cache>
+ <wsrp-producer id="inDB2">
+ <endpoint-config>
+ <service-description-url>service-description-2</service-description-url>
+ <markup-url>markup-2</markup-url>
+ <registration-url>registration-2</registration-url>
+ <portlet-management-url>portlet-management-2</portlet-management-url>
+ </endpoint-config>
+ </wsrp-producer>
+ </deployment>
+ <deployment>
+ <wsrp-producer id="producer1" expiration-cache='120'>
<endpoint-wsdl-url>http://wsrp.bea.com:7001/producer/producer?WSDL</endpoint-wsdl-url>
<registration-data>
<consumer-name>JBoss Portal 2.4 Test</consumer-name>
@@ -65,17 +81,14 @@
</wsrp-producer>
</deployment>
<deployment>
- <wsrp-producer>
- <producer-id>producer2</producer-id>
+ <wsrp-producer id="producer2">
<endpoint-config>
<service-description-url>service-description-3</service-description-url>
<markup-url>markup-3</markup-url>
<registration-url>registration-3</registration-url>
<portlet-management-url>portlet-management-3</portlet-management-url>
</endpoint-config>
- <registration-data>
- <consumer-name>JBoss Portal 2.4 Test</consumer-name>
- </registration-data>
+ <registration-data/>
</wsrp-producer>
</deployment>
</deployments>
\ No newline at end of file
19 years, 2 months
JBoss Portal SVN: r6350 - trunk/identity/src/main/org/jboss/portal/identity/ldap.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-02-19 16:49:56 -0500 (Mon, 19 Feb 2007)
New Revision: 6350
Modified:
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
Log:
- correction in LDAPExtUserModuleImpl
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2007-02-19 21:24:41 UTC (rev 6349)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPExtUserModuleImpl.java 2007-02-19 21:49:56 UTC (rev 6350)
@@ -168,24 +168,24 @@
int size = uf.size();
- if (offset == 0 && size <= (offset+limit))
+ if (offset == 0 && size <= limit)
{
return Tools.toSet(uf.iterator());
}
+
+ Collections.sort(uf, new LDAPUserImpl.LDAPUserComparator());
+
+ if (offset + limit <= size)
+ {
+ return Tools.toSet(uf.subList(offset, offset + limit).iterator());
+ }
else if (offset >= size)
{
return new HashSet();
}
- else if (offset + limit > size)
- {
- limit = size;
- }
- Collections.sort(uf, new LDAPUserImpl.LDAPUserComparator());
-
-
- return Tools.toSet(uf.subList(offset, offset + limit).iterator());
+ return Tools.toSet(uf.subList(offset, size).iterator());
}
public int getUserCount() throws IdentityException, IllegalArgumentException
Modified: trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java
===================================================================
--- trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2007-02-19 21:24:41 UTC (rev 6349)
+++ trunk/identity/src/main/org/jboss/portal/identity/ldap/LDAPUserModuleImpl.java 2007-02-19 21:49:56 UTC (rev 6350)
@@ -312,12 +312,6 @@
return Tools.toSet(uf.subList(offset, size).iterator());
-
- //should not happen
-
-
-
-
}
public int getUserCount() throws IdentityException, IllegalArgumentException
19 years, 2 months
JBoss Portal SVN: r6349 - docs/trunk/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-02-19 16:24:41 -0500 (Mon, 19 Feb 2007)
New Revision: 6349
Modified:
docs/trunk/referenceGuide/en/modules/authentication.xml
Log:
basic info about synchronizing stuff in portal authentication
Modified: docs/trunk/referenceGuide/en/modules/authentication.xml
===================================================================
--- docs/trunk/referenceGuide/en/modules/authentication.xml 2007-02-19 21:19:20 UTC (rev 6348)
+++ docs/trunk/referenceGuide/en/modules/authentication.xml 2007-02-19 21:24:41 UTC (rev 6349)
@@ -8,5 +8,107 @@
</chapterinfo>
<title>Authentication</title>
<para>This chapter describes authentication mechanisms in JBoss Portal</para>
-
+ <sect1 id="authentication_in_portal">
+ <title>Authentication in JBoss Portal</title>
+ <para>TODO</para>
+ <sect2 id="configuration">
+ <title>Configuration</title>
+ <para>You can configure JAAS authentication stack in <emphasis>jboss-portal.sar/conf/login-config.xml</emphasis></para>
+ <para>TODO</para>
+ </sect2>
+ </sect1>
+ <sect1 id="portal_login_modules">
+ <title>JAAS Login Modules</title>
+ <para>JBoss Portal comes with few implementations of JAAS <emphasis>LoginModule</emphasis> interface</para>
+ <sect2>
+ <title>IdentityLoginModule</title>
+ <para>TODO</para>
+ </sect2>
+ <sect2>
+ <title>DBIdentityLoginModule</title>
+ <para>TODO</para>
+ </sect2>
+ <sect2>
+ <title>SynchronizingLdapLoginModule</title>
+ <para>
+ Use can use this module instead of IdentityLoginModule to bind to LDAP.
+ <emphasis>org.jboss.portal.identity.auth.SynchronizingLDAPLoginModule</emphasis> class is a wrapper around
+ <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=LdapLoginModule">LdapLoginModule</ulink> from JBossSX.
+ It simply extends it so
+ all configuration that can be applied to <emphasis>LdapExtLoginModule</emphasis> also can be applied here. For user that
+ was authenticated successfully it will try to call identity modules from portal, check if such user
+ is present, and if not it will try to create it. Then for all roles assigned to this authenticated principal it will
+ try to check and create them using identity modules. This behaviour can be altered using following options:
+ <itemizedlist>
+ <listitem>
+ <emphasis role="bold">userModuleJNDIName</emphasis> - JNDI name of portal UserModule. This option is <emphasis>obligatory</emphasis>
+ if <emphasis>synchronizeIdentity</emphasis> option is set to <emphasis>true</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis role="bold">roleModuleJNDIName</emphasis> - JNDI name of portal RoleModule. This option is <emphasis>obligatory</emphasis>
+ if <emphasis>synchronizeIdentity</emphasis> and <emphasis>synchronizeRoles</emphasis> options are set to <emphasis>true</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis role="bold">membershipModuleJNDIName</emphasis> - JNDI name of portal MembershipModule. This option is <emphasis>obligatory</emphasis>
+ if <emphasis>synchronizeIdentity</emphasis> and <emphasis>synchronizeRoles</emphasis> options are set to <emphasis>true</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis role="bold">userProfileModuleJNDIName</emphasis> - JNDI name of portal UserProfileModule. This option is <emphasis>obligatory</emphasis>
+ if <emphasis>synchronizeIdentity</emphasis> option is set to <emphasis>true</emphasis>
+ </listitem>
+ <listitem>
+ <emphasis role="bold">synchronizeIdentity</emphasis> - if set to <emphasis>true</emphasis> module will check if
+ successfully authenticated user exist in portal and if not it will try to create it. If user exists module will update its password
+ to the one that was just validated.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">synchronizeRoles</emphasis> - if set to <emphasis>true</emphasis> module will iterate over all roles assigned to
+ authenticated user and for each it will try to check if such role exists in portal and if not it will try to create it. This option is
+ checked only if <emphasis>synchronizeIdentity</emphasis> is set to true;
+ </listitem>
+ <listitem>
+ <emphasis role="bold">additionalRole</emphasis> - module will add this role name to the group of principals assigned to the authenticated user.
+ </listitem>
+ <listitem>
+ <emphasis role="bold">defaultAssignedRole</emphasis> - if <emphasis>synchronizeIdentity</emphasis> is set to true, module will try to assign
+ portal role with such name to the authenticated user. If such role doesn't exist in portal, module will try to create it.
+ </listitem>
+ </itemizedlist>
+ For obvious reasons this is designed to use with portal identity modules configured with DB and not LDAP</para>
+ </sect2>
+ <sect2>
+ <title>SynchronizingLdapExtLoginModule</title>
+ <para>All options that apply for <emphasis>SynchronizingLdapLoginModule</emphasis> also apply here. It's the same kind of wrapper
+ made around <ulink url="http://wiki.jboss.org/wiki/Wiki.jsp?page=LdapExtLoginModule">LdapExtLoginModule</ulink> from JBossSX.
+ Sample configuration can look like this:</para>
+ <programlisting><![CDATA[
+
+ <login-module code="org.jboss.portal.identity.auth.SynchronizingLDAPExtLoginModule" flag="required">
+ <module-option name="synchronizeIdentity">true</module-option>
+ <module-option name="synchronizeRoles">true</module-option>
+ <module-option name="additionalRole">Authenticated</module-option>
+ <module-option name="defaultAssignedRole">User</module-option>
+ <module-option name="userModuleJNDIName">java:/portal/UserModule</module-option>
+ <module-option name="roleModuleJNDIName">java:/portal/RoleModule</module-option>
+ <module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
+ <module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
+ <module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
+ <module-option name="java.naming.provider.url">ldap://example.com:10389/</module-option>
+ <module-option name="java.naming.security.authentication">simple</module-option>
+ <module-option name="bindDN">cn=Directory Manager</module-option>
+ <module-option name="bindCredential">secret</module-option>
+ <module-option name="baseCtxDN">ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
+ <module-option name="baseFilter">(uid={0})</module-option>
+ <module-option name="rolesCtxDN">ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
+ <module-option name="roleFilter">(member={1})</module-option>
+ <module-option name="roleAttributeID">cn</module-option>
+ <module-option name="roleRecursion">-1</module-option>
+ <module-option name="searchTimeLimit">10000</module-option>
+ <module-option name="searchScope">SUBTREE_SCOPE</module-option>
+ <module-option name="allowEmptyPasswords">false</module-option>
+ </login-module>
+ </mbean>]]>
+ </programlisting>
+ </sect2>
+ </sect1>
</chapter>
19 years, 2 months
JBoss Portal SVN: r6348 - trunk/core/src/resources/portal-core-sar/conf.
by portal-commits＠lists.jboss.org
Author: bdaw
Date: 2007-02-19 16:19:20 -0500 (Mon, 19 Feb 2007)
New Revision: 6348
Modified:
trunk/core/src/resources/portal-core-sar/conf/login-config.xml
Log:
- remove credentials
Modified: trunk/core/src/resources/portal-core-sar/conf/login-config.xml
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-19 20:39:08 UTC (rev 6347)
+++ trunk/core/src/resources/portal-core-sar/conf/login-config.xml 2007-02-19 21:19:20 UTC (rev 6348)
@@ -71,10 +71,10 @@
<module-option name="membershipModuleJNDIName">java:/portal/MembershipModule</module-option>
<module-option name="userProfileModuleJNDIName">java:/portal/UserProfileModule</module-option>
<module-option name="java.naming.factory.initial">com.sun.jndi.ldap.LdapCtxFactory</module-option>
- <module-option name="java.naming.provider.url">ldap://dev39.qa.atl.jboss.com:10389/</module-option>
+ <module-option name="java.naming.provider.url">ldap://example.com:10389/</module-option>
<module-option name="java.naming.security.authentication">simple</module-option>
<module-option name="bindDN">cn=Directory Manager</module-option>
- <module-option name="bindCredential">qpq123qpq</module-option>
+ <module-option name="bindCredential">lolo</module-option>
<module-option name="baseCtxDN">ou=People,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
<module-option name="baseFilter">(uid={0})</module-option>
<module-option name="rolesCtxDN">ou=Roles,o=test,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</module-option>
19 years, 2 months
JBoss Portal SVN: r6347 - in trunk: cms and 5 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-02-19 15:39:08 -0500 (Mon, 19 Feb 2007)
New Revision: 6347
Modified:
trunk/build/build-thirdparty.xml
trunk/cms/build.xml
trunk/core-cms/build.xml
trunk/core-management/build.xml
trunk/core-search/build.xml
trunk/core/build.xml
trunk/workflow/build.xml
Log:
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/build/build-thirdparty.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -110,7 +110,7 @@
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="xdoclet" version="1.2.3"/>
- <componentref name="jbpm" version="3.1.2"/>
+ <componentref name="jbpm/jaronly" version="3.1.2"/>
</build>
Modified: trunk/cms/build.xml
===================================================================
--- trunk/cms/build.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/cms/build.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -111,7 +111,7 @@
<path refid="jgroups.jgroups.classpath"/>
<path refid="sun.servlet.classpath"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/core/build.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -114,7 +114,7 @@
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
<!-- Configure modules -->
Modified: trunk/core-cms/build.xml
===================================================================
--- trunk/core-cms/build.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/core-cms/build.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -114,7 +114,7 @@
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
<!-- Configure modules -->
@@ -266,8 +266,8 @@
<!-- workflow service -->
<copy todir="${build.resources}/portal-cms/portal-workflow.sar">
<fileset dir="${jboss.portal-workflow.root}/lib" includes="portal-workflow-lib.jar"/>
- <fileset dir="${jbpm.jbpm.lib}" includes="jbpm-3.1.2.jar"/>
- <fileset dir="${jbpm.jbpm.lib}" includes="jbpm-identity-3.1.2.jar"/>
+ <fileset dir="${jbpm.jaronly.lib}" includes="jbpm.jar"/>
+ <fileset dir="${jbpm.jaronly.lib}" includes="jbpm-identity.jar"/>
<fileset dir="${jboss.portal-workflow.root}/resources/portal-workflow-sar"/>
</copy>
<!-- this war file is not needed for now -->
Modified: trunk/core-management/build.xml
===================================================================
--- trunk/core-management/build.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/core-management/build.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -114,7 +114,7 @@
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
<!-- Configure modules -->
Modified: trunk/core-search/build.xml
===================================================================
--- trunk/core-search/build.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/core-search/build.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -114,7 +114,7 @@
<path refid="qdox.qdox.classpath"/>
<pathelement location="${source.etc}/sun-jsf/jsf-example.jar"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
<!-- Configure modules -->
Modified: trunk/workflow/build.xml
===================================================================
--- trunk/workflow/build.xml 2007-02-19 20:36:42 UTC (rev 6346)
+++ trunk/workflow/build.xml 2007-02-19 20:39:08 UTC (rev 6347)
@@ -102,7 +102,7 @@
<path refid="jbossas/core.libs.classpath"/>
<path refid="sun.servlet.classpath"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
</path>
@@ -248,7 +248,7 @@
<path refid="antlr.antlr.classpath"/>
<path refid="jbossas/core.libs.classpath"/>
<!-- jbpm integration -->
- <path refid="jbpm.jbpm.classpath"/>
+ <path refid="jbpm.jaronly.classpath"/>
<pathelement location="${build.lib}/portal-workflow-lib.jar"/>
<pathelement location="${build.resources}/test"/>
</x-classpath>
19 years, 2 months
JBoss Portal SVN: r6346 - trunk/build/ide/intellij/idea60/modules/core-admin.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-19 15:36:42 -0500 (Mon, 19 Feb 2007)
New Revision: 6346
Modified:
trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml
Log:
update core-admin project def
Modified: trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-02-19 20:36:03 UTC (rev 6345)
+++ trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-02-19 20:36:42 UTC (rev 6346)
@@ -89,6 +89,7 @@
</library>
</orderEntry>
<orderEntry type="module" module-name="format" />
+ <orderEntry type="module" module-name="portlet-federation" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
19 years, 2 months