November 2007 - portal-commits - Jboss List Archives

JBoss Portal SVN: r8928 - in modules/portlet/branches/JBP_PORTLET_BRANCH_1_0: portlet/src/main/org/jboss/portal/portlet/impl/spi and 7 other directories.

by portal-commits＠lists.jboss.org

Author: julien(a)jboss.com Date: 2007-11-14 14:07:53 -0500 (Wed, 14 Nov 2007) New Revision: 8928 Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java Log: fix more SequenceBuilder migration issues Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/jboss-portal-portlet.ipr 2007-11-14 19:07:53 UTC (rev 8928) @@ -131,7 +131,7 @@ </component> <component name="MavenBuildProjectComponent"> <option name="mavenExecutable" value="" /> - <option name="Settings File" value="" /> + <option name="Settings File" value="/Users/julien/.m2/settings.xml" /> <option name="mavenCommandLineParams" value="" /> <option name="vmOptions" value="" /> <option name="useMavenEmbedder" value="false" /> Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/impl/spi/AbstractPortalContext.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -39,10 +39,10 @@ { /** . */ - private static final Set ALL_WINDOW_STATES = Collections.unmodifiableSet(new CollectionBuilder().add(WindowState.MAXIMIZED).add(WindowState.MINIMIZED).add(WindowState.NORMAL).toHashSet()); + private static final Set ALL_WINDOW_STATES = Collections.unmodifiableSet((Set)CollectionBuilder.hashSet().add(WindowState.MAXIMIZED).add(WindowState.MINIMIZED).add(WindowState.NORMAL).get()); /** . */ - private static final Set ALL_MODES = Collections.unmodifiableSet(new CollectionBuilder().add(Mode.EDIT).add(Mode.HELP).add(Mode.VIEW).toHashSet()); + private static final Set ALL_MODES = Collections.unmodifiableSet((Set)CollectionBuilder.hashSet().add(Mode.EDIT).add(Mode.HELP).add(Mode.VIEW).get()); /** . */ private final Set windowStates; Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/portlet/support/info/SecurityInfoSupport.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -45,7 +45,7 @@ public SecurityInfoSupport() { - this(new CollectionBuilder().add(TransportGuarantee.NONE).toHashSet()); + this((Set)CollectionBuilder.hashSet().add(TransportGuarantee.NONE).get()); } public boolean containsTransportGuarantee(TransportGuarantee transportGuarantee) Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/common/AbstractCacheSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -154,7 +154,7 @@ calls.add("2_render"); // - Set expected = new CollectionBuilder().add("0").add("1").add("2_action").add("2_render").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("1").add("2_action").add("2_render").get(); assertEquals(expected, calls); // End test @@ -305,7 +305,7 @@ { protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException { - Set expected = new CollectionBuilder().add("0").add("2_action").add("2_render").add("3").add("5_action").add("5_render").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("2_action").add("2_render").add("3").add("5_action").add("5_render").get(); assertEquals(expected, calls); // Refresh @@ -379,7 +379,7 @@ calls.add("2_render"); // - Set expected = new CollectionBuilder().add("0").add("2_action").add("2_render").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("2_action").add("2_render").get(); assertEquals(expected, calls); // End test Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/dispatcher/DispatcherSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -153,7 +153,7 @@ assertNotNull(prd); ServletFilter.ids.clear(); prd.include(request, response); - assertEquals(new CollectionBuilder().add("INCLUDE_URL_PATTERN_FILTER").add("INCLUDE_NAMED_FILTER").toHashSet(), ServletFilter.ids); + assertEquals(CollectionBuilder.hashSet().add("INCLUDE_URL_PATTERN_FILTER").add("INCLUDE_NAMED_FILTER").get(), ServletFilter.ids); // prd = request.getPortletSession().getPortletContext().getNamedDispatcher("NoopServlet"); Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/expiringcache/ExpiringCacheSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -253,7 +253,7 @@ calls.add("7"); // - Set expected = new CollectionBuilder().add("0").add("3").add("4").add("7").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("3").add("4").add("7").get(); assertEquals(expected, calls); // Refresh Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/jsr168/ext/nocache/NoCacheSequenceBuilder.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -217,7 +217,7 @@ protected DriverResponse run(Portlet portlet, RenderRequest request, RenderResponse response, PortletTestContext context) throws IOException, PortletException { // - Set expected = new CollectionBuilder().add("0").add("1").add("2").add("5").add("6_render").add("6_action").toHashSet(); + Set expected = (Set)CollectionBuilder.hashSet().add("0").add("1").add("2").add("5").add("6_render").add("6_action").get(); assertEquals(expected, calls); // Refresh Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/portlet/src/main/org/jboss/portal/test/portlet/state/AbstractStatefulPortletInvokerTestCase.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -606,7 +606,7 @@ ValueMapAssert.assertEquals(expectedProps, props); // - props = getProperties(popCtx, new CollectionBuilder().add("abc").add("mno").toHashSet()); + props = getProperties(popCtx, (Set)CollectionBuilder.linkedList().add("abc").add("mno").get()); expectedProps = new SimplePropertyMap(); expectedProps.setProperty("abc", new StringValue("def")); ValueMapAssert.assertEquals(expectedProps, props); @@ -639,7 +639,7 @@ ValueMapAssert.assertEquals(expectedProps, props); // - props = getProperties(ccpCtx, new CollectionBuilder().add("abc").add("mno").add("yz").toHashSet()); + props = getProperties(ccpCtx, (Set)CollectionBuilder.hashSet().add("abc").add("mno").add("yz").get()); expectedProps = new SimplePropertyMap(); expectedProps.setProperty("abc", new StringValue("_def")); expectedProps.setProperty("mno", new StringValue("pqr")); Modified: modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java =================================================================== --- modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-14 16:33:10 UTC (rev 8927) +++ modules/portlet/branches/JBP_PORTLET_BRANCH_1_0/test/src/main/org/jboss/portal/portlet/test/PortletApplicationDeployment.java 2007-11-14 19:07:53 UTC (rev 8928) @@ -45,6 +45,7 @@ import org.jboss.beans.metadata.plugins.AbstractPropertyMetaData; import org.jboss.beans.metadata.plugins.AbstractInstallMetaData; import org.jboss.beans.metadata.plugins.ThisValueMetaData; +import org.jboss.beans.metadata.spi.ParameterMetaData; import org.apache.log4j.Logger; import javax.servlet.ServletContext; @@ -102,10 +103,10 @@ String portletContainerId = "PortletContainer[" + webApp.getContextPath() + "," + portletMetaData.getName() + "]"; AbstractBeanMetaData bmd = new AbstractBeanMetaData(portletContainerId, PortletContainerImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); - ctormd.setParameters(new CollectionBuilder(). + ctormd.setParameters((List)CollectionBuilder.arrayList(). add(new AbstractParameterMetaData(PortletMetaData.class.getName(), portletMetaData)). add(new AbstractParameterMetaData(JBossPortletMetaData.class.getName(), (Object)null)). - toArrayList()); + get()); bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop")); @@ -118,7 +119,7 @@ applicationinstallmd.setBean(id); applicationinstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); applicationinstallmd.setMethodName("addContainer"); - bmd.setInstalls(new CollectionBuilder().add(deployerinstallmd).add(applicationinstallmd).toArrayList()); + bmd.setInstalls((List)CollectionBuilder.arrayList().add(deployerinstallmd).add(applicationinstallmd).get()); AbstractInstallMetaData deployeruninstallmd = new AbstractInstallMetaData(); deployeruninstallmd.setBean("PortletApplicationDeployer"); deployeruninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); @@ -127,7 +128,7 @@ applicationuninstallmd.setBean(id); applicationuninstallmd.setParameters(Collections.singletonList(new AbstractParameterMetaData(new ThisValueMetaData()))); applicationuninstallmd.setMethodName("removeContainer"); - bmd.setUninstalls(new CollectionBuilder().add(deployeruninstallmd).add(applicationuninstallmd).toArrayList()); + bmd.setUninstalls((List)CollectionBuilder.arrayList().add(deployeruninstallmd).add(applicationuninstallmd).get()); try { KernelControllerContext portletContainerControllerContext = kernel.getController().install(bmd); @@ -142,13 +143,13 @@ // AbstractBeanMetaData bmd = new AbstractBeanMetaData(id, PortletApplicationImpl.class.getName()); AbstractConstructorMetaData ctormd = new AbstractConstructorMetaData(); - ctormd.setParameters(new CollectionBuilder(). + ctormd.setParameters((List)CollectionBuilder.arrayList(). add(new AbstractParameterMetaData(PortletApplicationMetaData.class.getName(), metaData)). add(new AbstractParameterMetaData(JBossApplicationMetaData.class.getName(), (Object)null)). add(new AbstractParameterMetaData(PortletApplicationContext.class.getName(), this)). add(new AbstractParameterMetaData(PortletAPIFactory.class.getName(), new AbstractDependencyValueMetaData("PortletAPIFactory"))). add(new AbstractParameterMetaData(PortletInfoFactory.class.getName(), new AbstractDependencyValueMetaData("PortletInfoFactory"))). - toArrayList()); + get()); bmd.setConstructor(ctormd); bmd.setStart(new AbstractLifecycleMetaData("start")); bmd.setStop(new AbstractLifecycleMetaData("stop"));

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8927 - in modules/identity/trunk: build and 47 other directories.

by portal-commits＠lists.jboss.org

Author: bdaw Date: 2007-11-14 11:33:10 -0500 (Wed, 14 Nov 2007) New Revision: 8927 Added: modules/identity/trunk/identity/pom.xml modules/identity/trunk/identity/src/example/ modules/identity/trunk/identity/src/main/java/ modules/identity/trunk/identity/src/main/java/org/ modules/identity/trunk/identity/src/main/java/org/jboss/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/config/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/helper/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/info/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/management/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/metadata/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/ modules/identity/trunk/identity/src/main/resources/ modules/identity/trunk/identity/src/main/resources/dtd/ modules/identity/trunk/identity/src/main/resources/hibernate/ modules/identity/trunk/identity/src/test/ modules/identity/trunk/identity/src/test/java/ modules/identity/trunk/identity/src/test/java/org/ modules/identity/trunk/identity/src/test/java/org/jboss/ modules/identity/trunk/identity/src/test/java/org/jboss/portal/ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ modules/identity/trunk/identity/src/test/resources/ modules/identity/trunk/identity/src/test/resources/config/ modules/identity/trunk/identity/src/test/resources/config/db-config.xml modules/identity/trunk/identity/src/test/resources/config/extrole/ modules/identity/trunk/identity/src/test/resources/config/extuser/ modules/identity/trunk/identity/src/test/resources/config/identity/ modules/identity/trunk/identity/src/test/resources/config/msad-config.xml modules/identity/trunk/identity/src/test/resources/config/opends-config.xml modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml modules/identity/trunk/identity/src/test/resources/config/profile-config.xml modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml modules/identity/trunk/identity/src/test/resources/config/staticgroup/ modules/identity/trunk/identity/src/test/resources/config/staticrole/ modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml modules/identity/trunk/identity/src/test/resources/datasources/ modules/identity/trunk/identity/src/test/resources/datasources/databases.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-extrolemodule.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-extusermodule.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-identity.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-simplerolemodule.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-simpleusermodule.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-staticgroupmembership.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-staticrolemembership.xml modules/identity/trunk/identity/src/test/resources/datasources/directories-userprofilemodule.xml modules/identity/trunk/identity/src/test/resources/datasources/directories.xml modules/identity/trunk/identity/src/test/resources/datasources/hibernates.xml modules/identity/trunk/identity/src/test/resources/hibernate/ modules/identity/trunk/identity/src/test/resources/hibernate/domain.hbm.xml modules/identity/trunk/identity/src/test/resources/jboss-unit.xml modules/identity/trunk/identity/src/test/resources/ldif/ modules/identity/trunk/identity/src/test/resources/org/ modules/identity/trunk/identity/src/test/resources/org/jboss/ modules/identity/trunk/sso/pom.xml modules/identity/trunk/sso/src/main/java/ modules/identity/trunk/sso/src/main/java/org/ modules/identity/trunk/sso/src/main/java/org/jboss/ modules/identity/trunk/sso/src/main/java/org/jboss/portal/ modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity/ modules/identity/trunk/sso/src/main/resources/ modules/identity/trunk/sso/src/test/ modules/identity/trunk/sso/src/test/java/ modules/identity/trunk/sso/src/test/java/org/ modules/identity/trunk/sso/src/test/java/org/jboss/ modules/identity/trunk/sso/src/test/java/org/jboss/portal/ modules/identity/trunk/sso/src/test/java/org/jboss/portal/test/ modules/identity/trunk/sso/src/test/resources/ Removed: modules/identity/trunk/build/.cvsignore modules/identity/trunk/build/.project modules/identity/trunk/build/build.bat modules/identity/trunk/build/build.sh modules/identity/trunk/build/build.xml modules/identity/trunk/build/distrib.xml modules/identity/trunk/build/etc/ modules/identity/trunk/identity/.classpath modules/identity/trunk/identity/.cvsignore modules/identity/trunk/identity/.project modules/identity/trunk/identity/build.bat modules/identity/trunk/identity/build.sh modules/identity/trunk/identity/build.xml modules/identity/trunk/identity/src/etc/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/config/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/helper/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/info/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/management/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/metadata/ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service/ modules/identity/trunk/identity/src/main/org/ modules/identity/trunk/identity/src/main/resources/hibernate/domain-identity.hbm.xml modules/identity/trunk/identity/src/resources/ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ modules/identity/trunk/identity/src/test/resources/config/db-config.xml modules/identity/trunk/identity/src/test/resources/config/extrole/ modules/identity/trunk/identity/src/test/resources/config/extuser/ modules/identity/trunk/identity/src/test/resources/config/identity/ modules/identity/trunk/identity/src/test/resources/config/msad-config.xml modules/identity/trunk/identity/src/test/resources/config/opends-config.xml modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml modules/identity/trunk/identity/src/test/resources/config/profile-config.xml modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml modules/identity/trunk/identity/src/test/resources/config/staticgroup/ modules/identity/trunk/identity/src/test/resources/config/staticrole/ modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml modules/identity/trunk/identity/src/test/resources/org/jboss/ modules/identity/trunk/sso/build.bat modules/identity/trunk/sso/build.sh modules/identity/trunk/sso/src/main/org/ modules/identity/trunk/testsuite/ modules/identity/trunk/tools/ Modified: modules/identity/trunk/build/ide/intellij/idea60/modules/identity/identity.iml modules/identity/trunk/build/ide/intellij/idea60/modules/sso/sso.iml modules/identity/trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml modules/identity/trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml modules/identity/trunk/build/ide/intellij/idea60/modules/tools/tools.iml modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/GenericTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/IdentityTestPOJO.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPGenericTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTest.java modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java modules/identity/trunk/identity/src/test/resources/config/extrole/opends-config.xml modules/identity/trunk/identity/src/test/resources/config/extrole/openldap-config.xml modules/identity/trunk/identity/src/test/resources/config/extrole/rhds-config.xml modules/identity/trunk/identity/src/test/resources/config/extrole/sunds-config.xml modules/identity/trunk/identity/src/test/resources/config/extuser/opends-config.xml modules/identity/trunk/identity/src/test/resources/config/extuser/openldap-config.xml modules/identity/trunk/identity/src/test/resources/config/extuser/rhds-config.xml modules/identity/trunk/identity/src/test/resources/config/extuser/sunds-config.xml modules/identity/trunk/identity/src/test/resources/config/identity/opends-config-staticrole.xml modules/identity/trunk/identity/src/test/resources/config/identity/opends-config.xml modules/identity/trunk/identity/src/test/resources/config/identity/openldap-config.xml modules/identity/trunk/identity/src/test/resources/config/identity/rhds-config-staticrole.xml modules/identity/trunk/identity/src/test/resources/config/identity/rhds-config.xml modules/identity/trunk/identity/src/test/resources/config/identity/sunds-config-staticrole.xml modules/identity/trunk/identity/src/test/resources/config/identity/sunds-config.xml modules/identity/trunk/identity/src/test/resources/config/staticgroup/rhds-config-nonDNMember.xml modules/identity/trunk/identity/src/test/resources/config/staticrole/opends-config.xml modules/identity/trunk/identity/src/test/resources/config/staticrole/rhds-config-nonDNMember.xml modules/identity/trunk/identity/src/test/resources/config/staticrole/rhds-config.xml modules/identity/trunk/identity/src/test/resources/config/staticrole/sunds-config.xml modules/identity/trunk/identity/src/test/resources/org/jboss/portal/test/identity/db-beans.xml modules/identity/trunk/identity/src/test/resources/org/jboss/portal/test/identity/ldap-beans.xml Log: initial identity module mavanization - not fully done and cleaned up yet Deleted: modules/identity/trunk/build/.cvsignore =================================================================== --- modules/identity/trunk/build/.cvsignore 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/.cvsignore 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,3 +0,0 @@ -build.log -local.properties -build.iml Deleted: modules/identity/trunk/build/.project =================================================================== --- modules/identity/trunk/build/.project 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/.project 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>build</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> Deleted: modules/identity/trunk/build/build.bat =================================================================== --- modules/identity/trunk/build/build.bat 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/build.bat 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com> -rem - -rem $Id: build.bat 2 2005-01-14 23:01:32Z vietj $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/identity/trunk/build/build.sh =================================================================== --- modules/identity/trunk/build/build.sh 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/build.sh 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com> -## - -# $Id: build.sh 2 2005-01-14 23:01:32Z vietj $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/identity/trunk/build/build.xml =================================================================== --- modules/identity/trunk/build/build.xml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/build.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,406 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE project [ - - <!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent"> - <!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent"> - <!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent"> - - - ]> - - - - - - - - - - - - - -<project default="main" name="JBoss Portal"> - -  -  -  -  -  -  -  -  - - &buildmagic; - &modules; - &defaults; - -  -  -  -  -  -  - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - - -  -  -  -  -  -  - - <target name="configure" unless="configure.disable"> - -  -  -  - - <property name="version.major" value="1"/> - <property name="version.minor" value="0"/> - <property name="version.revision" value="0"/> - <property name="version.tag" value="GA"/> - <property name="version.name" value=""/> - -  - <property name="version.cvstag" value="HEAD"/> - -  - <property name="module.version" - value="${version.major}.${version.minor}.${version.revision}${version.tag}"/> - -  -  -  - -  - - <path id="library.classpath"> - </path> - -  - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> -  - </path> - -  -  -  - -  - - <call target="configure-defaults"/> - -  -  -  - -  -  -  - -  - <property name="groups" value="default"/> - -  - <moduleconfig property="modules" selected="${groups}"> - -  - - <module name="identity"/> - <module name="sso"/> - -  - - <group name="portal"> - <include - modules="identity, sso"/> - </group> - - <group name="default"> - <include groups="portal"/> - </group> - - </moduleconfig> - -  - <call target="configure-project"/> - - </target> - <target name="modules-all" depends="_buildmagic:modules:all"/> - <target name="modules-most" depends="_buildmagic:modules:most"/> - <target name="modules-main" depends="_buildmagic:modules:main"/> - <target name="modules-release" depends="_buildmagic:modules:release"/> - <target name="modules-tests" depends="_buildmagic:modules:tests"/> - <target name="modules-clean" depends="_buildmagic:modules:clean"/> - <target name="modules-clobber" depends="_buildmagic:modules:clobber"/> - <target name="modules-package-tests" depends="_buildmagic:modules:package-tests"/> - -  -  -  -  -  -  - -  - - -  -  -  -  -  -  -  - - <target name="compile"/> - -  -  -  -  -  -  -  - - <target name="output" - description="Generate all target output." - depends="init"> -  - </target> - -  -  -  -  -  - - <target name="docs"> - <ant antfile="build-targets.xml" target="_default:docs"/> -  - </target> - -  -  -  - - <target name="release" - description="Builds the default release structure." - depends="modules-most, output"/> - - <target name="release-full" - description="Builds the full release structure." - depends="modules-all, release"/> - -  -  -  -  -  - - <target name="clean" depends="createthirdparty, modules-clean, _buildmagic:clean" - description="Cleans up most generated files."> -  - </target> - - <target name="clobber" depends="_buildmagic:clobber, clean, modules-clobber" - description="Cleans up all generated files."> -  - </target> - - <target name="main" depends="most" - description="Executes the default target (most)."/> - - <target name="all" depends="createthirdparty, modules-all" - description="Executes all modules and builds everything."/> - - <target name="most" depends="createthirdparty, modules-most" - description="Executes all modules and builds most everything."/> - - <target name="help" depends="_buildmagic:help:build" - description="Show this help message."/> - -  - -  -  -  - -  -  -  - - <target name="deploy" - description="Deploy." - depends="main"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" - overwrite="true"/> - </target> - - <target name="undeploy" - description="Undeploy." - depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> - </target> - - <target name="deploy-all" - description="Deploy all archives." - depends="most"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <copy file="../core/output/lib/jboss-portal.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-admin/output/lib//portal-admin.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-cms/output/lib/portal-cms.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-management/output/lib/portal-management.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-basic-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-news-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-jsp-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-weather-samples.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../core-samples/output/lib/portal-users-samples.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> -  - <copy file="../widget/output/lib/widget.war" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - <copy file="../wsrp/output/lib/portal-wsrp.sar" todir="${jboss.home}/server/${portal.deploy.dir}" overwrite="true"/> - </target> - - <target name="undeploy-all" - description="Undeploy all archives." - depends="init"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/jboss-portal.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-admin.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-cms.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-management.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-basic-samples.sar"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-news-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-jsp-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-weather-samples.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-users-samples.sar"/> -  - <delete file="${jboss.home}/server/${portal.deploy.dir}/widget.war"/> - <delete file="${jboss.home}/server/${portal.deploy.dir}/portal-wsrp.sar"/> - </target> - - <target name="exploded-deploy" - description="Deploy exploded sar." - depends="main"> - <require file="${jboss.home}/server/${portal.deploy.dir}"/> - <delete dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> - <mkdir dir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"/> - <copy todir="${jboss.home}/server/${portal.deploy.dir}/jboss-portal-exploded.sar"> - <fileset dir="../core/output/resources/jboss-portal.sar"/> - </copy> - </target> - - <target name="javadoc"> - <mkdir dir="javadoc"/> - <javadoc destdir="javadoc"> - <classpath> - <fileset dir="../thirdparty" includes="**/*.jar"/> - </classpath> - <packageset dir="../server/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../api/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../portlet/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../portlet-server/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../jems/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../identity/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../bridge/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../faces/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../portlet-federation/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../format/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../theme/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../cms/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../core/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../core-admin/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../core-cms/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../core-management/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../security/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../wsrp/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../wsrp/src/generated"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../registration/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../widget/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../workflow/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../search/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../core-samples/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - <packageset dir="../core-search/src/main"> - <exclude name="org/jboss/portal/test/**"/> - </packageset> - </javadoc> - </target> - -  -  -  - <target name="createthirdparty" unless="inhibit.downloads" - depends="check.inhibit.downloads"> - <ant antfile="build-thirdparty.xml" target="generate-lib-file"/> - </target> - -  - <target name="check.inhibit.downloads"> - <condition property="inhibit.downloads"> - <or> - <uptodate property="dependencies.current" - srcfile="build-thirdparty.xml" - targetfile="../thirdparty/libraries.ent"/> - <istrue value="${nodownload}"/> - </or> - </condition> - </target> - -</project> Deleted: modules/identity/trunk/build/distrib.xml =================================================================== --- modules/identity/trunk/build/distrib.xml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/distrib.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,398 +0,0 @@ -<project default="main" name="JBoss Portal"> - - <property name="source.dir" value="../../jboss-portal-2.6"/> - <property name="docs.dir" value="${source.dir}-docs"/> - <property name="release.version" value="2.6.1.GA"/> - -  - <property name="portal.release.normal.name" value="jboss-portal-${release.version}"/> - <property name="portal.release.ha.name" value="jboss-portal-ha-${release.version}"/> - -  - <property name="portal.build.src" value="output/${portal.release.normal.name}-src"/> - <property name="portal.build.normal.bin" value="output/${portal.release.normal.name}"/> - <property name="portal.build.ha.bin" value="output/${portal.release.ha.name}"/> - <property name="portal.build.normal.bundled" value="output/${portal.release.normal.name}-bundled"/> - <property name="portal.build.ha.bundled" value="output/${portal.release.ha.name}-bundled"/> - - <property environment="env"/> - - <target name="init" unless="jboss.home"> - <property name="jboss.home" value="${env.JBOSS_HOME}"/> - <echo message="Using JBoss install from $JBOSS_HOME: ${jboss.home}"/> - </target> - -  -  - <target name="licenses"> - <fileset id="thirdparty-licenses" dir="../thirdparty/licenses"> - <include name="antlr.txt"/> - <include name="apache-2.0.txt"/> - <include name="bsd.txt"/> - <include name="cddl.txt"/> - <include name="cpl-1.0/txt"/> - <include name="day-jcr.txt"/> - <include name="dom4j.txt"/> - <include name="ehcache.txt"/> - <include name="gpl.txt"/> - <include name="hsqldb.txt"/> - <include name="httpunit.txt"/> - <include name="ironsmith.txt"/> - <include name="lgpl.txt"/> - <include name="nekohtml.txt"/> - <include name="oswego.txt"/> - <include name="public-domain.txt"/> - <include name="slf4j.txt"/> - <include name="sun-jaf.txt"/> - <include name="sun-javamail.txt"/> - <include name="xdoclet.txt"/> - </fileset> - <mkdir dir="output/docs/licenses"/> - <concat destfile="output/docs/licenses/thirdparty-licenses.txt"> - <fileset refid="thirdparty-licenses"/> - </concat> - <copy todir="output/docs/licenses"> - <fileset refid="thirdparty-licenses"/> - <fileset dir="licences" includes="JBossEULA.txt"/> - </copy> - </target> - -  - <target name="_normal.build" depends="init" unless="normal.build.done"> - <ant dir="${source.dir}/build" antfile="build.xml"/> - -  - <property name="normal.build.done" value="true"/> - </target> - -  - <target name="source.build" depends="_normal.build"> -  - <ant dir="${source.dir}/core" antfile="build.xml" target="output-ha"/> - <ant dir="${source.dir}/core-cms" antfile="build.xml" target="output-ha"/> - -  - <ant dir="${source.dir}/core" antfile="build.xml" target="datasource"> -  - <property name="/" value="${/}"/> - </ant> - - <ant dir="${source.dir}/wsrp" antfile="build.xml" target="output"/> - <ant dir="${source.dir}/wsrp" antfile="build.xml" target="explode"/> - </target> - -  - <target name="doc.build" depends="_normal.build" unless="no-doc"> - <ant dir="${docs.dir}/referenceGuide" antfile="build.xml"/> - <ant dir="${docs.dir}/userGuide" antfile="build.xml"/> - <ant dir="${docs.dir}/quickstartuser" antfile="build.xml"/> - </target> - -  - <target name="build" depends="source.build,doc.build"/> - - -  - - <target name="package-doc"> - <sequential> - <mkdir dir="${todir}"/> - <mkdir dir="${todir}/referenceGuide"/> - <copy todir="${todir}/referenceGuide"> - <fileset dir="${docs.dir}/referenceGuide/build/en/"/> - </copy> - <mkdir dir="${todir}/userGuide"/> - <copy todir="${todir}/userGuide"> - <fileset dir="${docs.dir}/userGuide/build/en/"/> - </copy> - <mkdir dir="${todir}/quickstartuser"/> - <copy todir="${todir}/quickstartuser"> - <fileset dir="${docs.dir}/quickstartuser/build/en/"/> - </copy> - </sequential> - </target> - - <target name="package-ds"> - <sequential> - <mkdir dir="${todir}"/> - <copy todir="${todir}"> - <fileset dir="${source.dir}/core/output/resources/setup" includes="portal-*-ds.xml"/> - </copy> - </sequential> - </target> - - <target name="package-samples"> - <sequential> - <mkdir dir="${todir}"/> - <copy todir="${todir}"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-basic-samples.sar/**"/> - </copy> - <copy file="${docs.dir}/readmeFiles/samples-readme.txt" tofile="${todir}/readme.txt"/> - </sequential> - </target> - - <target name="patch-log4j"> - <patch patchfile="${source.dir}/build/etc/resources/jboss-log4j.xml.diff" - originalfile="${todir}/conf/jboss-log4j.xml" strip="1"/> - </target> - -  - <target name="package-bin" unless="no-doc"> - <sequential> - <mkdir dir="${todir}"/> - <antcall target="package-doc"> - <param name="todir" value="${todir}/docs"/> - </antcall> - <antcall target="package-ds"> - <param name="todir" value="${todir}/setup"/> - </antcall> - <antcall target="package-samples"> - <param name="todir" value="${todir}/samples"/> - </antcall> - <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> - <copy todir="${todir}/docs/portal/licenses"> - <fileset dir="output/docs/licenses"/> - </copy> - </sequential> - </target> - - <target name="package-bundled" unless="no-doc"> - <sequential> - <mkdir dir="${todir}"/> - <antcall target="package-doc"> - <param name="todir" value="${todir}/docs/portal"/> - </antcall> - <antcall target="package-ds"> - <param name="todir" value="${todir}/setup"/> - </antcall> - <antcall target="package-samples"> - <param name="todir" value="${todir}/samples"/> - </antcall> - <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${todir}"/> - <copy todir="${todir}/docs/portal/licenses"> - <fileset dir="output/docs/licenses"/> - </copy> - </sequential> - </target> - -  - <target name="package"> - -  - <mkdir dir="output"/> - -  - - <mkdir dir="${portal.build.src}"/> - <antcall target="package-doc"> - <param name="todir" value="${portal.build.src}/docs"/> - </antcall> - <copy file="${docs.dir}/readmeFiles/jboss-portal-src.README" todir="${portal.build.src}"/> - <copy todir="${portal.build.src}"> - <fileset dir="${source.dir}" includes="**/*" - excludes="*/output/**,**/CVS/*,**/build.log,build/local.properties,forums/**,thirdparty/**"/> - </copy> - <copy todir="${portal.build.src}/docs/portal/licenses"> - <fileset dir="output/docs/licenses"/> - </copy> - <fixcrlf srcdir="${portal.build.src}" includes="**/*.sh" eol="lf" eof="remove"/> - <fixcrlf srcdir="${portal.build.src}" includes="**/*.bat" eol="crlf"/> - -  - - <antcall target="package-normal"/> - <antcall target="package-ha"/> - <antcall target="package-normal-bundled"/> - <antcall target="package-ha-bundled"/> - </target> - -  - - <target name="package-normal" description="package jboss-portal.sar"> - <mkdir dir="${portal.build.normal.bin}"/> - <antcall target="package-bin"> - <param name="todir" value="${portal.build.normal.bin}"/> - </antcall> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/core/output/resources/jboss-portal.sar"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-cms.sar"> - <fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar"> - <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> - <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> - </copy> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/samples"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> - </copy> - <mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"> - <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> - </copy> - </target> - -  - <target name="package-ha" description="package jboss-portal-ha.sar"> - <mkdir dir="${portal.build.ha.bin}"/> - <antcall target="package-bin"> - <param name="todir" value="${portal.build.ha.bin}"/> - </antcall> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> - <fileset dir="${source.dir}/core/output/resources/jboss-portal-ha.sar"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-cms.sar"> - <fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar"> - <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/> - <fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/> - <fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/> - </copy> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/samples"> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-jsp-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-news-samples.war/**"/> - <fileset dir="${source.dir}/core-samples/output/resources" includes="portal-weather-samples.war/**"/> - </copy> - <mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/> - <copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"> - <fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/> - </copy> - <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/> - </target> - - -  - <target name="package-normal-bundled" depends="package-normal" if="jboss.home" - description="package jboss-portal bundled with JBoss AS"> - <mkdir dir="${portal.build.normal.bundled}"/> - <antcall target="package-bundled"> - <param name="todir" value="${portal.build.normal.bundled}"/> - </antcall> - <copy todir="${portal.build.normal.bundled}/server/default/deploy/jboss-portal.sar"> - <fileset dir="${portal.build.normal.bin}/jboss-portal.sar"/> - </copy> - <copy todir="${portal.build.normal.bundled}/server/default/deploy"> - <fileset dir="${portal.build.normal.bin}/setup" includes="portal-hsqldb-ds.xml"/> - </copy> - <copy todir="${portal.build.normal.bundled}"> - <fileset dir="${jboss.home}"> - <include name="bin/**"/> - <include name="client/**"/> - <include name="docs/**"/> - <include name="lib/**"/> - <include name="server/default/**"/> - </fileset> - </copy> - <copy file="${docs.dir}/readmeFiles/jboss-portal-bin.README" todir="${portal.build.normal.bundled}"/> - <antcall target="patch-log4j"> - <param name="todir" value="${portal.build.normal.bundled}/server/default"/> - </antcall> - </target> - -  - - <target name="package-ha-bundled" depends="package-ha" if="jboss.home" - description="package jboss-portal-ha bundled with JBoss AS"> - <mkdir dir="${portal.build.ha.bundled}"/> - <antcall target="package-bundled"> - <param name="todir" value="${portal.build.ha.bundled}"/> - </antcall> - <copy todir="${portal.build.ha.bundled}/server/all/deploy/jboss-portal-ha.sar"> - <fileset dir="${portal.build.ha.bin}/jboss-portal-ha.sar"/> - </copy> - <copy todir="${portal.build.ha.bundled}"> - <fileset dir="${jboss.home}"> - <include name="bin/**"/> - <include name="client/**"/> - <include name="docs/**"/> - <include name="lib/**"/> - <include name="server/all/**"/> - </fileset> - </copy> - <copy file="${docs.dir}/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bundled}"/> - <antcall target="patch-log4j"> - <param name="todir" value="${portal.build.normal.bundled}/server/default"/> - </antcall> - - </target> - -  - <target name="zip"> - - <tar destfile="${portal.build.src}.tar.gz" - compression="gzip"> - <tarfileset prefix="${portal.release.normal.name}-src" filemode="775" dir="${portal.build.src}"/> - </tar> - <checksum file="${portal.build.src}.tar.gz"/> - - <zip destfile="${portal.build.normal.bin}.zip"> - <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bin}"/> - </zip> - <checksum file="${portal.build.normal.bin}.zip"/> - - <zip destfile="${portal.build.ha.bin}.zip"> - <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bin}"/> - </zip> - <checksum file="${portal.build.ha.bin}.zip"/> - - <zip destfile="${portal.build.normal.bundled}.zip"> - <zipfileset prefix="${portal.release.normal.name}" dir="${portal.build.normal.bundled}"/> - </zip> - <checksum file="${portal.build.normal.bin}.zip"/> - - <zip destfile="${portal.build.ha.bundled}.zip"> - <zipfileset prefix="${portal.release.ha.name}" dir="${portal.build.ha.bundled}"/> - </zip> - <checksum file="${portal.build.ha.bundled}.zip"/> - -  - </target> - -  - <target name="main" depends="licenses,build,package,zip" description="do everything - build source, doc, distro"/> -</project> Modified: modules/identity/trunk/build/ide/intellij/idea60/modules/identity/identity.iml =================================================================== --- modules/identity/trunk/build/ide/intellij/idea60/modules/identity/identity.iml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/ide/intellij/idea60/modules/identity/identity.iml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../../../../../forums/output/idea50/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$/../../../../../../identity"> - <sourceFolder url="file://$MODULE_DIR$/../../../../../../identity/src/main" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../identity/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/../../../../../../identity/src/test/java" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/../../../../../../identity/output" /> </content> <orderEntry type="inheritedJdk" /> Modified: modules/identity/trunk/build/ide/intellij/idea60/modules/sso/sso.iml =================================================================== --- modules/identity/trunk/build/ide/intellij/idea60/modules/sso/sso.iml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/ide/intellij/idea60/modules/sso/sso.iml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../../../../../sso/classes" /> <exclude-output /> Modified: modules/identity/trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml =================================================================== --- modules/identity/trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/ide/intellij/idea60/modules/testsuite/testsuite.iml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../../../../../testsuite/classes" /> <exclude-output /> Modified: modules/identity/trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml =================================================================== --- modules/identity/trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../../../../../thirdparty/classes" /> <exclude-output /> Modified: modules/identity/trunk/build/ide/intellij/idea60/modules/tools/tools.iml =================================================================== --- modules/identity/trunk/build/ide/intellij/idea60/modules/tools/tools.iml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/build/ide/intellij/idea60/modules/tools/tools.iml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<module version="4" relativePaths="true" type="JAVA_MODULE"> - <component name="ModuleRootManager" /> +<module relativePaths="true" type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/../../../../../../tools/classes" /> <exclude-output /> Deleted: modules/identity/trunk/identity/.classpath =================================================================== --- modules/identity/trunk/identity/.classpath 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/identity/.classpath 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<classpath> - <classpathentry kind="src" path="src/main"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="lib" path="/thirdparty/apache-ant/lib/ant.jar"/> - <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> - <classpathentry kind="lib" path="/tools/lib/xalan.jar"/> - <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate3.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-common.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-j2ee.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-jmx.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jbosssx.jar"/> - <classpathentry kind="lib" path="/thirdparty/jbossas/core-libs/lib/jboss-system.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-jaf/lib/activation.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> - <classpathentry combineaccessrules="false" kind="src" path="/jems"/> - <classpathentry combineaccessrules="false" kind="src" path="/test"/> - <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"/> - <classpathentry kind="lib" path="/thirdparty/jboss/microcontainer/lib/jboss-dependency.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet-api.jar"/> - <classpathentry kind="lib" path="/thirdparty/jboss-portal/modules/common/lib/portal-common-lib.jar"/> - <classpathentry kind="output" path="bin"/> -</classpath> Deleted: modules/identity/trunk/identity/.cvsignore =================================================================== --- modules/identity/trunk/identity/.cvsignore 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/identity/.cvsignore 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,2 +0,0 @@ -output -bin Deleted: modules/identity/trunk/identity/.project =================================================================== --- modules/identity/trunk/identity/.project 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/identity/.project 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>identity</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> Deleted: modules/identity/trunk/identity/build.bat =================================================================== --- modules/identity/trunk/identity/build.bat 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/identity/build.bat 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com> -rem - -rem $Id: build.bat 2001 2006-03-17 18:54:44Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/identity/trunk/identity/build.sh =================================================================== --- modules/identity/trunk/identity/build.sh 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/identity/build.sh 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com> -## - -# $Id: build.sh 2001 2006-03-17 18:54:44Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Deleted: modules/identity/trunk/identity/build.xml =================================================================== --- modules/identity/trunk/identity/build.xml 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/identity/build.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,361 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<!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"> - ]> - - - - - - - - - - - - - -<project default="main" name="JBoss Portal"> - -  -  -  -  -  -  -  -  - - &buildmagic; - &modules; - &defaults; - &tools; - &targets; - - -  -  -  - -  - - <target name="init" unless="init.disable" depends="_buildmagic:init"> - </target> - -  -  -  -  -  -  - - <target name="configure" unless="configure.disable"> - -  - <property name="jboss-junit-configuration" value=""/> - <property name="junit.formatter.usefile" value="true"/> - -  - &libraries; - <path id="library.classpath"> - <path refid="jboss.portal/modules/common.classpath"/> - <path refid="jboss.portal/modules/test.classpath"/> - <path refid="sun.servlet.classpath"/> - <path refid="jboss.microcontainer.classpath"/> - <path refid="jboss.jbossxb.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="hibernate.hibernate.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="junit.junit.classpath"/> - <path refid="apache.tomcat.classpath"/> - - <path refid="jboss/common.core.classpath"/> - <path refid="jboss/common.logging.spi.classpath"/> - <path refid="jboss.security.classpath"/> - <path refid="jboss/jboss.jacc.api.classpath"/> - <path refid="jboss/jboss.transaction.api.classpath"/> - - <path refid="jboss.aop.classpath"/> - <path refid="oswego.concurrent.classpath"/> - <path refid="sun.opends.classpath"/> - - <pathelement location="${project.tools}/lib/ant.jar"/> - - <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-lib.jar"/> - <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-mc-lib.jar"/> - - - -  - </path> - - <path id="test.classpath"> - <path location="${build.resources}/test"/> - - <path refid="library.classpath"/> - - <path refid="apache.logging.classpath"/> - <path refid="dom4j.dom4j.classpath"/> - <path refid="jboss/common.logging.jdk.classpath"/> - <path refid="jboss.aop.classpath"/> - <path refid="javassist.javassist.classpath"/> - <path refid="trove.trove.classpath"/> - <path refid="apache.xerces.classpath"/> - <path refid="asm.asm.classpath"/> - <path refid="antlr.antlr.classpath"/> - <path refid="cglib.cglib.classpath"/> - <path refid="apache.collections.classpath"/> - <path refid="jbossas/core.libs.classpath"/> - <path refid="hsqldb.hsqldb.classpath"/> - - - <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-remote-lib.jar"/> - <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-tooling-lib.jar"/> - - <pathelement location="${build.lib}/portal-identity-lib.jar"/> - <pathelement location="${build.lib}/portal-identity-test-lib.jar"/> - <pathelement location="${jboss.portal/modules/test.resources}"/> - <pathelement location="${jboss.portal/modules/test.lib}/ldap.zip"/> - <pathelement location="${build.resources}/hibernate"/> - <pathelement location="${build.resources}"/> - - </path> - - <path id="javac.classpath"> - <pathelement location="${build.classes}"/> - </path> - -  - <call target="configure-modules"/> - <path id="dependentmodule.classpath"> - </path> - -  -  -  - -  - <call target="configure-defaults"/> - <call target="configure-tools"/> - -  -  -  - <property name="javadoc.private" value="true"/> - <property name="javadoc.protected" value="false"/> - - </target> - -  -  -  -  -  -  -  - - <target name="compile" - description="Compile all source files." - depends="generate-parsers, - compile-classes, - _default:compile-etc, - _default:compile-resources"> -  - </target> - - - <target name="compile-classes" depends="_buildmagic:init"> - <mkdir dir="${build.classes}"/> - -  - <mkdir dir="${build.gen.classes}"/> - -  - <depend srcdir="${source.java}:${build.gen.classes}" - destdir="${build.classes}" - dump="${javac.depend.dump}" - closure="${javac.depend.closure}"> - <include name="${javac.includes}"/> - <exclude name="${javac.excludes}"/> - </depend> - - <javac destdir="${build.classes}" - optimize="${javac.optimize}" - target="${javac.target}" - debug="${javac.debug}" - source="${javac.source}" - depend="${javac.depend}" - verbose="${javac.verbose}" - deprecation="${javac.deprecation}" - includeAntRuntime="${javac.include.ant.runtime}" - includeJavaRuntime="${javac.include.java.runtime}" - failonerror="${javac.fail.onerror}"> - <src path="${source.java}:${build.gen.classes}"/> - <classpath refid="javac.classpath"/> - - - <include name="${javac.includes}"/> - <exclude name="${javac.excludes}"/> - </javac> - </target> - - - - <target name="generate-parsers" depends="init"> - </target> - -  -  -  -  -  -  -  - - <target name="output" - description="Generate all target output." - depends="compile"> - <mkdir dir="${build.lib}"/> - <jar jarfile="${build.lib}/portal-identity-lib.jar" manifest="${build.etc}/portal-identity-lib-jar.mf"> - <fileset dir="${build.classes}" excludes="org/jboss/portal/test/**"/> - </jar> - <copy file="${build.resources}/hibernate/domain.hbm.xml" - tofile="${build.resources}/hibernate/domain-single.hbm.xml"> - <filterset> - <filtersfile file="../build/etc/single.properties"/> - </filterset> - </copy> - <copy file="${build.resources}/hibernate/domain.hbm.xml" - tofile="${build.resources}/hibernate/domain-clustered.hbm.xml"> - <filterset> - <filtersfile file="../build/etc/clustered.properties"/> - </filterset> - </copy> - </target> - -  - <target name="package-tests" depends="init, output"> - <jar jarfile="${build.lib}/portal-identity-test-lib.jar"> - <fileset dir="${build.classes}" includes="org/jboss/portal/test/**"/> - <fileset dir="${build.resources}/portal-identity-test-jar"/> - </jar> - - <jar jarfile="${build.lib}/test-identity.sar"> - <fileset dir="${build.resources}/test-identity-sar"/> - <fileset dir="${jboss.portal/modules/test.lib}" includes="portal-test-jboss-lib.jar"/> - <fileset dir="${sun.opends.lib}" includes="OpenDS.jar"/> - <fileset dir="${sleepycat.sleepycat.lib}" includes="je.jar"/> - </jar> - - </target> - - -  -  -  - -  - <target name="clean" depends="_default:clean"> -  - </target> - -  -  -  -  -  - - <target name="docs" depends="_default:docs"> -  - </target> - -  -  -  - - <target name="main" depends="most"/> - <target name="all" depends="_default:all"/> - <target name="most" depends="_default:most"/> - <target name="help" depends="_default:help"/> - - - <target name="deploy-ldap" depends="init, package-tests" if="HAVE_JDK_1.5" > - <mkdir dir="${jboss.home}/server/default/conf/opends"/> - <unzip src="${jboss.portal/modules/test.lib}/opends.zip" dest="${jboss.home}/server/default/conf/opends" overwrite="true"/> - <copy file="${build.lib}/test-identity.sar" todir="${jboss.home}/server/${portal.deploy.dir}" failonerror="false"/> - <sleep seconds="30"/> - </target> - -  - <target name="undeploy-ldap" depends="init" if="HAVE_JDK_1.5"> - <delete file="${jboss.home}/server/${portal.deploy.dir}/test-identity.sar" failonerror="false" deleteonexit="true" quiet="true"/> - <sleep seconds="30"/> -  - </target> - - <target name="tests" depends="init"> - <antcall target="deploy-ldap"/> - <antcall target="test-identity"/> - </target> - - <target name="test-identity" depends="init, configure, package-tests"> - - <path id="jboss.unit.tooling.test.classpath"> - <pathelement location="${jboss.portal/modules/test.lib}/jboss-unit-tooling-lib.jar"/> - <path refid="library.classpath"/> - </path> - <taskdef - name="jboss-unit" - classname="org.jboss.unit.tooling.ant.JBossUnitTask" - classpathref="jboss.unit.tooling.test.classpath"/> - <jboss-unit> - - <tests config="./output/resources/test/jboss-unit.xml" suiteName="IdentityTests"> -  - </tests> - - <reports> - <xml toDir="output/tests/xml"/> - <html toDir="output/tests/html"/> - </reports> - - <classpath> - <path refid="test.classpath"/> - </classpath> - - </jboss-unit > - </target> -</project> Added: modules/identity/trunk/identity/pom.xml =================================================================== --- modules/identity/trunk/identity/pom.xml (rev 0) +++ modules/identity/trunk/identity/pom.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,286 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.identity</groupId> + <artifactId>jboss-portal-modules-identity</artifactId> + <relativePath>../build/pom.xml</relativePath> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>portal-identity</artifactId> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.portal.common</groupId> + <artifactId>jboss-portal-modules-common</artifactId> + </dependency> + <dependency> + <groupId>apache-tomcat</groupId> + <artifactId>catalina</artifactId> + </dependency> + <dependency> + <groupId>hibernate</groupId> + <artifactId>hibernate3</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.microcontainer</groupId> + <artifactId>jboss-kernel</artifactId> + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jbosssx</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit</artifactId> +  + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-mc</artifactId> +  + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>portal-test</artifactId> +  + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-logging-spi</artifactId> +  + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-logging-jdk</artifactId> +  + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-logging-log4j</artifactId> +  + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jboss-transaction</artifactId> +  + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jboss-local-jdbc</artifactId> +  + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jboss-common-jdbc-wrapper</artifactId> +  + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jboss</artifactId> +  + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jnpserver</artifactId> +  + </dependency> + <dependency> + <groupId>jboss.jbossas.core-libs</groupId> + <artifactId>jboss-jca</artifactId> +  + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> +  + </dependency> + <dependency> + <groupId>hsqldb</groupId> + <artifactId>hsqldb</artifactId> +  + </dependency> + <dependency> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> +  + </dependency> + <dependency> + <groupId>javax.transaction</groupId> + <artifactId>jta</artifactId> +  + </dependency> + <dependency> + <groupId>apache-logging</groupId> + <artifactId>commons-logging</artifactId> +  + </dependency> + <dependency> + <groupId>apache-collections</groupId> + <artifactId>commons-collections</artifactId> +  + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> +  + </dependency> + <dependency> + <groupId>antlr</groupId> + <artifactId>antlr</artifactId> +  + </dependency> + <dependency> + <groupId>asm</groupId> + <artifactId>asm</artifactId> +  + </dependency> + <dependency> + <groupId>jboss</groupId> + <artifactId>jboss-remoting</artifactId> +  + </dependency> + <dependency> + <groupId>apache-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> +  + </dependency> + <dependency> + <groupId>org.jboss.unit</groupId> + <artifactId>opends</artifactId> + <version>1.1.0-SNAPSHOT</version> + <type>sar</type> +  + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <id>opends-confg-init</id> + <phase>pre-integration-test</phase> + <configuration> + <tasks > + <echo>Copying OpenDS configuration files to: ${env.JBOSS_HOME}/server/default/conf/</echo> + <copy todir="${env.JBOSS_HOME}/server/default/conf/opends"> + <fileset dir="./src/test/resources/opends"/> + </copy> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + <execution> + <id>opends-confg-remove</id> + <phase>post-integration-test</phase> + <configuration> + <tasks> + <echo>Removing OpenDS configuration files from: ${env.JBOSS_HOME}/server/default/conf/opends</echo> + <delete dir="${env.JBOSS_HOME}/server/default/conf/opends" failonerror="false" deleteonexit="true" quiet="true"/> + + <echo>Removing OpenDS service archive from: ${env.JBOSS_HOME}/server/default/deploy/opends.sar</echo> + <delete dir="${env.JBOSS_HOME}/server/default/deploy/opends.sar" failonerror="false" deleteonexit="true" quiet="true"/> + </tasks> + </configuration> + <goals> + <goal>run</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + <execution> + <id>copy</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.unit</groupId> + <artifactId>opends</artifactId> + <type>sar</type> + <overWrite>true</overWrite> + <outputDirectory>${env.JBOSS_HOME}/server/default/deploy</outputDirectory> + <destFileName>opends.sar</destFileName> + </artifactItem> + </artifactItems> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.codehaus.cargo</groupId> + <artifactId>cargo-maven2-plugin</artifactId> + <executions> + <execution> + <id>start-container</id> + <phase>pre-integration-test</phase> + <goals> + <goal>start</goal> + </goals> + </execution> + <execution> + <id>stop-container</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + <configuration> + <container> + <containerId>jboss4x</containerId> + <home>${env.JBOSS_HOME}</home> + </container> + <wait>false</wait> + <configuration> + <type>existing</type> + <home>${env.JBOSS_HOME}/server/default</home> + <properties> + <cargo.logging >high</cargo.logging> + <cargo.jboss.configuration>default</cargo.jboss.configuration> + <cargo.rmi.port>1099</cargo.rmi.port> + </properties> + </configuration> + </configuration> + </plugin> + <plugin> + <groupId>org.jboss.unit</groupId> + <artifactId>jboss-unit-tooling-maven2</artifactId> + <executions> + <execution> + <phase>integration-test</phase> + <goals> + <goal>execute</goal> + </goals> + </execution> + </executions> + <configuration> + <testsuites> + <testsuite> + <config>jboss-unit.xml</config> +  + </testsuite> + </testsuites> + <reports> + <xml>../testsuite/reports/xml</xml> + <html>../testsuite/reports/html</html> + </reports> + </configuration> + </plugin> + </plugins> + </build> + <properties> + </properties> +</project> + Copied: modules/identity/trunk/identity/src/example (from rev 8897, modules/identity/trunk/identity/src/resources/example) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity (from rev 8848, modules/identity/trunk/identity/src/main/org/jboss/portal/identity) Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/AnonymousRole.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,50 +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.portal.identity; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public class AnonymousRole implements Role -{ - - public Object getId() - { - return new Long(0); - } - - public String getName() - { - return "StandardAnonymousPortalRole"; - } - - public String getDisplayName() - { - return "Portal Anonymous Role"; - } - - public void setDisplayName(String name) - { - //nothing - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/AnonymousRole.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousRole.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,50 @@ +/* +* 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; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public class AnonymousRole implements Role +{ + + public Object getId() + { + return new Long(0); + } + + public String getName() + { + return "StandardAnonymousPortalRole"; + } + + public String getDisplayName() + { + return "Portal Anonymous Role"; + } + + public void setDisplayName(String name) + { + //nothing + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/AnonymousUser.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,50 +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.portal.identity; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public class AnonymousUser implements User -{ - - public Object getId() - { - return new Long(0); - } - - public String getUserName() - { - return "StandardAnonymousPortalUser"; - } - - public void updatePassword(String password) - { - //nothing - } - - public boolean validatePassword(String password) - { - return false; - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/AnonymousUser.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/AnonymousUser.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,50 @@ +/* +* 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; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public class AnonymousUser implements User +{ + + public Object getId() + { + return new Long(0); + } + + public String getUserName() + { + return "StandardAnonymousPortalUser"; + } + + public void updatePassword(String password) + { + //nothing + } + + public boolean validatePassword(String password) + { + return false; + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/CachedUserImpl.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,72 +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.portal.identity; - -import org.jboss.portal.identity.User; - -import java.io.Serializable; - -/** - * Simple POJO to cache user data. - * - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public class CachedUserImpl implements User, Serializable -{ - - /** . */ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(CachedUserImpl.class); - - /** . */ - private Object id; - - /** . */ - private String name; - - public CachedUserImpl(Object id, String name) - { - this.id = id; - this.name = name; - } - - public Object getId() - { - return id; - } - - public String getUserName() - { - return name; - } - - public void updatePassword(String password) - { - throw new UnsupportedOperationException("Cached user. Password cannot be updated using this object. Obtain User using UserModule."); - } - - public boolean validatePassword(String password) - { - throw new UnsupportedOperationException("Cached user. Password cannot be validated using this object. Obtain User using UserModule."); - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/CachedUserImpl.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/CachedUserImpl.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,72 @@ +/* +* 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; + +import org.jboss.portal.identity.User; + +import java.io.Serializable; + +/** + * Simple POJO to cache user data. + * + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public class CachedUserImpl implements User, Serializable +{ + + /** . */ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(CachedUserImpl.class); + + /** . */ + private Object id; + + /** . */ + private String name; + + public CachedUserImpl(Object id, String name) + { + this.id = id; + this.name = name; + } + + public Object getId() + { + return id; + } + + public String getUserName() + { + return name; + } + + public void updatePassword(String password) + { + throw new UnsupportedOperationException("Cached user. Password cannot be updated using this object. Obtain User using UserModule."); + } + + public boolean validatePassword(String password) + { + throw new UnsupportedOperationException("Cached user. Password cannot be validated using this object. Obtain User using UserModule."); + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,276 +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.portal.identity; - -import org.jboss.portal.identity.service.UserProfileModuleService; -import org.jboss.portal.identity.info.PropertyInfo; -import org.jboss.portal.identity.info.ProfileInfo; -import org.jboss.portal.identity.ldap.LDAPUserImpl; -import org.jboss.portal.identity.db.HibernateUserImpl; -import org.jboss.portal.identity.User; -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.CachedUserImpl; - - -import javax.naming.InitialContext; -import java.util.Map; -import java.util.HashMap; -import java.util.Collections; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public class DelegatingUserProfileModuleImpl extends UserProfileModuleService -{ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DelegatingUserProfileModuleImpl.class); - - private String ldapModuleJNDIName; - - private String dbModuleJNDIName; - - private UserProfileModule LDAPModule; - - private UserProfileModule dbModule; - - public void start() throws Exception - { - super.start(); - - if(getProfileInfo() == null) - { - throw new IdentityException("No profile information found. Check the configuration."); - } - - //check if we don't delegate to ourselves: - if (getJNDIName().equals(getDbModuleJNDIName())) - { - throw new IdentityException("Cannot delegate to itself - correct dbModuleJNDIName option"); - } - if (getJNDIName().equals(getLdapModuleJNDIName())) - { - throw new IdentityException("Cannot delegate to itself - correct ldapModuleJNDIName option"); - } - } - - public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException - { - if (log.isDebugEnabled()) log.debug("getProperty: " + propertyName); - try - { - PropertyInfo property = getProfileInfo().getPropertyInfo(propertyName); - if (property == null) - { - throw new IdentityException("Such property name is not supported: " + propertyName); - } - - if (user instanceof CachedUserImpl) - { - user = obtainUser(user); - } - - if (property.isMappedLDAP() && isLDAPSupported() && user instanceof LDAPUserImpl) - { - log.debug("Delegating to LDAP module"); - - return getLDAPModule().getProperty(user, propertyName); - } - else if (property.isMappedDB()) - { - log.debug("Delegating to DB module"); - return getDBModule().getProperty(user, propertyName); - } - throw new IdentityException("Cannot process property - incorrect profile or module configuration"); - } - catch (Exception e) - { - throw new IdentityException("Cannot resolve property: " + propertyName, e); - } - } - - public void setProperty(User user, String name, Object propertyValue) throws IdentityException, IllegalArgumentException - { - if (log.isDebugEnabled()) log.debug("setProperty: " + name + "/" + propertyValue); - try - { - PropertyInfo property = getProfileInfo().getPropertyInfo(name); - if (property == null) - { - throw new IdentityException("Such property name is not supported: " + name); - } - - if (user instanceof CachedUserImpl) - { - user = obtainUser(user); - } - - if (property.isMappedLDAP() && isLDAPSupported() && user instanceof LDAPUserImpl) - { - log.debug("Delegating to LDAP module"); - getLDAPModule().setProperty(user, name, propertyValue); - return; - } - else if (property.isMappedDB()) - { - log.debug("Delegating to DB module"); - - getDBModule().setProperty(user, name, propertyValue); - return; - } - throw new IdentityException("Cannot process property - incorrect profile or module configuration"); - } - catch (Exception e) - { - throw new IdentityException("Cannot resolve property: " + name, e); - } - } - - public Map getProperties(User user) throws IdentityException, IllegalArgumentException - { - if (log.isDebugEnabled()) log.debug("getProperties");//: " + name + "/" + propertyValue) - try - { - if (user instanceof CachedUserImpl) - { - user = obtainUser(user); - } - - if (user instanceof LDAPUserImpl && isLDAPSupported()) - { - log.debug("handling LDAP user implementation"); - - Map props = new HashMap(); - - UserProfileModule dbModule = null; - UserProfileModule ldapModule = null; - - // First get props from databas - its ok if it fails as database support is not required for LDAP configuration - try - { - dbModule = getDBModule(); - props.putAll(dbModule.getProperties(user)); - } - catch (Exception e) - { - // - } - - ldapModule = getLDAPModule(); - props.putAll(ldapModule.getProperties(user)); - - - return Collections.unmodifiableMap(props); - } - else if (user instanceof HibernateUserImpl && isDBSupported()) - { - log.debug("Delegating to DB module"); - return getDBModule().getProperties(user); - } - throw new IdentityException("Cannot process properties - incorrect profile or module configuration"); - } - catch (Exception e) - { - throw new IdentityException("Cannot resolve properties: ", e); - } - } - - private User obtainUser(User user) throws IdentityException - { - UserModule um = (UserModule)getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); - return um.findUserById(user.getId()); - } - - - public ProfileInfo getProfileInfo() throws IdentityException - { - return profileInfo; - } - - public String getLdapModuleJNDIName() - { - return ldapModuleJNDIName; - } - - public void setLdapModuleJNDIName(String ldapModuleJNDIName) - { - this.ldapModuleJNDIName = ldapModuleJNDIName; - } - - public String getDbModuleJNDIName() - { - return dbModuleJNDIName; - } - - public void setDbModuleJNDIName(String dbModuleJNDIName) - { - this.dbModuleJNDIName = dbModuleJNDIName; - } - - public boolean isLDAPSupported() - { - return getLdapModuleJNDIName()!=null; - } - - public boolean isDBSupported() - { - return getDbModuleJNDIName()!=null; - } - - protected UserProfileModule getDBModule() throws Exception - { - - //TODO: to tired to clean this at the moment - if (dbModule == null) - { - dbModule = (UserProfileModule)new InitialContext().lookup(getDbModuleJNDIName()); - if (dbModule == null) - { - throw new IdentityException("Couldn't obtain DB UserProfileModule"); - } - } - return dbModule; - } - - protected UserProfileModule getLDAPModule() throws Exception - { - if (LDAPModule == null) - { - LDAPModule = (UserProfileModule)new InitialContext().lookup(getLdapModuleJNDIName()); - if (LDAPModule == null) - { - throw new IdentityException("Couldn't obtain LDAP UserProfileModule"); - } - } - return LDAPModule; - } - - - public void setLDAPModule(UserProfileModule LDAPModule) - { - this.LDAPModule = LDAPModule; - } - - public void setDbModule(UserProfileModule dbModule) - { - this.dbModule = dbModule; - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/DelegatingUserProfileModuleImpl.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,276 @@ +/* +* 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; + +import org.jboss.portal.identity.service.UserProfileModuleService; +import org.jboss.portal.identity.info.PropertyInfo; +import org.jboss.portal.identity.info.ProfileInfo; +import org.jboss.portal.identity.ldap.LDAPUserImpl; +import org.jboss.portal.identity.db.HibernateUserImpl; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.CachedUserImpl; + + +import javax.naming.InitialContext; +import java.util.Map; +import java.util.HashMap; +import java.util.Collections; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public class DelegatingUserProfileModuleImpl extends UserProfileModuleService +{ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(DelegatingUserProfileModuleImpl.class); + + private String ldapModuleJNDIName; + + private String dbModuleJNDIName; + + private UserProfileModule LDAPModule; + + private UserProfileModule dbModule; + + public void start() throws Exception + { + super.start(); + + if(getProfileInfo() == null) + { + throw new IdentityException("No profile information found. Check the configuration."); + } + + //check if we don't delegate to ourselves: + if (getJNDIName().equals(getDbModuleJNDIName())) + { + throw new IdentityException("Cannot delegate to itself - correct dbModuleJNDIName option"); + } + if (getJNDIName().equals(getLdapModuleJNDIName())) + { + throw new IdentityException("Cannot delegate to itself - correct ldapModuleJNDIName option"); + } + } + + public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException + { + if (log.isDebugEnabled()) log.debug("getProperty: " + propertyName); + try + { + PropertyInfo property = getProfileInfo().getPropertyInfo(propertyName); + if (property == null) + { + throw new IdentityException("Such property name is not supported: " + propertyName); + } + + if (user instanceof CachedUserImpl) + { + user = obtainUser(user); + } + + if (property.isMappedLDAP() && isLDAPSupported() && user instanceof LDAPUserImpl) + { + log.debug("Delegating to LDAP module"); + + return getLDAPModule().getProperty(user, propertyName); + } + else if (property.isMappedDB()) + { + log.debug("Delegating to DB module"); + return getDBModule().getProperty(user, propertyName); + } + throw new IdentityException("Cannot process property - incorrect profile or module configuration"); + } + catch (Exception e) + { + throw new IdentityException("Cannot resolve property: " + propertyName, e); + } + } + + public void setProperty(User user, String name, Object propertyValue) throws IdentityException, IllegalArgumentException + { + if (log.isDebugEnabled()) log.debug("setProperty: " + name + "/" + propertyValue); + try + { + PropertyInfo property = getProfileInfo().getPropertyInfo(name); + if (property == null) + { + throw new IdentityException("Such property name is not supported: " + name); + } + + if (user instanceof CachedUserImpl) + { + user = obtainUser(user); + } + + if (property.isMappedLDAP() && isLDAPSupported() && user instanceof LDAPUserImpl) + { + log.debug("Delegating to LDAP module"); + getLDAPModule().setProperty(user, name, propertyValue); + return; + } + else if (property.isMappedDB()) + { + log.debug("Delegating to DB module"); + + getDBModule().setProperty(user, name, propertyValue); + return; + } + throw new IdentityException("Cannot process property - incorrect profile or module configuration"); + } + catch (Exception e) + { + throw new IdentityException("Cannot resolve property: " + name, e); + } + } + + public Map getProperties(User user) throws IdentityException, IllegalArgumentException + { + if (log.isDebugEnabled()) log.debug("getProperties");//: " + name + "/" + propertyValue) + try + { + if (user instanceof CachedUserImpl) + { + user = obtainUser(user); + } + + if (user instanceof LDAPUserImpl && isLDAPSupported()) + { + log.debug("handling LDAP user implementation"); + + Map props = new HashMap(); + + UserProfileModule dbModule = null; + UserProfileModule ldapModule = null; + + // First get props from databas - its ok if it fails as database support is not required for LDAP configuration + try + { + dbModule = getDBModule(); + props.putAll(dbModule.getProperties(user)); + } + catch (Exception e) + { + // + } + + ldapModule = getLDAPModule(); + props.putAll(ldapModule.getProperties(user)); + + + return Collections.unmodifiableMap(props); + } + else if (user instanceof HibernateUserImpl && isDBSupported()) + { + log.debug("Delegating to DB module"); + return getDBModule().getProperties(user); + } + throw new IdentityException("Cannot process properties - incorrect profile or module configuration"); + } + catch (Exception e) + { + throw new IdentityException("Cannot resolve properties: ", e); + } + } + + private User obtainUser(User user) throws IdentityException + { + UserModule um = (UserModule)getIdentityContext().getObject(IdentityContext.TYPE_USER_MODULE); + return um.findUserById(user.getId()); + } + + + public ProfileInfo getProfileInfo() throws IdentityException + { + return profileInfo; + } + + public String getLdapModuleJNDIName() + { + return ldapModuleJNDIName; + } + + public void setLdapModuleJNDIName(String ldapModuleJNDIName) + { + this.ldapModuleJNDIName = ldapModuleJNDIName; + } + + public String getDbModuleJNDIName() + { + return dbModuleJNDIName; + } + + public void setDbModuleJNDIName(String dbModuleJNDIName) + { + this.dbModuleJNDIName = dbModuleJNDIName; + } + + public boolean isLDAPSupported() + { + return getLdapModuleJNDIName()!=null; + } + + public boolean isDBSupported() + { + return getDbModuleJNDIName()!=null; + } + + protected UserProfileModule getDBModule() throws Exception + { + + //TODO: to tired to clean this at the moment + if (dbModule == null) + { + dbModule = (UserProfileModule)new InitialContext().lookup(getDbModuleJNDIName()); + if (dbModule == null) + { + throw new IdentityException("Couldn't obtain DB UserProfileModule"); + } + } + return dbModule; + } + + protected UserProfileModule getLDAPModule() throws Exception + { + if (LDAPModule == null) + { + LDAPModule = (UserProfileModule)new InitialContext().lookup(getLdapModuleJNDIName()); + if (LDAPModule == null) + { + throw new IdentityException("Couldn't obtain LDAP UserProfileModule"); + } + } + return LDAPModule; + } + + + public void setLDAPModule(UserProfileModule LDAPModule) + { + this.LDAPModule = LDAPModule; + } + + public void setDbModule(UserProfileModule dbModule) + { + this.dbModule = dbModule; + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,117 +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.portal.identity; - -import java.util.Map; -import java.util.Set; - -/** - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public interface IdentityConfiguration -{ - - public static final String GROUP_COMMON = "common"; - - public static final String GROUP_CONNECTION = "connection"; - - public static final String GROUP_USER_CREATE_ATTRIBUTES = "userCreateAttibutes"; - - public static final String GROUP_ROLE_CREATE_ATTRIBUTES = "roleCreateAttibutes"; - - public static final String GROUP_USER_PROFILE_MAPPINGS = "userProfileMappings"; - - public static final String CONNECTION_NAME = "connection-name"; - - public static final String CONNECTION_CONTEXT_FACTORY = "context-factory"; - - public static final String CONNECTION_HOST = "host"; - - public static final String CONNECTION_PORT = "port"; - - public static final String CONNECTION_ADMIN_DN = "admin-dn"; - - public static final String CONNECTION_ADMIN_PASSWORD = "admin-password"; - - public static final String CONNECTION_AUTHENTICATION = "authentication"; - - public static final String USER_PRINCIPAL_PREFIX = "principalDNPrefix"; - - public static final String USER_PRINCIPAL_SUFFIX = "principalDNSuffix"; - - public static final String USER_UID_ATTRIBUTE_ID = "uidAttributeID"; - - public static final String USER_PASSWORD_ATTRIBUTE_ID = "passwordAttributeID"; - - public static final String USER_CONTEXT_DN = "userCtxDN"; - - public static final String USER_CONTAINER_DN = USER_CONTEXT_DN; - - public static final String USER_SEARCH_FILTER = "userSearchFilter"; - - //public static final String ROLE_CONTAINER_DN = "roleContainerDN"; - - public static final String ROLE_RID_ATTRIBUTE_ID = "ridAttributeID"; - - public static final String ROLE_DISPLAY_NAME_ATTRIBUTE_ID = "roleDisplayNameAttributeID"; - - public static final String ROLE_SEARCH_FILTER = "roleSearchFilter"; - - public static final String ROLE_CONTEXT_DN = "roleCtxDN"; - - public static final String ROLE_CONTAINER_DN = ROLE_CONTEXT_DN; - - public static final String MEMBERSHIP_ATTRIBUTE_ID = "membershipAttributeID"; - - public static final String MEMBERSHIP_ATTRIBUTE_IS_DN = "membershipAttributeIsDN"; - - public static final String MEMBERSHIP_MEMBERSHIP_ATTRIBUTE_REQUIRED = "membershipAttributeRequired"; - - public static final String MEMBERSHIP_MEMBERSHIP_ATTRIBUTE_EMPTY_VALUE = "membershipAttributeEmptyValue"; - - public static final String SEARCH_TIME_LIMIT = "searchTimeLimit"; - - public static final String SEARCH_SCOPE = "searchScope"; - - - - public Set getValues(String optionGroup, String option); - - public String getValue(String optionGroup, String option); - - public String getValue(String option); - - public void setValues(String optionGroup, String option, Set values); - - public void addValue(String optionGroup, String option, String value); - - public Map getOptions(String optionGroup); - - public void setOptions(String optionGroup, Map options); - - public void remoeOption(String optionGroup, String option); - - public Map getOptionGroups(); - - -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityConfiguration.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityConfiguration.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,117 @@ +/* +* 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; + +import java.util.Map; +import java.util.Set; + +/** + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public interface IdentityConfiguration +{ + + public static final String GROUP_COMMON = "common"; + + public static final String GROUP_CONNECTION = "connection"; + + public static final String GROUP_USER_CREATE_ATTRIBUTES = "userCreateAttibutes"; + + public static final String GROUP_ROLE_CREATE_ATTRIBUTES = "roleCreateAttibutes"; + + public static final String GROUP_USER_PROFILE_MAPPINGS = "userProfileMappings"; + + public static final String CONNECTION_NAME = "connection-name"; + + public static final String CONNECTION_CONTEXT_FACTORY = "context-factory"; + + public static final String CONNECTION_HOST = "host"; + + public static final String CONNECTION_PORT = "port"; + + public static final String CONNECTION_ADMIN_DN = "admin-dn"; + + public static final String CONNECTION_ADMIN_PASSWORD = "admin-password"; + + public static final String CONNECTION_AUTHENTICATION = "authentication"; + + public static final String USER_PRINCIPAL_PREFIX = "principalDNPrefix"; + + public static final String USER_PRINCIPAL_SUFFIX = "principalDNSuffix"; + + public static final String USER_UID_ATTRIBUTE_ID = "uidAttributeID"; + + public static final String USER_PASSWORD_ATTRIBUTE_ID = "passwordAttributeID"; + + public static final String USER_CONTEXT_DN = "userCtxDN"; + + public static final String USER_CONTAINER_DN = USER_CONTEXT_DN; + + public static final String USER_SEARCH_FILTER = "userSearchFilter"; + + //public static final String ROLE_CONTAINER_DN = "roleContainerDN"; + + public static final String ROLE_RID_ATTRIBUTE_ID = "ridAttributeID"; + + public static final String ROLE_DISPLAY_NAME_ATTRIBUTE_ID = "roleDisplayNameAttributeID"; + + public static final String ROLE_SEARCH_FILTER = "roleSearchFilter"; + + public static final String ROLE_CONTEXT_DN = "roleCtxDN"; + + public static final String ROLE_CONTAINER_DN = ROLE_CONTEXT_DN; + + public static final String MEMBERSHIP_ATTRIBUTE_ID = "membershipAttributeID"; + + public static final String MEMBERSHIP_ATTRIBUTE_IS_DN = "membershipAttributeIsDN"; + + public static final String MEMBERSHIP_MEMBERSHIP_ATTRIBUTE_REQUIRED = "membershipAttributeRequired"; + + public static final String MEMBERSHIP_MEMBERSHIP_ATTRIBUTE_EMPTY_VALUE = "membershipAttributeEmptyValue"; + + public static final String SEARCH_TIME_LIMIT = "searchTimeLimit"; + + public static final String SEARCH_SCOPE = "searchScope"; + + + + public Set getValues(String optionGroup, String option); + + public String getValue(String optionGroup, String option); + + public String getValue(String option); + + public void setValues(String optionGroup, String option, Set values); + + public void addValue(String optionGroup, String option, String value); + + public Map getOptions(String optionGroup); + + public void setOptions(String optionGroup, Map options); + + public void remoeOption(String optionGroup, String option); + + public Map getOptionGroups(); + + +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityContext.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,69 +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.portal.identity; - -/** - * Keeps track on all identity modules deployed with simple name-object mapping - * - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public interface IdentityContext -{ - - //TODO: move to safe type enum - public static final String TYPE_USER_MODULE = "User"; - - public static final String TYPE_ROLE_MODULE = "Role"; - - public static final String TYPE_MEMBERSHIP_MODULE = "Membership"; - - public static final String TYPE_USER_PROFILE_MODULE = "UserProfile"; - - public static final String TYPE_CONNECTION_CONTEXT = "ConnectionContext"; - - public static final String TYPE_IDENTITY_CONFIGURATION = "IdentityConfiguration"; - - public static final String TYPE_IDENTITY_EVENT_BROADCASTER = "IdentityEventBroadcaster"; - - /** - * Retister identity object in context - * @param object representing identity object - * @param name to map object - * @throws IdentityException thrown if such object is already registered or operation fail. - */ - public void register(Object object, String name) throws IdentityException; - - /** - * Remove identity object from context - * @param name of identity object - */ - public void unregister(String name); - - /** - * Retrieve registered identity object - * @param name - * @return - * @throws IdentityException thrown if no such object exists in context - */ - public Object getObject(String name) throws IdentityException; -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityContext.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContext.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,69 @@ +/* +* 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; + +/** + * Keeps track on all identity modules deployed with simple name-object mapping + * + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public interface IdentityContext +{ + + //TODO: move to safe type enum + public static final String TYPE_USER_MODULE = "User"; + + public static final String TYPE_ROLE_MODULE = "Role"; + + public static final String TYPE_MEMBERSHIP_MODULE = "Membership"; + + public static final String TYPE_USER_PROFILE_MODULE = "UserProfile"; + + public static final String TYPE_CONNECTION_CONTEXT = "ConnectionContext"; + + public static final String TYPE_IDENTITY_CONFIGURATION = "IdentityConfiguration"; + + public static final String TYPE_IDENTITY_EVENT_BROADCASTER = "IdentityEventBroadcaster"; + + /** + * Retister identity object in context + * @param object representing identity object + * @param name to map object + * @throws IdentityException thrown if such object is already registered or operation fail. + */ + public void register(Object object, String name) throws IdentityException; + + /** + * Remove identity object from context + * @param name of identity object + */ + public void unregister(String name); + + /** + * Retrieve registered identity object + * @param name + * @return + * @throws IdentityException thrown if no such object exists in context + */ + public Object getObject(String name) throws IdentityException; +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityContextImpl.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,82 +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.portal.identity; - -import org.jboss.portal.common.util.CopyOnWriteRegistry; - -import java.util.Collection; - -/** - * Keeps references to all identity related modules to enable them interactions - * - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public class IdentityContextImpl implements IdentityContext { - - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(IdentityContextImpl.class); - - private final CopyOnWriteRegistry registry; - - public IdentityContextImpl() - { - registry = new CopyOnWriteRegistry(); - } - - public void register(Object object, String name) throws IdentityException - { - if (!registry.register(name, object)) - { - throw new IdentityException("Cannot register object in IdentityContext with name: " + name); - } - if (log.isDebugEnabled()) log.debug("registering object: " + name + " ; " + object.getClass()); - } - - public void unregister(String name) - { - if (registry.unregister(name) == null) - { - log.error("Cannot unregister object from IdentityContext with name: " + name); - } - if (log.isDebugEnabled()) log.debug("unregistering object: " + name); - } - - public Object getObject(String name) throws IdentityException - { - Object o = registry.getRegistration(name); - if (o == null) - { - throw new IdentityException("No such mapping in IdentityContext: " + name); - } - return o; - } - - public Collection getKeys() - { - return registry.getKeys(); - } - - public Collection getValues() - { - return registry.getRegistrations(); - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityContextImpl.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityContextImpl.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,82 @@ +/* +* 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; + +import org.jboss.portal.common.util.CopyOnWriteRegistry; + +import java.util.Collection; + +/** + * Keeps references to all identity related modules to enable them interactions + * + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public class IdentityContextImpl implements IdentityContext { + + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(IdentityContextImpl.class); + + private final CopyOnWriteRegistry registry; + + public IdentityContextImpl() + { + registry = new CopyOnWriteRegistry(); + } + + public void register(Object object, String name) throws IdentityException + { + if (!registry.register(name, object)) + { + throw new IdentityException("Cannot register object in IdentityContext with name: " + name); + } + if (log.isDebugEnabled()) log.debug("registering object: " + name + " ; " + object.getClass()); + } + + public void unregister(String name) + { + if (registry.unregister(name) == null) + { + log.error("Cannot unregister object from IdentityContext with name: " + name); + } + if (log.isDebugEnabled()) log.debug("unregistering object: " + name); + } + + public Object getObject(String name) throws IdentityException + { + Object o = registry.getRegistration(name); + if (o == null) + { + throw new IdentityException("No such mapping in IdentityContext: " + name); + } + return o; + } + + public Collection getKeys() + { + return registry.getKeys(); + } + + public Collection getValues() + { + return registry.getRegistrations(); + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityException.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -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.portal.identity; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class IdentityException extends Exception -{ - /** The serialVersionUID */ - private static final long serialVersionUID = -2976579334381568521L; - - public IdentityException() - { - } - - public IdentityException(String message) - { - super(message); - } - - public IdentityException(String message, Throwable cause) - { - super(message, cause); - } - - public IdentityException(Throwable cause) - { - super(cause); - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityException.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityException.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,52 @@ +/****************************************************************************** + * 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; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class IdentityException extends Exception +{ + /** The serialVersionUID */ + private static final long serialVersionUID = -2976579334381568521L; + + public IdentityException() + { + } + + public IdentityException(String message) + { + super(message); + } + + public IdentityException(String message, Throwable cause) + { + super(message, cause); + } + + public IdentityException(Throwable cause) + { + super(cause); + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceController.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,37 +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.portal.identity; - -/** - * Service that bootstrap all identity related modules and services. It registers them in IdentityContext - * - * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public interface IdentityServiceController -{ - /** - * Get IdentityContext that contains modules and services bootstrapped by this instance. - * @return - */ - public IdentityContext getIdentityContext(); -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/IdentityServiceController.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/IdentityServiceController.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,37 @@ +/* +* 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; + +/** + * Service that bootstrap all identity related modules and services. It registers them in IdentityContext + * + * @author <a href="mailto:boleslaw dot dawidowicz at jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public interface IdentityServiceController +{ + /** + * Get IdentityContext that contains modules and services bootstrapped by this instance. + * @return + */ + public IdentityContext getIdentityContext(); +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/MembershipModule.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,86 +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.portal.identity; - - -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.User; -import org.jboss.portal.identity.Role; - -import java.util.Set; - -/** - * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public interface MembershipModule -{ - - /** - * Return the set of role objects that a given user has. - * - * @param user the user - * @return the set of roles of the specified user - */ - Set getRoles(User user) throws IdentityException, IllegalArgumentException; - - /** - * Returns the set of user objects that a given role has. - * @param role - * @return - * @throws IdentityException - * @throws IllegalArgumentException - */ - Set getUsers(Role role) throws IdentityException, IllegalArgumentException; - - - /** - * Creates a relationship beetween a role and set of users. Other roles that have assotiontions with - * those users remain unaffected. - * - * @param role - * @param users - * @throws IdentityException - */ - void assignUsers(Role role, Set users) throws IdentityException, IllegalArgumentException; - - /** - * Creates a relationship beetween a user and set of roles. This operation will erase any other assotientions - * beetween the user and roles not specified in the provided set. - * - * @param user - * @param roles - * @throws IdentityException - */ - void assignRoles(User user, Set roles) throws IdentityException, IllegalArgumentException; - - /** - * Returns role members based on rolename - depreciated method ethod here only for compatibility with - * old RoleModule interface - * - * @param roleName - * @param offset - * @param limit - */ - Set findRoleMembers(String roleName, int offset, int limit, String userNameFilter) throws IdentityException, IllegalArgumentException; -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/MembershipModule.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/MembershipModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,86 @@ +/****************************************************************************** + * 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; + + +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.User; +import org.jboss.portal.identity.Role; + +import java.util.Set; + +/** + * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public interface MembershipModule +{ + + /** + * Return the set of role objects that a given user has. + * + * @param user the user + * @return the set of roles of the specified user + */ + Set getRoles(User user) throws IdentityException, IllegalArgumentException; + + /** + * Returns the set of user objects that a given role has. + * @param role + * @return + * @throws IdentityException + * @throws IllegalArgumentException + */ + Set getUsers(Role role) throws IdentityException, IllegalArgumentException; + + + /** + * Creates a relationship beetween a role and set of users. Other roles that have assotiontions with + * those users remain unaffected. + * + * @param role + * @param users + * @throws IdentityException + */ + void assignUsers(Role role, Set users) throws IdentityException, IllegalArgumentException; + + /** + * Creates a relationship beetween a user and set of roles. This operation will erase any other assotientions + * beetween the user and roles not specified in the provided set. + * + * @param user + * @param roles + * @throws IdentityException + */ + void assignRoles(User user, Set roles) throws IdentityException, IllegalArgumentException; + + /** + * Returns role members based on rolename - depreciated method ethod here only for compatibility with + * old RoleModule interface + * + * @param roleName + * @param offset + * @param limit + */ + Set findRoleMembers(String roleName, int offset, int limit, String userNameFilter) throws IdentityException, IllegalArgumentException; +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -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.portal.identity; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public class NoSuchUserException extends IdentityException -{ - - /** The serialVersionUID */ - private static final long serialVersionUID = 7328419579811469592L; - private String userName; - - public NoSuchUserException(String userName) - { - super("No such user " + userName); - this.userName = userName; - } - - public String getUserName() - { - return userName; - } -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/NoSuchUserException.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/NoSuchUserException.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,46 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.identity; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public class NoSuchUserException extends IdentityException +{ + + /** The serialVersionUID */ + private static final long serialVersionUID = 7328419579811469592L; + private String userName; + + public NoSuchUserException(String userName) + { + super("No such user " + userName); + this.userName = userName; + } + + public String getUserName() + { + return userName; + } +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/ProfileMap.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -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.portal.identity; - -import java.util.Map; - -/** - * Extends <code>java.util.Map</code> to provide meta information about user profile. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @version $Revision: 5448 $ - */ -public interface ProfileMap extends Map -{ - /** - * Return true if the profile value is read only. - * - * @param key - * @return true if the profile value is read only - * @throws ClassCastException if the key is not an instance of string - */ - boolean isReadOnly(Object key); -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/ProfileMap.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ProfileMap.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,43 @@ +/****************************************************************************** + * 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; + +import java.util.Map; + +/** + * Extends <code>java.util.Map</code> to provide meta information about user profile. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @version $Revision: 5448 $ + */ +public interface ProfileMap extends Map +{ + /** + * Return true if the profile value is read only. + * + * @param key + * @return true if the profile value is read only + * @throws ClassCastException if the key is not an instance of string + */ + boolean isReadOnly(Object key); +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/Role.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,45 +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.portal.identity; - -/** - * A role of users. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 5885 $ - */ -public interface Role -{ - /** The role identifier. */ - public Object getId(); - - /** The role name used in security rules. This name can not be modified */ - public String getName(); - - /** The role display name used on screens. This name can be modified */ - public String getDisplayName(); - - /** */ - public void setDisplayName(String name); -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/Role.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/Role.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -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.portal.identity; + +/** + * A role of users. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision: 5885 $ + */ +public interface Role +{ + /** The role identifier. */ + public Object getId(); + + /** The role name used in security rules. This name can not be modified */ + public String getName(); + + /** The role display name used on screens. This name can be modified */ + public String getDisplayName(); + + /** */ + public void setDisplayName(String name); +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/RoleModule.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,102 +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.portal.identity; - -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.Role; - -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet </a> - * @author <a href="mailto:theute@jboss.org">Thomas Heute </a> - * @author Roy Russo : roy at jboss dot org - * @version $Revision: 5885 $ - */ -public interface RoleModule -{ - /** - * Retrieves a role by its name - * - * @param name the role name - * @return the role - */ - Role findRoleByName(String name) throws IdentityException, IllegalArgumentException; - - /** - * Retrieve a collection of role from the role names. - * - * @param names the role names - * @return a collection of roles - * @throws IllegalArgumentException - */ - Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException; - - /** - * Retrieves a role by its id. - * - * @param id the role id - * @return the role - */ - Role findRoleById(Object id) throws IdentityException, IllegalArgumentException; - - /** - * Retrieves a role by its id. - * - * @param id the role id - * @return the role - */ - Role findRoleById(String id) throws IdentityException, IllegalArgumentException; - - /** - * Create a new role with the specified name. - * - * @param name the role name - * @param displayName the role display name - * @return the role - */ - Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException; - - /** - * Remove a role. - * - * @param id the role id - */ - void removeRole(Object id) throws IdentityException, IllegalArgumentException; - - /** - * Returns the number of roles. - * - * @return the number of roles - */ - int getRolesCount() throws IdentityException; - - /** - * Get all the roles - * - * @return the roles - */ - Set findRoles() throws IdentityException; - - -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/RoleModule.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/RoleModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,102 @@ +/****************************************************************************** + * 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; + +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.Role; + +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet </a> + * @author <a href="mailto:theute@jboss.org">Thomas Heute </a> + * @author Roy Russo : roy at jboss dot org + * @version $Revision: 5885 $ + */ +public interface RoleModule +{ + /** + * Retrieves a role by its name + * + * @param name the role name + * @return the role + */ + Role findRoleByName(String name) throws IdentityException, IllegalArgumentException; + + /** + * Retrieve a collection of role from the role names. + * + * @param names the role names + * @return a collection of roles + * @throws IllegalArgumentException + */ + Set findRolesByNames(String[] names) throws IdentityException, IllegalArgumentException; + + /** + * Retrieves a role by its id. + * + * @param id the role id + * @return the role + */ + Role findRoleById(Object id) throws IdentityException, IllegalArgumentException; + + /** + * Retrieves a role by its id. + * + * @param id the role id + * @return the role + */ + Role findRoleById(String id) throws IdentityException, IllegalArgumentException; + + /** + * Create a new role with the specified name. + * + * @param name the role name + * @param displayName the role display name + * @return the role + */ + Role createRole(String name, String displayName) throws IdentityException, IllegalArgumentException; + + /** + * Remove a role. + * + * @param id the role id + */ + void removeRole(Object id) throws IdentityException, IllegalArgumentException; + + /** + * Returns the number of roles. + * + * @return the number of roles + */ + int getRolesCount() throws IdentityException; + + /** + * Get all the roles + * + * @return the roles + */ + Set findRoles() throws IdentityException; + + +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/ServiceJNDIBinder.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,38 +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.portal.identity; - -/** - * Simple interface to hide JNDI binding logic - * - * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> - * @version $Revision: 0.1 $ - */ -public interface ServiceJNDIBinder -{ - public void bind(String jndiName, Object service) throws Exception; - - public void unbind(String jndiName); - - -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/ServiceJNDIBinder.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ServiceJNDIBinder.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -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.portal.identity; + +/** + * Simple interface to hide JNDI binding logic + * + * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> + * @version $Revision: 0.1 $ + */ +public interface ServiceJNDIBinder +{ + public void bind(String jndiName, Object service) throws Exception; + + public void unbind(String jndiName); + + +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/User.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,82 +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.portal.identity; - -import org.jboss.portal.identity.ProfileMap; -import org.jboss.portal.common.p3p.P3PConstants; - -import java.util.Date; -import java.util.Locale; - -/** - * A user. - * - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar Bojan </a> - * @version $Revision: 7674 $ - */ -public interface User -{ - public static final String INFO_USER_NAME_GIVEN = P3PConstants.INFO_USER_NAME_GIVEN; - public static final String INFO_USER_NAME_FAMILY = P3PConstants.INFO_USER_NAME_FAMILY; - public static final String INFO_USER_LOCATION = "portal.user.location"; - public static final String INFO_USER_OCCUPATION = "portal.user.occupation"; - public static final String INFO_USER_EXTRA = "portal.user.extra"; - public static final String INFO_USER_SIGNATURE = "portal.user.signature"; - public static final String INFO_USER_INTERESTS = "portal.user.interests"; - public static final String INFO_USER_LOCALE = "portal.user.locale"; - public static final String INFO_USER_IM_ICQ = "portal.user.im.icq"; - public static final String INFO_USER_IM_AIM = "portal.user.im.aim"; - public static final String INFO_USER_IM_MSNM = "portal.user.im.msnm"; - public static final String INFO_USER_IM_YIM = "portal.user.im.yim"; - public static final String INFO_USER_IM_SKYPE = "portal.user.im.skype"; - public static final String INFO_USER_IM_XMMP = "portal.user.im.xmmp"; - public static final String INFO_USER_HOMEPAGE = "portal.user.homepage"; - public static final String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset"; - public static final String INFO_USER_THEME = "portal.user.theme"; - public static final String INFO_USER_SECURITY_QUESTION = "portal.user.security.question"; - public static final String INFO_USER_SECURITY_ANSWER = "portal.user.security.answer"; - public static final String INFO_USER_EMAIL_FAKE = "portal.user.email.fake"; - public static final String INFO_USER_VIEW_EMAIL_VIEW_REAL = "portal.user.email.view-real"; - public static final String INFO_USER_LAST_LOGIN_DATE = "portal.user.last-login-date"; - public static final String INFO_USER_REGISTRATION_DATE = "portal.user.registration-date"; - - public static final String INFO_USER_ENABLED = "portal.user.enabled"; - public static final String INFO_USER_EMAIL_REAL = P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL; - - - - - /** The user identifier. */ - public Object getId(); - - /** The user name. */ - public String getUserName(); - - /** Set the password using proper encoding. */ - public void updatePassword(String password); - - /** Return true if the password is valid. */ - public boolean validatePassword(String password); -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/User.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/User.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,82 @@ +/****************************************************************************** + * 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; + +import org.jboss.portal.identity.ProfileMap; +import org.jboss.portal.common.p3p.P3PConstants; + +import java.util.Date; +import java.util.Locale; + +/** + * A user. + * + * @author <a href="mailto:julien@jboss.org">Julien Viet</a> + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @author <a href="mailto:mageshbk@jboss.com">Magesh Kumar Bojan </a> + * @version $Revision: 7674 $ + */ +public interface User +{ + public static final String INFO_USER_NAME_GIVEN = P3PConstants.INFO_USER_NAME_GIVEN; + public static final String INFO_USER_NAME_FAMILY = P3PConstants.INFO_USER_NAME_FAMILY; + public static final String INFO_USER_LOCATION = "portal.user.location"; + public static final String INFO_USER_OCCUPATION = "portal.user.occupation"; + public static final String INFO_USER_EXTRA = "portal.user.extra"; + public static final String INFO_USER_SIGNATURE = "portal.user.signature"; + public static final String INFO_USER_INTERESTS = "portal.user.interests"; + public static final String INFO_USER_LOCALE = "portal.user.locale"; + public static final String INFO_USER_IM_ICQ = "portal.user.im.icq"; + public static final String INFO_USER_IM_AIM = "portal.user.im.aim"; + public static final String INFO_USER_IM_MSNM = "portal.user.im.msnm"; + public static final String INFO_USER_IM_YIM = "portal.user.im.yim"; + public static final String INFO_USER_IM_SKYPE = "portal.user.im.skype"; + public static final String INFO_USER_IM_XMMP = "portal.user.im.xmmp"; + public static final String INFO_USER_HOMEPAGE = "portal.user.homepage"; + public static final String INFO_USER_TIME_ZONE_OFFSET = "portal.user.time-zone-offset"; + public static final String INFO_USER_THEME = "portal.user.theme"; + public static final String INFO_USER_SECURITY_QUESTION = "portal.user.security.question"; + public static final String INFO_USER_SECURITY_ANSWER = "portal.user.security.answer"; + public static final String INFO_USER_EMAIL_FAKE = "portal.user.email.fake"; + public static final String INFO_USER_VIEW_EMAIL_VIEW_REAL = "portal.user.email.view-real"; + public static final String INFO_USER_LAST_LOGIN_DATE = "portal.user.last-login-date"; + public static final String INFO_USER_REGISTRATION_DATE = "portal.user.registration-date"; + + public static final String INFO_USER_ENABLED = "portal.user.enabled"; + public static final String INFO_USER_EMAIL_REAL = P3PConstants.INFO_USER_BUSINESS_INFO_ONLINE_EMAIL; + + + + + /** The user identifier. */ + public Object getId(); + + /** The user name. */ + public String getUserName(); + + /** Set the password using proper encoding. */ + public void updatePassword(String password); + + /** Return true if the password is valid. */ + public boolean validatePassword(String password); +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/UserModule.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,103 +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.portal.identity; - -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.NoSuchUserException; -import org.jboss.portal.identity.User; - -import java.util.Set; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet </a> - * @version $Revision: 5946 $ - */ -public interface UserModule -{ - /** - * Retrieve a user by its name. - * - * @param userName the user name - * @return the user - */ - User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException; - - /** - * Retrieve a user by its id. - * - * @param id the user id - * @return the user - * @throws IllegalArgumentException if the id is null - */ - User findUserById(Object id) throws IdentityException, IllegalArgumentException, NoSuchUserException; - - /** - * Retrieve a user by its id. - * - * @param id the user id - * @return the user - * @throws IllegalArgumentException if the id is null or not in the good format - */ - User findUserById(String id) throws IdentityException, IllegalArgumentException, NoSuchUserException; - - /** - * Creates a new user with the specified name. - * - * @param userName - * @return the user - */ - User createUser(String userName, String password) throws IdentityException, IllegalArgumentException; - - /** - * Remove a user. - * - * @param id the user id - */ - void removeUser(Object id) throws IdentityException, IllegalArgumentException; - - /** - * Get a range of users. - * - * @param offset the offset of the first result to retrieve - * @param limit the maximum number of users to retrieve - * @return the user set - */ - Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException; - - /** - * Get a range of users. - * - * @param filter a string filter applied to the user name. - * @param offset the offset of the frist result to retrieve - * @param limit the maximum number of users to retrieve - * @return the user set - */ - Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException; - - /** - * Returns the number of users. - * - * @return the number of users - */ - int getUserCount() throws IdentityException, IllegalArgumentException; -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/UserModule.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,103 @@ +/****************************************************************************** + * 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; + +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.NoSuchUserException; +import org.jboss.portal.identity.User; + +import java.util.Set; + +/** + * @author <a href="mailto:julien@jboss.org">Julien Viet </a> + * @version $Revision: 5946 $ + */ +public interface UserModule +{ + /** + * Retrieve a user by its name. + * + * @param userName the user name + * @return the user + */ + User findUserByUserName(String userName) throws IdentityException, IllegalArgumentException, NoSuchUserException; + + /** + * Retrieve a user by its id. + * + * @param id the user id + * @return the user + * @throws IllegalArgumentException if the id is null + */ + User findUserById(Object id) throws IdentityException, IllegalArgumentException, NoSuchUserException; + + /** + * Retrieve a user by its id. + * + * @param id the user id + * @return the user + * @throws IllegalArgumentException if the id is null or not in the good format + */ + User findUserById(String id) throws IdentityException, IllegalArgumentException, NoSuchUserException; + + /** + * Creates a new user with the specified name. + * + * @param userName + * @return the user + */ + User createUser(String userName, String password) throws IdentityException, IllegalArgumentException; + + /** + * Remove a user. + * + * @param id the user id + */ + void removeUser(Object id) throws IdentityException, IllegalArgumentException; + + /** + * Get a range of users. + * + * @param offset the offset of the first result to retrieve + * @param limit the maximum number of users to retrieve + * @return the user set + */ + Set findUsers(int offset, int limit) throws IdentityException, IllegalArgumentException; + + /** + * Get a range of users. + * + * @param filter a string filter applied to the user name. + * @param offset the offset of the frist result to retrieve + * @param limit the maximum number of users to retrieve + * @return the user set + */ + Set findUsersFilteredByUserName(String filter, int offset, int limit) throws IdentityException, IllegalArgumentException; + + /** + * Returns the number of users. + * + * @return the number of users + */ + int getUserCount() throws IdentityException, IllegalArgumentException; +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/UserProfileModule.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,76 +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.portal.identity; - -import org.jboss.portal.identity.IdentityException; -import org.jboss.portal.identity.info.ProfileInfo; -import org.jboss.portal.identity.User; - -import java.util.Map; - -/** - * Manages user properties - * - * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> - * @version $Revision: 1.1 $ - */ -public interface UserProfileModule -{ - - /** - * Returns user property - * @param user - * @param propertyName - * @return - * @throws IdentityException - * @throws IllegalArgumentException - */ - public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException; - - /** - * Sets user property. If the property value is null the property will be removed. - * @param user - * @param name - * @param property value - * @throws IdentityException - * @throws IllegalArgumentException - */ - public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException; - - /** - * Returns all properties related to user - * @param user - * @return - * @throws IdentityException - * @throws IllegalArgumentException - */ - public Map getProperties(User user) throws IdentityException, IllegalArgumentException; - - /** - * Return ProfileInfo object that can be used to obtain PropertyInfo on specific property name. - * @return - * @throws IdentityException - */ - public ProfileInfo getProfileInfo() throws IdentityException; - -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/UserProfileModule.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserProfileModule.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,76 @@ +/****************************************************************************** + * 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; + +import org.jboss.portal.identity.IdentityException; +import org.jboss.portal.identity.info.ProfileInfo; +import org.jboss.portal.identity.User; + +import java.util.Map; + +/** + * Manages user properties + * + * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> + * @version $Revision: 1.1 $ + */ +public interface UserProfileModule +{ + + /** + * Returns user property + * @param user + * @param propertyName + * @return + * @throws IdentityException + * @throws IllegalArgumentException + */ + public Object getProperty(User user, String propertyName) throws IdentityException, IllegalArgumentException; + + /** + * Sets user property. If the property value is null the property will be removed. + * @param user + * @param name + * @param property value + * @throws IdentityException + * @throws IllegalArgumentException + */ + public void setProperty(User user, String name, Object property) throws IdentityException, IllegalArgumentException; + + /** + * Returns all properties related to user + * @param user + * @return + * @throws IdentityException + * @throws IllegalArgumentException + */ + public Map getProperties(User user) throws IdentityException, IllegalArgumentException; + + /** + * Return ProfileInfo object that can be used to obtain PropertyInfo on specific property name. + * @return + * @throws IdentityException + */ + public ProfileInfo getProfileInfo() throws IdentityException; + +} Deleted: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/identity/UserStatus.java 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,45 +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.portal.identity; - -/** - * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> - * @version $Revision: 5907 $ - */ - -public class UserStatus { - - public static UserStatus OK = new UserStatus(0); - public static UserStatus DISABLE = new UserStatus(1); - public static UserStatus UNEXISTING = new UserStatus(2); - public static UserStatus NOTASSIGNEDTOROLE = new UserStatus(3); - public static UserStatus WRONGPASSWORD = new UserStatus(4); - - private int value; - - private UserStatus(int value) - { - this.value = value; - } - -} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/UserStatus.java) =================================================================== --- modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java (rev 0) +++ modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/UserStatus.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -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.portal.identity; + +/** + * @author <a href="mailto:theute@jboss.org">Thomas Heute</a> + * @version $Revision: 5907 $ + */ + +public class UserStatus { + + public static UserStatus OK = new UserStatus(0); + public static UserStatus DISABLE = new UserStatus(1); + public static UserStatus UNEXISTING = new UserStatus(2); + public static UserStatus NOTASSIGNEDTOROLE = new UserStatus(3); + public static UserStatus WRONGPASSWORD = new UserStatus(4); + + private int value; + + private UserStatus(int value) + { + this.value = value; + } + +} Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/auth (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/auth) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/boot (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/boot) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/config (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/config) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/db (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/db) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/event (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/event) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/helper (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/helper) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/info (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/info) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/ldap (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/ldap) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/management (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/management) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/metadata (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/metadata) Copied: modules/identity/trunk/identity/src/main/java/org/jboss/portal/identity/service (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/identity/service) Copied: modules/identity/trunk/identity/src/main/resources/dtd (from rev 8897, modules/identity/trunk/identity/src/resources/dtd) Copied: modules/identity/trunk/identity/src/main/resources/hibernate (from rev 8897, modules/identity/trunk/identity/src/resources/hibernate) Deleted: modules/identity/trunk/identity/src/main/resources/hibernate/domain-identity.hbm.xml =================================================================== --- modules/identity/trunk/identity/src/resources/hibernate/domain-identity.hbm.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/main/resources/hibernate/domain-identity.hbm.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,177 +0,0 @@ -<?xml version="1.0"?> - - -<!DOCTYPE hibernate-mapping PUBLIC - "-//Hibernate/Hibernate Mapping DTD 3.0//EN" - "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> -<hibernate-mapping> - <class - name="org.jboss.portal.identity.db.HibernateUserImpl" - table="jbp_users"> -  - <id - name="key" - column="jbp_uid" - type="java.lang.Long"> - <generator class="native"> - <param name="sequence">user_seq</param> - </generator> - </id> - <property - name="userName" - column="jbp_uname" - type="java.lang.String" - update="false" - insert="true" - unique="true"/> - <map - name="dynamic" - table="jbp_user_prop" - lazy="false" - sort="unsorted" - cascade="all"> -  - <key column="jbp_uid"/> - <index - column="jbp_name" - type="java.lang.String"/> - <element - column="jbp_value" - type="java.lang.String" - not-null="false" - unique="false"/> - </map> - <property - name="givenName" - column="jbp_givenname" - type="java.lang.String" - update="true" - insert="true" - unique="false"/> - <property - name="familyName" - column="jbp_familyname" - type="java.lang.String" - update="true" - insert="true" - unique="false"/> - <property - name="password" - column="jbp_password" - type="java.lang.String" - update="true" - insert="true" - unique="false"/> - <property - name="realEmail" - column="jbp_realemail" - type="java.lang.String" - update="true" - insert="true" - unique="false"/> - <property - name="fakeEmail" - column="jbp_fakeemail" - type="java.lang.String" - update="true" - insert="true" - unique="false"/> - <property - name="registrationDate" - column="jbp_regdate" - type="java.util.Date" - update="false" - insert="true" - unique="false"/> - <property - name="viewRealEmail" - column="jbp_viewrealemail" - type="boolean" - update="true" - insert="true" - unique="false"/> - <property - name="enabled" - column="jbp_enabled" - type="boolean" - update="true" - insert="true" - unique="false"/> - <set - name="roles" - table="jbp_role_membership" - lazy="false" - inverse="false" - cascade="none" - sort="unsorted"> -  - <key column="jbp_uid"/> - <many-to-many - class="org.jboss.portal.identity.db.HibernateRoleImpl" - column="jbp_rid" - outer-join="true"/> - </set> - </class> - <class - name="org.jboss.portal.identity.db.HibernateRoleImpl" - table="jbp_roles"> -  - <id - name="key" - column="jbp_rid" - type="java.lang.Long"> - <generator class="native"> - <param name="sequence">user_seq</param> - </generator> - </id> - <property - name="name" - column="jbp_name" - type="java.lang.String" - update="false" - insert="true" - unique="true"/> - <property - name="displayName" - column="jbp_displayname" - type="java.lang.String" - update="true" - insert="true" - unique="true"/> - <set - name="users" - table="jbp_role_membership" - lazy="true" - inverse="true" - cascade="none" - sort="unsorted"> -  - <key column="jbp_rid"/> - <many-to-many - class="org.jboss.portal.identity.db.HibernateUserImpl" - column="jbp_uid" - outer-join="false"/> - </set> - </class> -</hibernate-mapping> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test (from rev 8848, modules/identity/trunk/identity/src/main/org/jboss/portal/test) Copied: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity (from rev 8897, modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity) Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/GenericTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/GenericTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/GenericTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -721,6 +721,8 @@ Role g1 = ctx.getRoleModule().createRole("role1", "role1"); Role g2 = ctx.getRoleModule().createRole("role2", "role2"); ctx.getMembershipModule().assignRoles(u1, Collections.singleton(g1)); + //ctx.getMembershipModule().assignRoles(u2, (Set)CollectionBuilder.hashSet().add(g1).add(g2).get()); + //ctx.getMembershipModule().assignRoles(admin, (Set)CollectionBuilder.hashSet().add(g1).add(g2).get()); ctx.getMembershipModule().assignRoles(u2, new CollectionBuilder().add(g1).add(g2).toHashSet()); ctx.getMembershipModule().assignRoles(admin, new CollectionBuilder().add(g1).add(g2).toHashSet()); ctx.commit(); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/IdentityTestPOJO.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/IdentityTestPOJO.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/IdentityTestPOJO.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -54,6 +54,8 @@ private String dataSourceName; + private String hibernateConfig; + private HibernateSupport hibernateSupport; private IdentityContext identityContext; @@ -79,6 +81,12 @@ this.dataSourceName = dataSourceName; } + @Parameter(name="hibernateConfig") + public void setHibernateConfig(String hibernateConfig) + { + this.hibernateConfig = hibernateConfig; + } + @Parameter(name="standardIdentityConfig") public void setStandardIdentityConfig(String standardIdentityConfig) { @@ -138,6 +146,11 @@ return dataSourceName; } + public String getHibernateConfig() + { + return hibernateConfig; + } + public String getDatasources() { return datasources; Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/db/DBGenericTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/db/DBGenericTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -35,7 +35,7 @@ * @version $Revision: 5748 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/db-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/db-beans.xml") @Tag(value = {"DB","generic"}) public class DBGenericTest extends GenericTestPOJO { Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtRoleModuleTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -21,7 +21,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","RoleModule","ExtRoleModule"}) public class LDAPExtRoleModuleTest extends LDAPTestPOJO { @@ -29,6 +29,7 @@ @Test + @Tag(value = {"LDAP","RoleModule","ExtRoleModule"}) public void testFindRoleByName() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -80,6 +81,7 @@ }*/ @Test + @Tag(value = {"LDAP","RoleModule","ExtRoleModule"}) public void testgetRoleCount() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -91,6 +93,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","ExtRoleModule"}) public void testFindRolesByNames() throws Exception { Set roles = getRoleModule().findRolesByNames(new String[] {"Echo"}); @@ -140,6 +143,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","ExtRoleModule"}) public void testSearchCtx() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().findRoleByName("User11"); @@ -159,6 +163,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","ExtRoleModule"}) public void testNonStandardName() throws Exception { User u = getUserModule().findUserByUserName("jduke1"); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPExtUserModuleTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -18,7 +18,8 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public class LDAPExtUserModuleTest extends LDAPTestPOJO { @@ -31,6 +32,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public void testFindUserByName() throws Exception { LDAPUserImpl ldapu = (LDAPUserImpl)getUserModule().findUserByUserName("jduke"); @@ -39,6 +41,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public void testgetUserCount() throws Exception { LDAPUserImpl ldapu = (LDAPUserImpl)getUserModule().findUserByUserName("jduke"); @@ -52,6 +55,7 @@ //TODO: test findUsers @Test + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public void testFindUsersFilteredByName() throws Exception { getUserModule().findUsersFilteredByUserName("jduke",0,1); @@ -60,6 +64,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public void testPassword() throws Exception { //getUserModule().createUser("testUser", "testPassword"); @@ -79,6 +84,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public void testSearchCtx() throws Exception { //users should be visable in both configured search contexts @@ -102,6 +108,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","ExtUserModule"}) public void testNonStandardName() throws Exception { User u = getUserModule().findUserByUserName("jduke1"); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPGenericTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPGenericTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPGenericTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -36,7 +36,7 @@ * @author <a href="mailto:boleslaw dot dawidowicz at redhat anotherdot com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","generic"}) public class LDAPGenericTest extends LDAPTestPOJO implements GenericTest.Context { @@ -68,102 +68,119 @@ } @Test + @Tag(value = {"LDAP","generic"}) public void testFindUsersUsingFilter() throws Exception { genericTest.testFindUsersUsingFilter(); } @Test + @Tag(value = {"LDAP","generic"}) public void testFindUser1() throws Exception { genericTest.testFindUser1(); } @Test + @Tag(value = {"LDAP","generic"}) public void testFindUser2() throws Exception { genericTest.testFindUser2(); } @Test + @Tag(value = {"LDAP","generic"}) public void testFindUsers() throws Exception { genericTest.testFindUsers(); } @Test + @Tag(value = {"LDAP","generic"}) public void testFindUsers2() throws Exception { genericTest.testFindUsers2(); } @Test + @Tag(value = {"LDAP","generic"}) public void testNonStandardUserNames() throws Exception { genericTest.testNonStandardUserNames(); } @Test + @Tag(value = {"LDAP","generic"}) public void testCreateUser() throws Exception { genericTest.testCreateUser(); } @Test + @Tag(value = {"LDAP","generic"}) public void testCreateRole() throws Exception { genericTest.testCreateRole(); } @Test + @Tag(value = {"LDAP","generic"}) public void testCountUser() throws Exception { genericTest.testCountUser(); } @Test + @Tag(value = {"LDAP","generic"}) public void testRemoveNonExistingRole() throws Exception { genericTest.testRemoveNonExistingRole(); } @Test + @Tag(value = {"LDAP","generic"}) public void testRemoveRole() throws Exception { genericTest.testRemoveRole(); } @Test + @Tag(value = {"LDAP","generic"}) public void testRemoveUser() throws Exception { genericTest.testRemoveUser(); } @Test + @Tag(value = {"LDAP","generic"}) public void testFindRoles() throws Exception { genericTest.testFindRoles(); } @Test + @Tag(value = {"LDAP","generic"}) public void testFindRoleMembers() throws Exception { genericTest.testFindRoleMembers(); } @Test + @Tag(value = {"LDAP","generic"}) public void testNullProperty() throws Exception { genericTest.testNullProperty(); } @Test + @Tag(value = {"LDAP","generic"}) public void testGetProperties() throws Exception { genericTest.testGetProperties(); } @Test + @Tag(value = {"LDAP","generic"}) public void testStaticProperty() throws Exception { genericTest.testStaticProperty(); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPSimpleRoleModuleTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -38,13 +38,14 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","RoleModule","SimpleRoleModule"}) public class LDAPSimpleRoleModuleTest extends LDAPTestPOJO { private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPSimpleRoleModuleTest.class); @Test + @Tag(value = {"LDAP","RoleModule","SimpleRoleModule"}) public void testFindRoleByName() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -53,6 +54,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","SimpleRoleModule"}) public void testRemoveRole() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -72,6 +74,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","SimpleRoleModule"}) public void testCreateRole() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().createRole("testRole", "testDisplayName"); @@ -98,6 +101,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","SimpleRoleModule"}) public void testgetRoleCount() throws Exception { LDAPRoleImpl ldapr = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -109,6 +113,7 @@ } @Test + @Tag(value = {"LDAP","RoleModule","SimpleRoleModule"}) public void testFindRolesByNames() throws Exception { Set roles = getRoleModule().findRolesByNames(new String[] {"Echo"}); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPSimpleUserModuleTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -38,13 +38,14 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public class LDAPSimpleUserModuleTest extends LDAPTestPOJO { private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPSimpleUserModuleTest.class); @Test + @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public void testFirstSimple() throws Exception { @@ -52,6 +53,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public void testFindUserByName() throws Exception { LDAPUserImpl ldapu = (LDAPUserImpl)getUserModule().findUserByUserName("jduke"); @@ -60,6 +62,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public void testRemoveUser() throws Exception { LDAPUserImpl ldapu = (LDAPUserImpl)getUserModule().findUserByUserName("jduke"); @@ -79,6 +82,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public void testCreateUser() throws Exception { LDAPUserImpl ldapu = (LDAPUserImpl)getUserModule().createUser("testUser", "testPassword"); @@ -103,6 +107,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public void testgetUserCount() throws Exception { LDAPUserImpl ldapu = (LDAPUserImpl)getUserModule().findUserByUserName("jduke"); @@ -114,6 +119,7 @@ } @Test + @Tag(value = {"LDAP","UserModule","SimpleUserModule"}) public void testPassword() throws Exception { getUserModule().createUser("testUser", "testPassword"); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPStaticGroupMembershipModuleTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -40,7 +40,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","MembershipModule","StaticGroupMembershipModule"}) public class LDAPStaticGroupMembershipModuleTest extends LDAPTestPOJO { @@ -49,6 +49,7 @@ @Test + @Tag(value = {"LDAP","MembershipModule","StaticGroupMembershipModule"}) public void testGetUsers() throws Exception { LDAPRoleImpl role = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -69,6 +70,7 @@ } @Test + @Tag(value = {"LDAP","MembershipModule","StaticGroupMembershipModule"}) public void testGetRoles() throws Exception { LDAPUserImpl user = (LDAPUserImpl)getUserModule().findUserByUserName("jduke1"); @@ -101,6 +103,7 @@ } @Test + @Tag(value = {"LDAP","MembershipModule","StaticGroupMembershipModule"}) public void testAssignRoles() throws Exception { Set users = new HashSet(); @@ -127,6 +130,7 @@ } @Test + @Tag(value = {"LDAP","MembershipModule","StaticGroupMembershipModule"}) public void testAssignUsers() throws Exception { Set users = new HashSet(); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTest.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTest.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPStaticRoleMembershipModuleTest.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -39,7 +39,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","MembershipModule","StaticRoleMembershipModule"}) public class LDAPStaticRoleMembershipModuleTest extends LDAPTestPOJO { @@ -47,6 +47,7 @@ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(LDAPStaticRoleMembershipModuleTest.class); @Test + @Tag(value = {"LDAP","MembershipModule","StaticRoleMembershipModule"}) public void testGetUsers() throws Exception { LDAPRoleImpl role = (LDAPRoleImpl)getRoleModule().findRoleByName("Echo"); @@ -98,6 +99,7 @@ } @Test + @Tag(value = {"LDAP","MembershipModule","StaticRoleMembershipModule"}) public void testGetRoles() throws Exception { LDAPUserImpl user = (LDAPUserImpl)getUserModule().findUserByUserName("jduke"); @@ -149,6 +151,7 @@ } @Test + @Tag(value = {"LDAP","MembershipModule","StaticRoleMembershipModule"}) public void testAssignRoles() throws Exception { Set roles = new HashSet(); @@ -197,6 +200,7 @@ } @Test + @Tag(value = {"LDAP","MembershipModule","StaticRoleMembershipModule"}) public void testAssignUsers() throws Exception { Set users = new HashSet(); Modified: modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java =================================================================== --- modules/identity/trunk/identity/src/main/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/java/org/jboss/portal/test/identity/ldap/LDAPUserProfileModuleTestCase.java 2007-11-14 16:33:10 UTC (rev 8927) @@ -37,7 +37,7 @@ * @author <a href="mailto:boleslaw.dawidowicz@jboss.org">Boleslaw Dawidowicz</a> * @version $Revision: 1.1 $ */ -@Bootstrap(resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") +@Bootstrap(beanName = "TestCase", resourceName = "/org/jboss/portal/test/identity/ldap-beans.xml") @Tag(value = {"LDAP","UserProfileModule"}) public class LDAPUserProfileModuleTestCase extends LDAPTestPOJO { @@ -55,6 +55,7 @@ } @Test + @Tag(value = {"LDAP","UserProfileModule"}) public void testSetPropertyWithDB() throws Exception { begin(); Copied: modules/identity/trunk/identity/src/test/resources/config (from rev 8848, modules/identity/trunk/identity/src/resources/test/config) Deleted: modules/identity/trunk/identity/src/test/resources/config/db-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/db-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/db-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,69 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - - -<identity-configuration> - <datasources/> - <modules> - <module> -  - <type>User</type> - <implementation>DB</implementation> - <config/> - </module> - <module> -  - <type>Role</type> - <implementation>DB</implementation> - <config/> - </module> - <module> -  - <type>Membership</type> - <implementation>DB</implementation> - <config/> - </module> - <module> -  - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - <config> - <option> - <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> - </option> - </config> - </module> - <module> - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - <config/> - </module> - </modules> - <options/> -</identity-configuration> Copied: modules/identity/trunk/identity/src/test/resources/config/db-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/db-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/db-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/db-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + + +<identity-configuration> + <datasources/> + <modules> + <module> +  + <type>User</type> + <implementation>DB</implementation> + <config/> + </module> + <module> +  + <type>Role</type> + <implementation>DB</implementation> + <config/> + </module> + <module> +  + <type>Membership</type> + <implementation>DB</implementation> + <config/> + </module> + <module> +  + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>config/profile-config.xml</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + </modules> + <options/> +</identity-configuration> Copied: modules/identity/trunk/identity/src/test/resources/config/extrole (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/extrole) Modified: modules/identity/trunk/identity/src/test/resources/config/extrole/opends-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extrole/opends-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extrole/opends-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -76,7 +76,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/extrole/openldap-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extrole/openldap-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extrole/openldap-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -76,7 +76,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/extrole/rhds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extrole/rhds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extrole/rhds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -76,7 +76,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/extrole/sunds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extrole/sunds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extrole/sunds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -76,7 +76,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Copied: modules/identity/trunk/identity/src/test/resources/config/extuser (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/extuser) Modified: modules/identity/trunk/identity/src/test/resources/config/extuser/opends-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extuser/opends-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extuser/opends-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/extuser/openldap-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extuser/openldap-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extuser/openldap-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/extuser/rhds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extuser/rhds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extuser/rhds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/extuser/sunds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/extuser/sunds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/extuser/sunds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Copied: modules/identity/trunk/identity/src/test/resources/config/identity (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/identity) Modified: modules/identity/trunk/identity/src/test/resources/config/identity/opends-config-staticrole.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/opends-config-staticrole.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/opends-config-staticrole.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/identity/opends-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/opends-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/opends-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -74,7 +74,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/identity/openldap-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/openldap-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/openldap-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -74,7 +74,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/identity/rhds-config-staticrole.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/rhds-config-staticrole.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/rhds-config-staticrole.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/identity/rhds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/rhds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/rhds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -74,7 +74,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/identity/sunds-config-staticrole.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/sunds-config-staticrole.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/sunds-config-staticrole.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/identity/sunds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/identity/sunds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/identity/sunds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -74,7 +74,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Deleted: modules/identity/trunk/identity/src/test/resources/config/msad-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/msad-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/msad-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,149 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - -<identity-configuration> - <datasources> - <datasource> - <name>LDAP</name> - <config> - <option> - <name>host</name> - <value>dev44.qa.atl.jboss.com</value> - </option> - <option> - <name>port</name> - <value>389</value> - </option> - <option> - <name>adminDN</name> - <value>JBOSS\jbossqa</value> - </option> - <option> - <name>adminPassword</name> - <value>jboss42</value> - </option> - </config> - </datasource> - </datasources> - <modules> - <module> -  - <type>User</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Role</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Membership</type> - <implementation>LDAP</implementation> - <config/> - </module> - - <module> - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - <config> - <option> - <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> - </option> - <option> - <name>ldapModuleJNDIName</name> - <value>java:/portal/LDAPUserProfileModule</value> - </option> - </config> - </module> - <module> - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - <config/> - </module> - <module> - <type>LDAPDelegateUserProfile</type> - <implementation>LDAP</implementation> - <config/> - </module> - </modules> - - <options> - <option-group> - <group-name>common</group-name> - <option> - <name>uidAttributeID</name> - <value>cn</value> - </option> - <option> - <name>userCtxDN</name> - <value>ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value> - </option> - <option> - <name>roleCtxDN</name> - <value>ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test</value> - </option> - </option-group> - <option-group> - <group-name>userCreateAttibutes</group-name> - <option> - <name>objectClass</name> -  - <value>top</value> - <value>person</value> - <value>inetOrgPerson</value> - <value>organizationalPerson</value> - <value>user</value> - </option> -  -  -  - <option> - <name>sn</name> - <value>none</value> - </option> - </option-group> - <option-group> - <group-name>roleCreateAttibutes</group-name> -  -  - <option> - <name>member</name> -  - <value>cn=jduke,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value> - </option> - </option-group> - </options> -</identity-configuration> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/config/msad-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/msad-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/msad-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/msad-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,149 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> + <config> + <option> + <name>host</name> + <value>dev44.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>389</value> + </option> + <option> + <name>adminDN</name> + <value>JBOSS\jbossqa</value> + </option> + <option> + <name>adminPassword</name> + <value>jboss42</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> +  + <type>User</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Role</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Membership</type> + <implementation>LDAP</implementation> + <config/> + </module> + + <module> + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>config/profile-config.xml</value> + </option> + <option> + <name>ldapModuleJNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + <module> + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + <config/> + </module> + </modules> + + <options> + <option-group> + <group-name>common</group-name> + <option> + <name>uidAttributeID</name> + <value>cn</value> + </option> + <option> + <name>userCtxDN</name> + <value>ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,ou=testsuite,ou=portal,dc=jboss,dc=test</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> +  + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + <value>organizationalPerson</value> + <value>user</value> + </option> +  +  +  + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + <option-group> + <group-name>roleCreateAttibutes</group-name> +  +  + <option> + <name>member</name> +  + <value>cn=jduke,ou=People,ou=testsuite,ou=portal,dc=jboss,dc=test</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Deleted: modules/identity/trunk/identity/src/test/resources/config/opends-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/opends-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/opends-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - -<identity-configuration> - <datasources> - <datasource> - <name>LDAP</name> - <config> - <option> - <name>host</name> - <value>localhost</value> - </option> - <option> - <name>port</name> - <value>10389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>password</value> - </option> - </config> - </datasource> - </datasources> - <modules> - <module> -  - <type>User</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Role</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Membership</type> - <implementation>LDAP</implementation> - <config/> - </module> - - <module> - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - <config> - <option> - <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> - </option> - <option> - <name>ldapModuleJNDIName</name> - <value>java:/portal/LDAPUserProfileModule</value> - </option> - </config> - </module> - <module> - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - <config/> - </module> - <module> - <type>LDAPDelegateUserProfile</type> - <implementation>LDAP</implementation> - <config/> - </module> - </modules> - - <options> - <option-group> - <group-name>common</group-name> - <option> - <name>userCtxDN</name> - <value>ou=People,dc=example,dc=com</value> - </option> - <option> - <name>roleCtxDN</name> - <value>ou=Roles,dc=example,dc=com</value> - </option> - </option-group> - <option-group> - <group-name>userCreateAttibutes</group-name> - <option> - <name>objectClass</name> -  - <value>top</value> - <value>person</value> - <value>inetOrgPerson</value> - </option> -  - <option> - <name>cn</name> - <value>none</value> - </option> - <option> - <name>sn</name> - <value>none</value> - </option> - </option-group> - <option-group> - <group-name>roleCreateAttibutes</group-name> -  - <option> - <name>cn</name> - <value>none</value> - </option> -  -  - <option> - <name>member</name> - <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> - </option> - </option-group> - </options> -</identity-configuration> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/config/opends-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/opends-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/opends-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/opends-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> + <config> + <option> + <name>host</name> + <value>localhost</value> + </option> + <option> + <name>port</name> + <value>10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> +  + <type>User</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Role</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Membership</type> + <implementation>LDAP</implementation> + <config/> + </module> + + <module> + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>config/profile-config.xml</value> + </option> + <option> + <name>ldapModuleJNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + <module> + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + <config/> + </module> + </modules> + + <options> + <option-group> + <group-name>common</group-name> + <option> + <name>userCtxDN</name> + <value>ou=People,dc=example,dc=com</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=example,dc=com</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> +  + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> +  + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + <option-group> + <group-name>roleCreateAttibutes</group-name> +  + <option> + <name>cn</name> + <value>none</value> + </option> +  +  + <option> + <name>member</name> + <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Deleted: modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/openldap-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - -<identity-configuration> - <datasources> - <datasource> - <name>LDAP</name> - <config> - <option> - <name>host</name> - <value>dev39.qa.atl.jboss.com</value> - </option> - <option> - <name>port</name> - <value>389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Manager,dc=my-domain,dc=com</value> - </option> - <option> - <name>adminPassword</name> - <value>jbossqa</value> - </option> - </config> - </datasource> - </datasources> - <modules> - <module> -  - <type>User</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Role</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Membership</type> - <implementation>LDAP</implementation> - <config/> - </module> - - <module> - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - <config> - <option> - <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> - </option> - <option> - <name>ldapModuleJNDIName</name> - <value>java:/portal/LDAPUserProfileModule</value> - </option> - </config> - </module> - <module> - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - <config/> - </module> - <module> - <type>LDAPDelegateUserProfile</type> - <implementation>LDAP</implementation> - <config/> - </module> - </modules> - - <options> - <option-group> - <group-name>common</group-name> - <option> - <name>userCtxDN</name> - <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> - </option> - <option> - <name>roleCtxDN</name> - <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> - </option> - </option-group> - <option-group> - <group-name>userCreateAttibutes</group-name> - <option> - <name>objectClass</name> -  - <value>top</value> - <value>person</value> - <value>inetOrgPerson</value> - </option> -  - <option> - <name>cn</name> - <value>none</value> - </option> - <option> - <name>sn</name> - <value>none</value> - </option> - </option-group> - <option-group> - <group-name>roleCreateAttibutes</group-name> -  - <option> - <name>cn</name> - <value>none</value> - </option> -  -  - <option> - <name>member</name> - <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> - </option> - </option-group> - </options> -</identity-configuration> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/openldap-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/openldap-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> + <config> + <option> + <name>host</name> + <value>dev39.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Manager,dc=my-domain,dc=com</value> + </option> + <option> + <name>adminPassword</name> + <value>jbossqa</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> +  + <type>User</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Role</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Membership</type> + <implementation>LDAP</implementation> + <config/> + </module> + + <module> + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>config/profile-config.xml</value> + </option> + <option> + <name>ldapModuleJNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + <module> + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + <config/> + </module> + </modules> + + <options> + <option-group> + <group-name>common</group-name> + <option> + <name>userCtxDN</name> + <value>ou=People,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=my-domain,dc=com</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> +  + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> +  + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + <option-group> + <group-name>roleCreateAttibutes</group-name> +  + <option> + <name>cn</name> + <value>none</value> + </option> +  +  + <option> + <name>member</name> + <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Deleted: modules/identity/trunk/identity/src/test/resources/config/profile-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/profile-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/profile-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,412 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - -<profile> -  - <property> - <name>user.name.nickName</name> - <type>java.lang.String</type> - <access-mode>read-only</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Name</display-name> - <description xml:lang="en">The user name</description> - <mapping> - <database> - <type>column</type> - <value>jbp_uname</value> - </database> - </mapping> - </property> - <property> - <name>user.name.given</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Given Name</display-name> - <description xml:lang="en">The user given name</description> - <mapping> - <database> - <type>column</type> - <value>jbp_givenname</value> - </database> - </mapping> - </property> - <property> - <name>user.name.family</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Family name</display-name> - <description xml:lang="en">The user family name</description> - <mapping> - <database> - <type>column</type> - <value>jbp_familyname</value> - </database> - </mapping> - </property> - <property> - <name>user.business-info.online.email</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Email</display-name> - <description xml:lang="en">The user real email</description> - <mapping> - <database> - <type>column</type> - <value>jbp_realemail</value> - </database> - <ldap> - <value>mail</value> - </ldap> - </mapping> - </property> - <property> - <name>portal.user.email.fake</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Fake email</display-name> - <description xml:lang="en">The user fake email</description> - <mapping> - <database> - <type>column</type> - <value>jbp_fakeemail</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.registration-date</name> - <type>java.util.Date</type> - <access-mode>read-only</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Registration date</display-name> - <description xml:lang="en">Registration date of user</description> - <mapping> - <database> - <type>column</type> - <value>jbp_regdate</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.email.view-real</name> - <type>java.lang.Boolean</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">View real email</display-name> - <description xml:lang="en">Is user real email displayed in public</description> - <mapping> - <database> - <type>column</type> - <value>jbp_viewrealemail</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.enabled</name> - <type>java.lang.Boolean</type> - <access-mode>read-write</access-mode> - <usage>mandatory</usage> - <display-name xml:lang="en">Enabled</display-name> - <description xml:lang="en">User enabled state</description> - <mapping> - <database> - <type>column</type> - <value>jbp_enabled</value> - </database> - </mapping> - </property> - -  - <property> - <name>portal.user.location</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Location</display-name> - <description xml:lang="en">The user location</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.location</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.occupation</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Occupation</display-name> - <description xml:lang="en">The user occupation</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.occupation</value> - </database> - <ldap> - <value>title</value> - </ldap> - </mapping> - </property> - <property> - <name>portal.user.extra</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Extra info</display-name> - <description xml:lang="en">Extra informtion about user</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.extra</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.signature</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Signature</display-name> - <description xml:lang="en">The user signature</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.signature</value> - </database> -  - </mapping> - </property> - <property> - <name>portal.user.interests</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Interests</display-name> - <description xml:lang="en">The user interests</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.interests</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.locale</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Locale</display-name> - <description xml:lang="en">The user locale</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.locale</value> - </database> -  -  -  - </mapping> - </property> - <property> - <name>portal.user.im.icq</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">ICQ</display-name> - <description xml:lang="en">The user ICQ id</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.im.icq</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.im.aim</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">AIM</display-name> - <description xml:lang="en">The user AIM id</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.im.aim</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.im.msnm</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">MSN</display-name> - <description xml:lang="en">The user MSN id</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.im.msnm</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.im.yim</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">YIM</display-name> - <description xml:lang="en">The user YIM id</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.im.yim</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.im.skype</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Skype</display-name> - <description xml:lang="en">The user skype id</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.im.skype</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.im.xmmp</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">XMMP</display-name> - <description xml:lang="en">The user XMMP id</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.im.xmmp</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.homepage</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Homepage</display-name> - <description xml:lang="en">The user homepage</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.homepage</value> - </database> - <ldap> - <value>seeAlso</value> - </ldap> - </mapping> - </property> - <property> - <name>portal.user.time-zone-offset</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Timezone</display-name> - <description xml:lang="en">Timezone in users location</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.time-zone-offset</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.theme</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Theme</display-name> - <description xml:lang="en">Portlat theme that user is using</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.theme</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.security.question</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Password Question</display-name> - <description xml:lang="en">Portal password recovery question</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.security.question</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.security.answer</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Password Answer</display-name> - <description xml:lang="en">Portal password recovery answer</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.security.answer</value> - </database> - </mapping> - </property> - <property> - <name>portal.user.last-login-date</name> - <type>java.lang.String</type> - <access-mode>read-write</access-mode> - <usage>optional</usage> - <display-name xml:lang="en">Last login</display-name> - <description xml:lang="en">The date of users last login</description> - <mapping> - <database> - <type>dynamic</type> - <value>portal.user.last-login-date</value> - </database> - </mapping> - </property> -</profile> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/config/profile-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/profile-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/profile-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/profile-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,412 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + +<profile> +  + <property> + <name>user.name.nickName</name> + <type>java.lang.String</type> + <access-mode>read-only</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Name</display-name> + <description xml:lang="en">The user name</description> + <mapping> + <database> + <type>column</type> + <value>jbp_uname</value> + </database> + </mapping> + </property> + <property> + <name>user.name.given</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Given Name</display-name> + <description xml:lang="en">The user given name</description> + <mapping> + <database> + <type>column</type> + <value>jbp_givenname</value> + </database> + </mapping> + </property> + <property> + <name>user.name.family</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Family name</display-name> + <description xml:lang="en">The user family name</description> + <mapping> + <database> + <type>column</type> + <value>jbp_familyname</value> + </database> + </mapping> + </property> + <property> + <name>user.business-info.online.email</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Email</display-name> + <description xml:lang="en">The user real email</description> + <mapping> + <database> + <type>column</type> + <value>jbp_realemail</value> + </database> + <ldap> + <value>mail</value> + </ldap> + </mapping> + </property> + <property> + <name>portal.user.email.fake</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Fake email</display-name> + <description xml:lang="en">The user fake email</description> + <mapping> + <database> + <type>column</type> + <value>jbp_fakeemail</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.registration-date</name> + <type>java.util.Date</type> + <access-mode>read-only</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Registration date</display-name> + <description xml:lang="en">Registration date of user</description> + <mapping> + <database> + <type>column</type> + <value>jbp_regdate</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.email.view-real</name> + <type>java.lang.Boolean</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">View real email</display-name> + <description xml:lang="en">Is user real email displayed in public</description> + <mapping> + <database> + <type>column</type> + <value>jbp_viewrealemail</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.enabled</name> + <type>java.lang.Boolean</type> + <access-mode>read-write</access-mode> + <usage>mandatory</usage> + <display-name xml:lang="en">Enabled</display-name> + <description xml:lang="en">User enabled state</description> + <mapping> + <database> + <type>column</type> + <value>jbp_enabled</value> + </database> + </mapping> + </property> + +  + <property> + <name>portal.user.location</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Location</display-name> + <description xml:lang="en">The user location</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.location</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.occupation</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Occupation</display-name> + <description xml:lang="en">The user occupation</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.occupation</value> + </database> + <ldap> + <value>title</value> + </ldap> + </mapping> + </property> + <property> + <name>portal.user.extra</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Extra info</display-name> + <description xml:lang="en">Extra informtion about user</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.extra</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.signature</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Signature</display-name> + <description xml:lang="en">The user signature</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.signature</value> + </database> +  + </mapping> + </property> + <property> + <name>portal.user.interests</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Interests</display-name> + <description xml:lang="en">The user interests</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.interests</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.locale</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Locale</display-name> + <description xml:lang="en">The user locale</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.locale</value> + </database> +  +  +  + </mapping> + </property> + <property> + <name>portal.user.im.icq</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">ICQ</display-name> + <description xml:lang="en">The user ICQ id</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.icq</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.im.aim</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">AIM</display-name> + <description xml:lang="en">The user AIM id</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.aim</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.im.msnm</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">MSN</display-name> + <description xml:lang="en">The user MSN id</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.msnm</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.im.yim</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">YIM</display-name> + <description xml:lang="en">The user YIM id</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.yim</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.im.skype</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Skype</display-name> + <description xml:lang="en">The user skype id</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.skype</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.im.xmmp</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">XMMP</display-name> + <description xml:lang="en">The user XMMP id</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.im.xmmp</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.homepage</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Homepage</display-name> + <description xml:lang="en">The user homepage</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.homepage</value> + </database> + <ldap> + <value>seeAlso</value> + </ldap> + </mapping> + </property> + <property> + <name>portal.user.time-zone-offset</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Timezone</display-name> + <description xml:lang="en">Timezone in users location</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.time-zone-offset</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.theme</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Theme</display-name> + <description xml:lang="en">Portlat theme that user is using</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.theme</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.security.question</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Password Question</display-name> + <description xml:lang="en">Portal password recovery question</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.security.question</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.security.answer</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Password Answer</display-name> + <description xml:lang="en">Portal password recovery answer</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.security.answer</value> + </database> + </mapping> + </property> + <property> + <name>portal.user.last-login-date</name> + <type>java.lang.String</type> + <access-mode>read-write</access-mode> + <usage>optional</usage> + <display-name xml:lang="en">Last login</display-name> + <description xml:lang="en">The date of users last login</description> + <mapping> + <database> + <type>dynamic</type> + <value>portal.user.last-login-date</value> + </database> + </mapping> + </property> +</profile> \ No newline at end of file Deleted: modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/rhds-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - -<identity-configuration> - <datasources> - <datasource> - <name>LDAP</name> - <config> - <option> - <name>host</name> - <value>dev39.qa.atl.jboss.com</value> - </option> - <option> - <name>port</name> - <value>10389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>qpq123qpq</value> - </option> - </config> - </datasource> - </datasources> - <modules> - <module> -  - <type>User</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Role</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Membership</type> - <implementation>LDAP</implementation> - <config/> - </module> - - <module> - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - <config> - <option> - <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> - </option> - <option> - <name>ldapModuleJNDIName</name> - <value>java:/portal/LDAPUserProfileModule</value> - </option> - </config> - </module> - <module> - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - <config/> - </module> - <module> - <type>LDAPDelegateUserProfile</type> - <implementation>LDAP</implementation> - <config/> - </module> - </modules> - - <options> - <option-group> - <group-name>common</group-name> - <option> - <name>userCtxDN</name> - <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> - </option> - <option> - <name>roleCtxDN</name> - <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> - </option> - </option-group> - <option-group> - <group-name>userCreateAttibutes</group-name> - <option> - <name>objectClass</name> -  - <value>top</value> - <value>person</value> - <value>inetOrgPerson</value> - </option> -  - <option> - <name>cn</name> - <value>none</value> - </option> - <option> - <name>sn</name> - <value>none</value> - </option> - </option-group> - <option-group> - <group-name>roleCreateAttibutes</group-name> -  - <option> - <name>cn</name> - <value>none</value> - </option> -  -  - <option> - <name>member</name> - <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> - </option> - </option-group> - </options> -</identity-configuration> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/rhds-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/rhds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> + <config> + <option> + <name>host</name> + <value>dev39.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>10389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>qpq123qpq</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> +  + <type>User</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Role</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Membership</type> + <implementation>LDAP</implementation> + <config/> + </module> + + <module> + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>config/profile-config.xml</value> + </option> + <option> + <name>ldapModuleJNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + <module> + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + <config/> + </module> + </modules> + + <options> + <option-group> + <group-name>common</group-name> + <option> + <name>userCtxDN</name> + <value>ou=People,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> +  + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> +  + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + <option-group> + <group-name>roleCreateAttibutes</group-name> +  + <option> + <name>cn</name> + <value>none</value> + </option> +  +  + <option> + <name>member</name> + <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Deleted: modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/standardidentity-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,382 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - - - -<identity-configuration> - <datasources> - <datasource> - <name>LDAP</name> -  - <service-name>portal:service=Module,type=LDAPConnectionContext</service-name> - <class>org.jboss.portal.identity.ldap.LDAPConnectionContext</class> - <config> - <option> - <name>host</name> - <value>jboss.com</value> - </option> - <option> - <name>port</name> - <value>389</value> - </option> - <option> - <name>contextFactory</name> - <value>com.sun.jndi.ldap.LdapCtxFactory</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>password</value> - </option> - <option> - <name>JNDIName</name> - <value>java:/portal/LDAPConnectionContext</value> - </option> - </config> - </datasource> - </datasources> - <modules> - - <module> -  - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - -  - <service-name>portal:service=Module,type=UserProfile</service-name> - <class>org.jboss.portal.identity.DelegatingUserProfileModuleImpl</class> -  - <config> - <option> - <name>JNDIName</name> - <value>java:/portal/UserProfileModule</value> - </option> - <option> - <name>dbModuleJNDIName</name> - <value>java:/portal/DBUserProfileModule</value> - </option> - <option> - <name>profileConfigFile</name> - <value>conf/identity/profile-config.xml</value> - </option> - </config> - </module> - - - - <module> -  - <type>User</type> - <implementation>DB</implementation> - -  - <service-name>portal:service=Module,type=User</service-name> - <class>org.jboss.portal.identity.db.HibernateUserModuleImpl</class> - -  - <config> - <option> - <name>sessionFactoryJNDIName</name> - <value>java:/portal/IdentitySessionFactory</value> - </option> - <option> - <name>JNDIName</name> - <value>java:/portal/UserModule</value> - </option> - </config> - </module> - - <module> -  - <type>Role</type> - <implementation>DB</implementation> - -  - <service-name>portal:service=Module,type=Role</service-name> - <class>org.jboss.portal.identity.db.HibernateRoleModuleImpl</class> - -  - <config> - <option> - <name>sessionFactoryJNDIName</name> - <value>java:/portal/IdentitySessionFactory</value> - </option> - <option> - <name>JNDIName</name> - <value>java:/portal/RoleModule</value> - </option> - </config> - </module> - - <module> -  - <type>Membership</type> - <implementation>DB</implementation> - -  - <service-name>portal:service=Module,type=Membership</service-name> - <class>org.jboss.portal.identity.db.HibernateMembershipModuleImpl</class> - -  - <config> - <option> - <name>sessionFactoryJNDIName</name> - <value>java:/portal/IdentitySessionFactory</value> - </option> - <option> - <name>JNDIName</name> - <value>java:/portal/MembershipModule</value> - </option> - </config> - </module> - - <module> -  - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - -  - <service-name>portal:service=Module,type=DBUserProfile</service-name> - <class>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</class> - -  - <config> - <option> - <name>sessionFactoryJNDIName</name> - <value>java:/portal/IdentitySessionFactory</value> - </option> - <option> - <name>JNDIName</name> - <value>java:/portal/DBUserProfileModule</value> - </option> - </config> - </module> - -  - <module> -  - <type>User</type> - <implementation>LDAP</implementation> - -  - <service-name>portal:service=Module,type=User</service-name> - <class>org.jboss.portal.identity.ldap.LDAPUserModuleImpl</class> - -  - <config> - <option> - <name>JNDIName</name> - <value>java:/portal/UserModule</value> - </option> - <option> - <name>connectionJNDIName</name> - <value>java:/portal/LDAPConnectionContext</value> - </option> - </config> - </module> - - <module> -  - <type>Role</type> - <implementation>LDAP</implementation> - -  - <service-name>portal:service=Module,type=Role</service-name> - <class>org.jboss.portal.identity.ldap.LDAPRoleModuleImpl</class> - -  - <config> - <option> - <name>JNDIName</name> - <value>java:/portal/RoleModule</value> - </option> - <option> - <name>connectionJNDIName</name> - <value>java:/portal/LDAPConnectionContext</value> - </option> - </config> - </module> - - <module> -  - <type>Membership</type> - <implementation>LDAP</implementation> - -  - <service-name>portal:service=Module,type=Membership</service-name> - <class>org.jboss.portal.identity.ldap.LDAPStaticGroupMembershipModuleImpl</class> - -  - <config> - <option> - <name>JNDIName</name> - <value>java:/portal/MembershipModule</value> - </option> - <option> - <name>connectionJNDIName</name> - <value>java:/portal/LDAPConnectionContext</value> - </option> - </config> - </module> - - <module> -  - <type>LDAPDelegateUserProfile</type> - <implementation>LDAP</implementation> - -  - <service-name>portal:service=Module,type=LDAPUserProfile</service-name> - <class>org.jboss.portal.identity.ldap.LDAPUserProfileModuleImpl</class> - -  - <config> -  -  -  - <option> - <name>JNDIName</name> - <value>java:/portal/LDAPUserProfileModule</value> - </option> - <option> - <name>connectionJNDIName</name> - <value>java:/portal/LDAPConnectionContext</value> - </option> - </config> - </module> - - </modules> - - <options> -  - <option-group> - <group-name>common</group-name> - <option> - <name>userCtxDN</name> - <value>ou=People,dc=example,dc=com</value> - </option> - <option> - <name>uidAttributeID</name> - <value>uid</value> - </option> - <option> - <name>passwordAttributeID</name> - <value>userPassword</value> - </option> - <option> - <name>roleCtxDN</name> - <value>ou=Roles,dc=example,dc=com</value> - </option> - <option> - <name>ridAttributeID</name> - <value>cn</value> - </option> - <option> - <name>roleDisplayNameAttributeID</name> - <value>cn</value> - </option> - <option> - <name>membershipAttributeID</name> - <value>member</value> - </option> - <option> - <name>membershipAttributeIsDN</name> - <value>true</value> - </option> - </option-group> - <option-group> - <group-name>userCreateAttibutes</group-name> - <option> - <name>objectClass</name> - <value>top</value> - <value>uidObject</value> - <value>person</value> - <value>inetUser</value> - </option> -  -  - <option> - <name>sn</name> - <value>none</value> - </option> - </option-group> - <option-group> - <group-name>roleCreateAttibutes</group-name> - <option> - <name>objectClass</name> - <value>top</value> - <value>groupOfNames</value> - </option> -  -  -  -  -  - </option-group> - </options> -</identity-configuration> - - - - - - - - - - - - - - - - - - - - Copied: modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/standardidentity-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/standardidentity-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,382 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + + + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> +  + <service-name>portal:service=Module,type=LDAPConnectionContext</service-name> + <class>org.jboss.portal.identity.ldap.LDAPConnectionContext</class> + <config> + <option> + <name>host</name> + <value>jboss.com</value> + </option> + <option> + <name>port</name> + <value>389</value> + </option> + <option> + <name>contextFactory</name> + <value>com.sun.jndi.ldap.LdapCtxFactory</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>password</value> + </option> + <option> + <name>JNDIName</name> + <value>java:/portal/LDAPConnectionContext</value> + </option> + </config> + </datasource> + </datasources> + <modules> + + <module> +  + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + +  + <service-name>portal:service=Module,type=UserProfile</service-name> + <class>org.jboss.portal.identity.DelegatingUserProfileModuleImpl</class> +  + <config> + <option> + <name>JNDIName</name> + <value>java:/portal/UserProfileModule</value> + </option> + <option> + <name>dbModuleJNDIName</name> + <value>java:/portal/DBUserProfileModule</value> + </option> + <option> + <name>profileConfigFile</name> + <value>conf/identity/profile-config.xml</value> + </option> + </config> + </module> + + + + <module> +  + <type>User</type> + <implementation>DB</implementation> + +  + <service-name>portal:service=Module,type=User</service-name> + <class>org.jboss.portal.identity.db.HibernateUserModuleImpl</class> + +  + <config> + <option> + <name>sessionFactoryJNDIName</name> + <value>java:/portal/IdentitySessionFactory</value> + </option> + <option> + <name>JNDIName</name> + <value>java:/portal/UserModule</value> + </option> + </config> + </module> + + <module> +  + <type>Role</type> + <implementation>DB</implementation> + +  + <service-name>portal:service=Module,type=Role</service-name> + <class>org.jboss.portal.identity.db.HibernateRoleModuleImpl</class> + +  + <config> + <option> + <name>sessionFactoryJNDIName</name> + <value>java:/portal/IdentitySessionFactory</value> + </option> + <option> + <name>JNDIName</name> + <value>java:/portal/RoleModule</value> + </option> + </config> + </module> + + <module> +  + <type>Membership</type> + <implementation>DB</implementation> + +  + <service-name>portal:service=Module,type=Membership</service-name> + <class>org.jboss.portal.identity.db.HibernateMembershipModuleImpl</class> + +  + <config> + <option> + <name>sessionFactoryJNDIName</name> + <value>java:/portal/IdentitySessionFactory</value> + </option> + <option> + <name>JNDIName</name> + <value>java:/portal/MembershipModule</value> + </option> + </config> + </module> + + <module> +  + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + +  + <service-name>portal:service=Module,type=DBUserProfile</service-name> + <class>org.jboss.portal.identity.db.HibernateUserProfileModuleImpl</class> + +  + <config> + <option> + <name>sessionFactoryJNDIName</name> + <value>java:/portal/IdentitySessionFactory</value> + </option> + <option> + <name>JNDIName</name> + <value>java:/portal/DBUserProfileModule</value> + </option> + </config> + </module> + +  + <module> +  + <type>User</type> + <implementation>LDAP</implementation> + +  + <service-name>portal:service=Module,type=User</service-name> + <class>org.jboss.portal.identity.ldap.LDAPUserModuleImpl</class> + +  + <config> + <option> + <name>JNDIName</name> + <value>java:/portal/UserModule</value> + </option> + <option> + <name>connectionJNDIName</name> + <value>java:/portal/LDAPConnectionContext</value> + </option> + </config> + </module> + + <module> +  + <type>Role</type> + <implementation>LDAP</implementation> + +  + <service-name>portal:service=Module,type=Role</service-name> + <class>org.jboss.portal.identity.ldap.LDAPRoleModuleImpl</class> + +  + <config> + <option> + <name>JNDIName</name> + <value>java:/portal/RoleModule</value> + </option> + <option> + <name>connectionJNDIName</name> + <value>java:/portal/LDAPConnectionContext</value> + </option> + </config> + </module> + + <module> +  + <type>Membership</type> + <implementation>LDAP</implementation> + +  + <service-name>portal:service=Module,type=Membership</service-name> + <class>org.jboss.portal.identity.ldap.LDAPStaticGroupMembershipModuleImpl</class> + +  + <config> + <option> + <name>JNDIName</name> + <value>java:/portal/MembershipModule</value> + </option> + <option> + <name>connectionJNDIName</name> + <value>java:/portal/LDAPConnectionContext</value> + </option> + </config> + </module> + + <module> +  + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + +  + <service-name>portal:service=Module,type=LDAPUserProfile</service-name> + <class>org.jboss.portal.identity.ldap.LDAPUserProfileModuleImpl</class> + +  + <config> +  +  +  + <option> + <name>JNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + <option> + <name>connectionJNDIName</name> + <value>java:/portal/LDAPConnectionContext</value> + </option> + </config> + </module> + + </modules> + + <options> +  + <option-group> + <group-name>common</group-name> + <option> + <name>userCtxDN</name> + <value>ou=People,dc=example,dc=com</value> + </option> + <option> + <name>uidAttributeID</name> + <value>uid</value> + </option> + <option> + <name>passwordAttributeID</name> + <value>userPassword</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=example,dc=com</value> + </option> + <option> + <name>ridAttributeID</name> + <value>cn</value> + </option> + <option> + <name>roleDisplayNameAttributeID</name> + <value>cn</value> + </option> + <option> + <name>membershipAttributeID</name> + <value>member</value> + </option> + <option> + <name>membershipAttributeIsDN</name> + <value>true</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> + <value>top</value> + <value>uidObject</value> + <value>person</value> + <value>inetUser</value> + </option> +  +  + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + <option-group> + <group-name>roleCreateAttibutes</group-name> + <option> + <name>objectClass</name> + <value>top</value> + <value>groupOfNames</value> + </option> +  +  +  +  +  + </option-group> + </options> +</identity-configuration> + + + + + + + + + + + + + + + + + + + + Copied: modules/identity/trunk/identity/src/test/resources/config/staticgroup (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/staticgroup) Modified: modules/identity/trunk/identity/src/test/resources/config/staticgroup/rhds-config-nonDNMember.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/staticgroup/rhds-config-nonDNMember.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/staticgroup/rhds-config-nonDNMember.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -74,7 +74,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Copied: modules/identity/trunk/identity/src/test/resources/config/staticrole (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/staticrole) Modified: modules/identity/trunk/identity/src/test/resources/config/staticrole/opends-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/staticrole/opends-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/staticrole/opends-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/staticrole/rhds-config-nonDNMember.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/staticrole/rhds-config-nonDNMember.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/staticrole/rhds-config-nonDNMember.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/staticrole/rhds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/staticrole/rhds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/staticrole/rhds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Modified: modules/identity/trunk/identity/src/test/resources/config/staticrole/sunds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/staticrole/sunds-config.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/config/staticrole/sunds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -75,7 +75,7 @@ <config> <option> <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> + <value>config/profile-config.xml</value> </option> <option> <name>ldapModuleJNDIName</name> Deleted: modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml =================================================================== --- modules/identity/trunk/identity/src/resources/test/config/sunds-config.xml 2007-11-08 10:50:31 UTC (rev 8848) +++ modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,143 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -  - -<identity-configuration> - <datasources> - <datasource> - <name>LDAP</name> - <config> - <option> - <name>host</name> - <value>dev39.qa.atl.jboss.com</value> - </option> - <option> - <name>port</name> - <value>1389</value> - </option> - <option> - <name>adminDN</name> - <value>cn=Directory Manager</value> - </option> - <option> - <name>adminPassword</name> - <value>testldap</value> - </option> - </config> - </datasource> - </datasources> - <modules> - <module> -  - <type>User</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Role</type> - <implementation>LDAP</implementation> - <config/> - </module> - <module> - <type>Membership</type> - <implementation>LDAP</implementation> - <config/> - </module> - - <module> - <type>UserProfile</type> - <implementation>DELEGATING</implementation> - <config> - <option> - <name>profileConfigFile</name> - <value>test/config/profile-config.xml</value> - </option> - <option> - <name>ldapModuleJNDIName</name> - <value>java:/portal/LDAPUserProfileModule</value> - </option> - </config> - </module> - <module> - <type>DBDelegateUserProfile</type> - <implementation>DB</implementation> - <config/> - </module> - <module> - <type>LDAPDelegateUserProfile</type> - <implementation>LDAP</implementation> - <config/> - </module> - </modules> - - <options> - <option-group> - <group-name>common</group-name> - <option> - <name>userCtxDN</name> - <value>ou=People,dc=example,dc=com</value> - </option> - <option> - <name>roleCtxDN</name> - <value>ou=Roles,dc=example,dc=com</value> - </option> - </option-group> - <option-group> - <group-name>userCreateAttibutes</group-name> - <option> - <name>objectClass</name> -  - <value>top</value> - <value>person</value> - <value>inetOrgPerson</value> - </option> -  - <option> - <name>cn</name> - <value>none</value> - </option> - <option> - <name>sn</name> - <value>none</value> - </option> - </option-group> - <option-group> - <group-name>roleCreateAttibutes</group-name> -  - <option> - <name>cn</name> - <value>none</value> - </option> -  -  - <option> - <name>member</name> - <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> - </option> - </option-group> - </options> -</identity-configuration> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml (from rev 8897, modules/identity/trunk/identity/src/resources/test/config/sunds-config.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/config/sunds-config.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +  + +<identity-configuration> + <datasources> + <datasource> + <name>LDAP</name> + <config> + <option> + <name>host</name> + <value>dev39.qa.atl.jboss.com</value> + </option> + <option> + <name>port</name> + <value>1389</value> + </option> + <option> + <name>adminDN</name> + <value>cn=Directory Manager</value> + </option> + <option> + <name>adminPassword</name> + <value>testldap</value> + </option> + </config> + </datasource> + </datasources> + <modules> + <module> +  + <type>User</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Role</type> + <implementation>LDAP</implementation> + <config/> + </module> + <module> + <type>Membership</type> + <implementation>LDAP</implementation> + <config/> + </module> + + <module> + <type>UserProfile</type> + <implementation>DELEGATING</implementation> + <config> + <option> + <name>profileConfigFile</name> + <value>config/profile-config.xml</value> + </option> + <option> + <name>ldapModuleJNDIName</name> + <value>java:/portal/LDAPUserProfileModule</value> + </option> + </config> + </module> + <module> + <type>DBDelegateUserProfile</type> + <implementation>DB</implementation> + <config/> + </module> + <module> + <type>LDAPDelegateUserProfile</type> + <implementation>LDAP</implementation> + <config/> + </module> + </modules> + + <options> + <option-group> + <group-name>common</group-name> + <option> + <name>userCtxDN</name> + <value>ou=People,dc=example,dc=com</value> + </option> + <option> + <name>roleCtxDN</name> + <value>ou=Roles,dc=example,dc=com</value> + </option> + </option-group> + <option-group> + <group-name>userCreateAttibutes</group-name> + <option> + <name>objectClass</name> +  + <value>top</value> + <value>person</value> + <value>inetOrgPerson</value> + </option> +  + <option> + <name>cn</name> + <value>none</value> + </option> + <option> + <name>sn</name> + <value>none</value> + </option> + </option-group> + <option-group> + <group-name>roleCreateAttibutes</group-name> +  + <option> + <name>cn</name> + <value>none</value> + </option> +  +  + <option> + <name>member</name> + <value>uid=dummynonexistinguser,ou=People,dc=jboss,dc=org</value> + </option> + </option-group> + </options> +</identity-configuration> \ No newline at end of file Added: modules/identity/trunk/identity/src/test/resources/datasources/databases.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/databases.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/databases.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,60 @@ + + +<datasources> +  + <datasource> + <datasource-name>hsqldb</datasource-name> + <connection-url>jdbc:hsqldb:file:test</connection-url> + <driver-class>org.hsqldb.jdbcDriver</driver-class> + <user-name>sa</user-name> + <password></password> + </datasource> + + + +</datasources> Property changes on: modules/identity/trunk/identity/src/test/resources/datasources/databases.xml ___________________________________________________________________ Name: svn:executable + * Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-extrolemodule.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-extrolemodule.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-extrolemodule.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,94 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> + <config-file>config/extrole/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <config-file>config/extrole/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/extrole/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/extrole/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-extusermodule.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-extusermodule.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-extusermodule.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,94 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> + <config-file>config/extuser/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> + <config-file>config/extuser/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + <config-file>config/extuser/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/extuser/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-identity.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-identity.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-identity.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,136 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean -StaticGroupMembership config</description> + + <config-file>config/identity/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> + <populate-ldif>ldif/initial-tests-notpopulated-opends.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>OpenDS - StaticRoleMembership</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean - StaticRoleMembership config</description> + <config-file>config/identity/opends-config-staticrole.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> + <populate-ldif>ldif/initial-tests-notpopulated-opends.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs - StaticGroupMembership config</description> + + <config-file>config/identity/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldif/initial-tests-notpopulated-sunds.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS - StaticRoleMembership</directory-name> + <description>Sun DS in QA Labs - StaticRoleMembership config</description> + <config-file>config/identity/sunds-config-staticrole.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> + <populate-ldif>ldif/initial-tests-notpopulated-sunds.ldif</populate-ldif> + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access) - StaticGroupMembership config</description> + + <config-file>config/identity/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-notpopulated.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access) - StaticRoleMembership config</description> + + <config-file>config/identity/rhds-config-staticrole.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-notpopulated.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access) - StaticGroupMembership config</description> + + <config-file>config/identity/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-notpopulated-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-simplerolemodule.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-simplerolemodule.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-simplerolemodule.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,100 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> +  + <config-file>config/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> +  + <config-file>config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-simpleusermodule.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-simpleusermodule.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-simpleusermodule.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,100 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> +  + <config-file>config/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> +  + <config-file>config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-staticgroupmembership.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-staticgroupmembership.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-staticgroupmembership.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,115 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> +  + <config-file>config/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> +  + <config-file>config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/staticgroup/rhds-config-nonDNMember.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa-nonDNMember.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-staticrolemembership.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-staticrolemembership.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-staticrolemembership.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,115 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> +  + <config-file>config/staticrole/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> +  + <config-file>config/staticrole/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/staticrole/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/staticrole/rhds-config-nonDNMember.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa-nonDNMember.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> +  +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories-userprofilemodule.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories-userprofilemodule.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories-userprofilemodule.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,100 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> +  + <config-file>config/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> +  + <config-file>config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +  +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/directories.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/directories.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/directories.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,100 @@ + + +<directories> + <directory> + <directory-name>OpenDS</directory-name> + <description>OpenDS service deployed on JBoss AS as an mbean</description> +  + <config-file>config/opends-config.xml</config-file> + <host>localhost</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>password</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-opends.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>Sun DS</directory-name> + <description>Sun DS in QA Labs</description> +  + <config-file>config/sunds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>1389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>testldap</admin-password> +  + <populate-ldif>ldif/initial-tests-qa-sunds.ldif</populate-ldif> +  + <cleanup-dn>dc=example,dc=com</cleanup-dn> + </directory> + <directory> + <directory-name>RedHatDS</directory-name> + <description>RedHat Directory in QA Labs (need vpn access)</description> + + <config-file>config/rhds-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>10389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Directory Manager</admin-dn> + <admin-password>qpq123qpq</admin-password> + + <populate-ldif>ldif/initial-tests-qa.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=qa,dc=atl,dc=jboss,dc=com</cleanup-dn> + </directory> +  + <directory> + <directory-name>OpenLDAP</directory-name> + <description>OpenLDAP Directory in QA Labs (need vpn access)</description> + + <config-file>config/openldap-config.xml</config-file> + <host>dev39.qa.atl.jboss.com</host> + <port>389</port> + <context-factory>com.sun.jndi.ldap.LdapCtxFactory</context-factory> + <admin-dn>cn=Manager,dc=my-domain,dc=com</admin-dn> + <admin-password>jbossqa</admin-password> + + <populate-ldif>ldif/initial-tests-qa-openldap.ldif</populate-ldif> + + <cleanup-dn>dc=testsuite,dc=portal,dc=my-domain,dc=com</cleanup-dn> + </directory> +</directories> Added: modules/identity/trunk/identity/src/test/resources/datasources/hibernates.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/datasources/hibernates.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/datasources/hibernates.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,120 @@ +<configurations> +  + <configuration> + <configuration-name>default</configuration-name> + <properties> + <property> + <name>hibernate.show_sql</name> + <value>true</value> + </property> + <property> + <name>hibernate.auto_close_session</name> + <value>true</value> + </property> + <property> + <name>hibernate.transaction.flush_before_completion</name> + <value>true</value> + </property> + <property> + <name>hibernate.transaction.factory_class</name> + <value>org.hibernate.transaction.JTATransactionFactory</value> + </property> + <property> + <name>hibernate.transaction.manager_lookup_class</name> + <value>org.hibernate.transaction.JBossTransactionManagerLookup</value> + </property> + <property> + <name>hibernate.cache.provider_class</name> + <value>org.hibernate.cache.HashtableCacheProvider</value> + </property> + <property> + <name>hibernate.cache.use_second_level_cache</name> + <value>false</value> + </property> + <property> + <name>hibernate.cache.use_query_cache</name> + <value>false</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>hsqldb</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.HSQLDialect</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>oracle9i</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.Oracle9Dialect</value> + </property> +  + <property> + <name>hibernate.cache.use_second_level_cache</name> + <value>true</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>oracle10g</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.Oracle9Dialect</value> + </property> +  + <property> + <name>hibernate.cache.use_second_level_cache</name> + <value>true</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>sqlserver</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.SQLServerDialect</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>mysql4</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.MySQLInnoDBDialect</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>mysql5</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.MySQLInnoDBDialect</value> + </property> + </properties> + </configuration> +  + <configuration> + <configuration-name>postgresql8</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.PostgreSQLDialect</value> + </property> + </properties> + </configuration> +</configurations> Added: modules/identity/trunk/identity/src/test/resources/hibernate/domain.hbm.xml =================================================================== --- modules/identity/trunk/identity/src/test/resources/hibernate/domain.hbm.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/hibernate/domain.hbm.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,177 @@ +<?xml version="1.0"?> + + +<!DOCTYPE hibernate-mapping PUBLIC + "-//Hibernate/Hibernate Mapping DTD 3.0//EN" + "http://hibernate.sourceforge.net/hibernate-mapping-3.0.dtd"> +<hibernate-mapping> + <class + name="org.jboss.portal.identity.db.HibernateUserImpl" + table="jbp_users"> +  + <id + name="key" + column="jbp_uid" + type="java.lang.Long"> + <generator class="native"> + <param name="sequence">user_seq</param> + </generator> + </id> + <property + name="userName" + column="jbp_uname" + type="java.lang.String" + update="false" + insert="true" + unique="true"/> + <map + name="dynamic" + table="jbp_user_prop" + lazy="false" + sort="unsorted" + cascade="all"> +  + <key column="jbp_uid"/> + <index + column="jbp_name" + type="java.lang.String"/> + <element + column="jbp_value" + type="java.lang.String" + not-null="false" + unique="false"/> + </map> + <property + name="givenName" + column="jbp_givenname" + type="java.lang.String" + update="true" + insert="true" + unique="false"/> + <property + name="familyName" + column="jbp_familyname" + type="java.lang.String" + update="true" + insert="true" + unique="false"/> + <property + name="password" + column="jbp_password" + type="java.lang.String" + update="true" + insert="true" + unique="false"/> + <property + name="realEmail" + column="jbp_realemail" + type="java.lang.String" + update="true" + insert="true" + unique="false"/> + <property + name="fakeEmail" + column="jbp_fakeemail" + type="java.lang.String" + update="true" + insert="true" + unique="false"/> + <property + name="registrationDate" + column="jbp_regdate" + type="java.util.Date" + update="false" + insert="true" + unique="false"/> + <property + name="viewRealEmail" + column="jbp_viewrealemail" + type="boolean" + update="true" + insert="true" + unique="false"/> + <property + name="enabled" + column="jbp_enabled" + type="boolean" + update="true" + insert="true" + unique="false"/> + <set + name="roles" + table="jbp_role_membership" + lazy="false" + inverse="false" + cascade="none" + sort="unsorted"> +  + <key column="jbp_uid"/> + <many-to-many + class="org.jboss.portal.identity.db.HibernateRoleImpl" + column="jbp_rid" + outer-join="true"/> + </set> + </class> + <class + name="org.jboss.portal.identity.db.HibernateRoleImpl" + table="jbp_roles"> +  + <id + name="key" + column="jbp_rid" + type="java.lang.Long"> + <generator class="native"> + <param name="sequence">user_seq</param> + </generator> + </id> + <property + name="name" + column="jbp_name" + type="java.lang.String" + update="false" + insert="true" + unique="true"/> + <property + name="displayName" + column="jbp_displayname" + type="java.lang.String" + update="true" + insert="true" + unique="true"/> + <set + name="users" + table="jbp_role_membership" + lazy="true" + inverse="true" + cascade="none" + sort="unsorted"> +  + <key column="jbp_rid"/> + <many-to-many + class="org.jboss.portal.identity.db.HibernateUserImpl" + column="jbp_uid" + outer-join="false"/> + </set> + </class> +</hibernate-mapping> \ No newline at end of file Copied: modules/identity/trunk/identity/src/test/resources/jboss-unit.xml (from rev 8848, modules/identity/trunk/identity/src/resources/test/jboss-unit.xml) =================================================================== --- modules/identity/trunk/identity/src/test/resources/jboss-unit.xml (rev 0) +++ modules/identity/trunk/identity/src/test/resources/jboss-unit.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,87 @@ +<?xml version="1.0" encoding="UTF-8"?> +<jboss-unit + xmlns="urn:jboss:jboss-unit:1.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:jboss:jboss-unit:1.0 jboss-unit_1_0.xsd"> +  +  +  +  +  +  +  +  +  +  + <pojo> + <parameter name="hibernateConfig" value="datasources/hibernates.xml"/> + + <parameter name="standardIdentityConfig" value="config/standardidentity-config.xml"/> + <parameter name="identityConfig" value="config/db-config.xml"/> + + <parameter name="datasources" value="datasources/databases.xml"/> + <parameter name="directories" value="datasources/directories.xml"/> + + <parameter name="dataSourceName" value="hsqldb"/> + + <parameter name="directoryName"> + <value>OpenDS</value> +  +  +  + </parameter> + +  +  +  +  + + <test> + <class name="org.jboss.portal.test.identity.ldap.LDAPSimpleUserModuleTest"/> + + <parameter name="directories" value="datasources/directories-simpleusermodule.xml"/> + </test> + +  +  + +  +  + +  +  + +  +  + +  +  + +  +  + +  +  + +  +  + +  +  + +  +  +  +  +  +  +  +  + +  +  + +  +  + </pojo> +</jboss-unit> Copied: modules/identity/trunk/identity/src/test/resources/ldif (from rev 8897, modules/identity/trunk/identity/src/resources/test/ldif) Copied: modules/identity/trunk/identity/src/test/resources/org (from rev 8848, modules/identity/trunk/identity/src/resources/portal-identity-test-jar/org) Copied: modules/identity/trunk/identity/src/test/resources/org/jboss (from rev 8897, modules/identity/trunk/identity/src/resources/portal-identity-test-jar/org/jboss) Modified: modules/identity/trunk/identity/src/test/resources/org/jboss/portal/test/identity/db-beans.xml =================================================================== --- modules/identity/trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/db-beans.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/org/jboss/portal/test/identity/db-beans.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -39,7 +39,8 @@ <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config"> <constructor factoryMethod="getConfig" factoryClass="org.jboss.portal.test.framework.embedded.HibernateSupport"> <parameter><inject bean="TestCase" property="dataSourceName" state="Instantiated"/></parameter> - </constructor> + <parameter><inject bean="TestCase" property="hibernateConfig" state="Instantiated"/></parameter> + </constructor> </bean> <bean name="JNDISupport" class="org.jboss.portal.test.framework.embedded.JNDISupport"> @@ -63,7 +64,7 @@ <property name="JNDIName">java:/portal/IdentitySessionFactory</property> <property name="mappings"> <list elementClass="java.lang.String"> - <value>domain-identity.hbm.xml</value> + <value>hibernate/domain.hbm.xml</value> </list> </property> </bean> Modified: modules/identity/trunk/identity/src/test/resources/org/jboss/portal/test/identity/ldap-beans.xml =================================================================== --- modules/identity/trunk/identity/src/resources/portal-identity-test-jar/org/jboss/portal/test/identity/ldap-beans.xml 2007-11-13 11:13:12 UTC (rev 8897) +++ modules/identity/trunk/identity/src/test/resources/org/jboss/portal/test/identity/ldap-beans.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -28,6 +28,8 @@ xmlns="urn:jboss:bean-deployer"> +  +  <bean name="DataSourceConfig" class="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config"> <constructor factoryMethod="obtainConfig" factoryClass="org.jboss.portal.test.framework.embedded.DataSourceSupport$Config"> @@ -46,6 +48,7 @@ <bean name="HibernateConfig" class="org.jboss.portal.test.framework.embedded.HibernateSupport$Config"> <constructor factoryMethod="getConfig" factoryClass="org.jboss.portal.test.framework.embedded.HibernateSupport"> <parameter><inject bean="TestCase" property="dataSourceName" state="Instantiated"/></parameter> + <parameter><inject bean="TestCase" property="hibernateConfig" state="Instantiated"/></parameter> </constructor> </bean> @@ -70,7 +73,7 @@ <property name="JNDIName">java:/portal/IdentitySessionFactory</property> <property name="mappings"> <list elementClass="java.lang.String"> - <value>domain-identity.hbm.xml</value> + <value>hibernate/domain.hbm.xml</value> </list> </property> </bean> Deleted: modules/identity/trunk/sso/build.bat =================================================================== --- modules/identity/trunk/sso/build.bat 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/sso/build.bat 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,54 +0,0 @@ -@echo off -rem -rem Invokes a script of the same name in the 'tools' module. -rem -rem The 'tools' module is expected to be a peer directory of the directory -rem in which this script lives. -rem -rem @author Jason Dillon <jason(a)planet57.com> -rem - -rem $Id: build.bat 2001 2006-03-17 18:54:44Z julien $ - -setlocal - -set PROGNAME=%~nx0 -set DIRNAME=%~dp0 - -rem Legacy shell support -if x%PROGNAME%==x set PROGNAME=build.bat -if x%DIRNAME%==x set DIRNAME=.\ - -set MODULE_ROOT=%DIRNAME% -if x%TOOLS_ROOT%==x set TOOLS_ROOT=%DIRNAME%..\tools -set TARGET=%TOOLS_ROOT%\bin\build.bat -set ARGS=%* - -rem Start'er up yo -goto main - -:debug -if not x%DEBUG%==x echo %PROGNAME%: %* -goto :EOF - -:main -call :debug PROGNAME=%PROGNAME% -call :debug DIRNAME=%DIRNAME% -call :debug TOOLS_ROOT=%TOOLS_ROOT% -call :debug TARGET=%TARGET% - -if exist %TARGET% call :call-script & goto :EOF -rem else fail, we can not go on - -echo %PROGNAME%: *ERROR* The target executable does not exist: -echo %PROGNAME%: -echo %PROGNAME%: %TARGET% -echo %PROGNAME%: -echo %PROGNAME%: Please make sure you have checked out the 'tools' module -echo %PROGNAME%: and make sure it is up to date. -goto :EOF - -:call-script -call :debug Executing %TARGET% %ARGS% -call %TARGET% %ARGS% -goto :EOF Deleted: modules/identity/trunk/sso/build.sh =================================================================== --- modules/identity/trunk/sso/build.sh 2007-11-14 15:04:11 UTC (rev 8926) +++ modules/identity/trunk/sso/build.sh 2007-11-14 16:33:10 UTC (rev 8927) @@ -1,49 +0,0 @@ -#!/bin/sh -## -## Invokes a script of the same name in the 'tools' module. -## -## The 'tools' module is expected to be a peer directory of the directory -## in which this script lives. -## -## @author Jason Dillon <jason(a)planet57.com> -## - -# $Id: build.sh 2001 2006-03-17 18:54:44Z julien $ - -PROGNAME=`basename $0` -DIRNAME=`dirname $0` - -# Buss it yo -main() { - if [ "x$TOOLS_ROOT" = "x" ]; then - TOOLS_ROOT=`cd $DIRNAME/../tools && pwd` - fi - - MODULE_ROOT=`cd $DIRNAME; pwd` - export TOOLS_ROOT MODULE_ROOT DEBUG TRACE - - # Where is the target script? - target="$TOOLS_ROOT/bin/$PROGNAME" - if [ ! -f "$target" ]; then - echo "${PROGNAME}: *ERROR* The target executable does not exist:" - echo "${PROGNAME}:" - echo "${PROGNAME}: $target" - echo "${PROGNAME}:" - echo "${PROGNAME}: Please make sure you have checked out the 'tools' module" - echo "${PROGNAME}: and make sure it is up to date." - exit 2 - fi - - # Get busy yo! - if [ "x$DEBUG" != "x" ]; then - echo "${PROGNAME}: Executing: /bin/sh $target $@" - fi - if [ "x$TRACE" = "x" ]; then - exec /bin/sh $target "$@" - else - exec /bin/sh -x $target "$@" - fi -} - -# Lets get ready to rumble! -main "$@" Added: modules/identity/trunk/sso/pom.xml =================================================================== --- modules/identity/trunk/sso/pom.xml (rev 0) +++ modules/identity/trunk/sso/pom.xml 2007-11-14 16:33:10 UTC (rev 8927) @@ -0,0 +1,46 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.jboss.portal.identity</groupId> + <artifactId>jboss-portal-modules-identity</artifactId> + <relativePath>../build/pom.xml</relativePath> + <version>1.1.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>portal-identity-sso</artifactId> + <packaging>jar</packaging> + + <dependencies> + <dependency> + <groupId>org.jboss.portal.identity</groupId> + <artifactId>portal-identity</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>josso</groupId> + <artifactId>josso</artifactId> + </dependency> + <dependency> + <groupId>josso</groupId> + <artifactId>josso-tomcat55-plugin</artifactId> + </dependency> + <dependency> + <groupId>ja-sig-cas</groupId> + <artifactId>cas-server</artifactId> + </dependency> + <dependency> + <groupId>ja-sig-cas</groupId> + <artifactId>cas-client</artifactId> + </dependency> + <dependency> + <groupId>opensso</groupId> + <artifactId>opensso</artifactId> + </dependency> + <dependency> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + </dependency> + </dependencies> + +</project> + Copied: modules/identity/trunk/sso/src/main/java/org/jboss/portal/identity (from rev 8897, modules/identity/trunk/sso/src/main/org/jboss/portal/identity) Copied: modules/identity/trunk/sso/src/test/java/org/jboss/portal/test (from rev 8897, modules/identity/trunk/sso/src/main/org/jboss/portal/test)

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8926 - branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-11-14 10:04:11 -0500 (Wed, 14 Nov 2007) New Revision: 8926 Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java Log: ooops Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java 2007-11-14 14:42:33 UTC (rev 8925) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java 2007-11-14 15:04:11 UTC (rev 8926) @@ -34,7 +34,7 @@ public abstract class AbstractWidgetPortlet extends GenericPortlet { /** . */ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(WidgetPortlet.class); + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(AbstractWidgetPortlet.class); /** . */ public final static String INIT_PARAM_CONNECTION_TIMEOUT = "connectionTimeout";

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8924 - in branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl: model/instance/persistent and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-14 09:27:33 -0500 (Wed, 14 Nov 2007) New Revision: 8924 Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java Log: Minor Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-11-14 14:26:07 UTC (rev 8923) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/api/node/PortalNodeImpl.java 2007-11-14 14:27:33 UTC (rev 8924) @@ -186,9 +186,17 @@ displayNameKey = RESOURCE_PREFIX + object.getName(); } - // Try to get the display name from the resource bundles + // Try to get the display name from the resource bundles for backward compatibility String displayName = null; - ResourceBundle bundle = resourceBundles.getResourceBundle(locale); + ResourceBundle bundle = null; + try + { + bundle = resourceBundles.getResourceBundle(locale); + } + catch (MissingResourceException ignore) + { + } + if (bundle != null) { try Modified: branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-11-14 14:26:07 UTC (rev 8923) +++ branches/JBoss_Portal_Branch_2_6/core/src/main/org/jboss/portal/core/impl/model/instance/persistent/PersistentInstanceDefinition.java 2007-11-14 14:27:33 UTC (rev 8924) @@ -78,6 +78,7 @@ this.instanceId = id; this.relatedSecurityBindings = new HashMap(); this.relatedCustomizations = new HashMap(); + this.displayNames = new HashMap(); this.state = null; } @@ -90,6 +91,7 @@ this.displayNames = setDisplayNames(instanceMD.getDisplayName()); this.relatedSecurityBindings = new HashMap(); this.relatedCustomizations = new HashMap(); + this.displayNames = new HashMap(); this.state = null; }

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8923 - branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-14 09:26:07 -0500 (Wed, 14 Nov 2007) New Revision: 8923 Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties Log: minor Modified: branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2007-11-14 11:58:53 UTC (rev 8922) +++ branches/JBoss_Portal_Branch_2_6/core-identity/src/resources/portal-identity-sar/conf/bundles/Identity_fr.properties 2007-11-14 14:26:07 UTC (rev 8923) @@ -137,9 +137,9 @@ IDENTITY_MANAGEMENT_SUBSCRIPTION_MODE=Mode d'abonnement IDENTITY_MANAGEMENT_SUBSCRIPTION_ADMIN_MODE=Administrer les modes d'abonnement IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_CUSTOM=Mode d'abonnement personnalis\u00e9 -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatique - pas de validation courriel & pas d'approbation -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Validation courriel & pas d'approbation -IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Validation courriel & approbation par un administrateur +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_AUTOMATIC=Automatique - pas de validation courriel et pas d'approbation +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL=Validation courriel et pas d'approbation +IDENTITY_MANAGEMENT_DESCRIPTION_SUBSCRIPTION_EMAIL_ADMIN=Validation courriel et approbation par un administrateur IDENTITY_REGISTER_VERIFY_CAPTCHA=V\u00e9rification visuelle IDENTITY_REGISTER_TITLE_CONFIRM_DELETE=Confirmation : supprimer

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8922 - in branches/JBoss_Portal_Branch_2_6/core-admin/src: resources/portal-admin-war/WEB-INF/jsf and 1 other directory.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-14 06:58:53 -0500 (Wed, 14 Nov 2007) New Revision: 8922 Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml Log: Use display name for Portlet Instances tab (with tooltip on the portlet instance Id) Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-11-14 11:03:32 UTC (rev 8921) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/main/org/jboss/portal/core/admin/ui/AdminPropertyResolver.java 2007-11-14 11:58:53 UTC (rev 8922) @@ -213,7 +213,9 @@ } } }); + instanceDecorator.setProperty("displayName", new InstanceDisplayNamePropertyDecorator()); registerDecorator(Instance.class, instanceDecorator); + // SimpleBeanDecorator portalObjectDecorator = new SimpleBeanDecorator() @@ -471,4 +473,24 @@ return DEFAULT_PORTLET_ICON; } } + + private class InstanceDisplayNamePropertyDecorator extends AbstractPropertyDecorator + { + public InstanceDisplayNamePropertyDecorator() + { + super(String.class); + } + + public Object getValue(Object bean) throws IllegalArgumentException + { + Instance instance = (Instance)bean; + String displayName = getValueForRequestLocale(instance.getDisplayName()); + if (displayName == null) + { + displayName = instance.getId(); + } + return displayName; + } + } + } Modified: branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml =================================================================== --- branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-14 11:03:32 UTC (rev 8921) +++ branches/JBoss_Portal_Branch_2_6/core-admin/src/resources/portal-admin-war/WEB-INF/jsf/instances.xhtml 2007-11-14 11:58:53 UTC (rev 8922) @@ -15,7 +15,7 @@ <table id="instancesTable2" width="100%"> <thead class="portlet-section-header"> <tr> - <th>Id</th> + <th>Name</th> <th>Actions</th> </tr> </thead> @@ -25,7 +25,7 @@ class="#{instance.id == instancemgr.selectedId ? 'portlet-section-selected' : (status.index % 2 == 0 ? 'portlet-section-body' : 'portlet-section-alternate')}"> <td> <h:commandLink action="#{instancemgr.selectInstance}"> - <h:outputText value="#{instance.id}"/> + <h:outputText value="#{instance.displayName}" title="#{instance.id}"/> <f:param name="id" value="#{instance.id}"/> <f:param name="plugin" value="info"/> </h:commandLink>

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8921 - in branches/JBoss_Portal_Branch_2_6/widget/src: main/org/jboss/portal/widget and 4 other directories.

by portal-commits＠lists.jboss.org

Author: emuckenhuber Date: 2007-11-14 06:03:32 -0500 (Wed, 14 Nov 2007) New Revision: 8921 Added: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java Removed: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesProviderTestCase.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesWidgetRenderTestCase.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetProvider.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesJSONInfoBuilder.java branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp Log: JBPORTAL-1573: widget query result pagination JBPORTAL-1613: more shared widget portlet information Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesProviderTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesProviderTestCase.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesProviderTestCase.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -22,8 +22,6 @@ ******************************************************************************/ package org.jboss.portal.test.widget.netvibes; -import java.util.HashMap; - import junit.framework.TestCase; import org.jboss.portal.widget.Widget; Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesWidgetRenderTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesWidgetRenderTestCase.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/test/widget/netvibes/NetvibesWidgetRenderTestCase.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -26,7 +26,6 @@ import java.io.FileInputStream; import java.io.InputStream; import java.net.URL; -import java.util.HashMap; import junit.framework.TestCase; Added: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java (rev 0) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetPortlet.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -0,0 +1,118 @@ +/****************************************************************************** + * 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.widget; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletConfig; +import javax.portlet.PortletException; +import javax.portlet.PortletMode; + +/** + * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> + * @version $Revision$ + */ +public abstract class AbstractWidgetPortlet extends GenericPortlet +{ + /** . */ + private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(WidgetPortlet.class); + + /** . */ + public final static String INIT_PARAM_CONNECTION_TIMEOUT = "connectionTimeout"; + + /** .*/ + public final static String INIT_PARAM_ENTRY_EXPIRATION = "entryExpiration"; + + /** . */ + public final static String INIT_PARAM_QUERY_EXPIRATION = "queryExpiration"; + + /** .*/ + public final static String INIT_PARAM_FETCH_WIDGETS_ON_LOOKUP = "fetchWidgetsOnDirectoryLookup"; + + /** .*/ + protected final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); + + /** + * @return WidgetProvider + */ + protected abstract WidgetProvider getProvider(); + + public void init() throws PortletException + { + PortletConfig config = getPortletConfig(); + WidgetProvider provider = getProvider(); + // Connection timeout + String timeout = config.getInitParameter(INIT_PARAM_CONNECTION_TIMEOUT); + if (timeout != null && timeout.length() > 0) + { + try + { + provider.setConnectionTimeout(Integer.parseInt(timeout)); + } + catch (NumberFormatException e) + { + log.error("Failed to parse connectionTimeout init parameter - should be integer number: ", e); + } + } + // Query expiration + String queryExpiration = config.getInitParameter(INIT_PARAM_QUERY_EXPIRATION); + if(queryExpiration != null && queryExpiration.length() > 0) + { + try + { + provider.setQueryExpiration(Integer.parseInt(queryExpiration)); + } + catch(NumberFormatException e) + { + log.error("Failed to parse queryExpiration init parameter - should be integer number: ", e); + } + } + // Entry expiration + String entryExpiration = config.getInitParameter(INIT_PARAM_ENTRY_EXPIRATION); + if(entryExpiration != null && entryExpiration.length() > 0) + { + try + { + provider.setEntryExpiration(Integer.parseInt(entryExpiration)); + } + catch(NumberFormatException e) + { + log.error("Failed to parse entryExpiration init parameter - should be integer number: ", e); + } + } + // Fetch all widgets of a query result ? + String fetchWidgetsOnDirectoryLookup = config.getInitParameter(INIT_PARAM_FETCH_WIDGETS_ON_LOOKUP); + if(fetchWidgetsOnDirectoryLookup != null && fetchWidgetsOnDirectoryLookup.length() > 0) + { + provider.setFetchWidgetsOnDirectoryLookup(Boolean.getBoolean(fetchWidgetsOnDirectoryLookup)); + } + + // Finally start widget provider + provider.start(); + } + + public void destroy() + { + WidgetProvider provider = getProvider(); + provider.stop(); + } +} \ No newline at end of file Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/AbstractWidgetProvider.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -70,7 +70,6 @@ /** Eviction thread timing */ protected long timing = TimeUnit.MILLISECONDS.convert(60, TimeUnit.SECONDS); - public void start() { executor = new ThreadPoolExecutor(4, 4, 0, TimeUnit.SECONDS, new LinkedBlockingQueue()); @@ -87,7 +86,6 @@ executor = null; scheduledExecutor = null; } - public long getConnectionTimeout() { @@ -99,10 +97,21 @@ this.connectionTimeout = connectionTimeout; } - // TODO entryExpiration - // TODO queryExpiration - // TODO fetchwidgetsonDirectoryLookup + public void setQueryExpiration(long millis) + { + this.queryExpiration = millis; + } + public void setEntryExpiration(long millis) + { + this.entryExpiration = millis; + } + + public void setFetchWidgetsOnDirectoryLookup(boolean fetch) + { + this.fetchWidgetsOnDirectoryLookup = fetch; + } + /* private void addWidget(URL url) { @@ -160,7 +169,6 @@ public List<Widget> getWidgets(List<URL> list) { -// long millis = System.currentTimeMillis(); if (list == null) { throw new IllegalArgumentException(); @@ -192,11 +200,9 @@ entries.remove(url); } } -// System.out.println("fetchting 3 took: " + NumberFormat.getInstance().format((System.currentTimeMillis() - millis) / 1000.0)); return widgets; } - public List<DirectoryQueryResultEntry> search(WidgetQuery q) { if (q == null) @@ -216,11 +222,11 @@ } catch(InterruptedException e) { - // + // TODO } catch(ExecutionException e) { - // + // TODO } if( this.fetchWidgetsOnDirectoryLookup ) Deleted: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetPortlet.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -1,177 +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.portal.widget; - -import org.jboss.portal.widget.google.provider.GGProvider; - -import javax.portlet.ActionRequest; -import javax.portlet.ActionResponse; -import javax.portlet.GenericPortlet; -import javax.portlet.PortletException; -import javax.portlet.PortletMode; -import javax.portlet.PortletRequestDispatcher; -import javax.portlet.PortletSecurityException; -import javax.portlet.RenderRequest; -import javax.portlet.RenderResponse; -import java.io.IOException; -import java.io.PrintWriter; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; - -/** - * @author <a href="mailto:julien@jboss.org">Julien Viet</a> - * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> - * @version $Revision$ - */ -public abstract class WidgetPortlet extends GenericPortlet -{ - /** . */ - private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(WidgetPortlet.class); - - /** . */ - public final static String INIT_PARAM_CONNECTION_TIMEOUT = "connectionTimeout"; - - /** . */ - private final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); - - /** . */ - private GGProvider provider = new GGProvider(); - - - public void init() throws PortletException - { - provider.start(); - String timeout = getPortletConfig().getInitParameter(INIT_PARAM_CONNECTION_TIMEOUT); - if (timeout != null && timeout.length() > 0) - { - try - { - provider.setConnectionTimeout(Integer.parseInt(timeout)); - } - catch (NumberFormatException e) - { - log.error("Failed to parse connectionTimeout init parameter - should be integer number: ", e); - } - } - } - - - public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException - { - if (req.getParameter("content.action.select") != null) - { - String contentURI = req.getParameter("content.uri"); - if (contentURI != null) - { - // Will contain the next render params - Map params = new HashMap(); - - // - params.put("content.uri", new String[]{contentURI}); - - // - for (Iterator i = req.getParameterMap().entrySet().iterator(); i.hasNext();) - { - Map.Entry entry = (Map.Entry)i.next(); - String contentParamName = (String)entry.getKey(); - if (contentParamName.startsWith("content.param")) - { - String[] contentParamValue = (String[])entry.getValue(); - params.put(contentParamName, contentParamValue); - } - } - - // - String catParam = req.getParameter("cat"); - if (catParam != null) - { - params.put("cat", new String[]{catParam}); - } - - // - String queryParam = req.getParameter("query"); - if (queryParam != null) - { - params.put("query", new String[]{queryParam}); - } - - String pickMethod = req.getParameter("gg_pick_method"); - if (pickMethod != null) - { - params.put("gg_pick_method", new String[]{pickMethod}); - } - - // - resp.setRenderParameters(params); - } - } - } - - protected void doView(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException - { - resp.setContentType("text/html"); - PrintWriter writer = resp.getWriter(); - String uri = req.getParameter("uri"); - Widget widget = provider.getWidget(uri); - if (widget != null) - { - writer.print(widget.render(req.getParameterMap(), req.getLocale())); - } - else - { - writer.print("Widget is not available"); - } - writer.close(); - } - - - protected void doDispatch(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException - { - if (EDIT_CONTENT.equals(req.getPortletMode())) - { - doEditContent(req, resp); - } - else - { - super.doDispatch(req, resp); - } - } - - protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException - { - resp.setContentType("text/html"); - - // - req.setAttribute("provider", provider); - - // - PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/edit_content.jsp"); - dispatcher.include(req, resp); - } - - public void destroy() - { - provider.stop(); - } -} Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetProvider.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetProvider.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/WidgetProvider.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -40,10 +40,16 @@ public Widget getWidget(URL url) throws InterruptedException, ExecutionException; public List<Widget> getWidgets(List<URL> list); + + public List<DirectoryQueryResultEntry> search(WidgetQuery query); + + public void setConnectionTimeout(long connectionTimeout); + + public void setQueryExpiration(long millis); -// public List<Widget> search(WidgetQuery query); + public void setEntryExpiration(long millis); - public List<DirectoryQueryResultEntry> search(WidgetQuery query); + public void setFetchWidgetsOnDirectoryLookup(boolean fetch); } Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidget.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -131,7 +131,7 @@ String defaultValue = prefInfo.getDefaultValue() != null ? prefInfo.getDefaultValue() : ""; String[] values = (String[])parameters.get(prefName); String value = values != null ? values[0] : defaultValue; - + System.out.println("value: " + value); // if value is present and not a default parameter if (value != null && !defaultValue.equals(value)) { Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/google/GGWidgetPortlet.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -22,14 +22,15 @@ ******************************************************************************/ package org.jboss.portal.widget.google; +import org.jboss.portal.widget.AbstractWidgetPortlet; import org.jboss.portal.widget.Widget; +import org.jboss.portal.widget.WidgetProvider; import org.jboss.portal.widget.google.provider.GGProvider; import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; -import javax.portlet.GenericPortlet; +import javax.portlet.PortletConfig; import javax.portlet.PortletException; -import javax.portlet.PortletMode; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletSecurityException; import javax.portlet.RenderRequest; @@ -45,43 +46,26 @@ * @author <a href="mailto:boleslaw dot dawidowicz at jboss dot com">Boleslaw Dawidowicz</a> * @version $Revision: 8784 $ */ -public class GGWidgetPortlet extends GenericPortlet +public class GGWidgetPortlet extends AbstractWidgetPortlet { /** . */ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(GGWidgetPortlet.class); /** . */ - public final static String INIT_PARAM_CONNECTION_TIMEOUT = "connectionTimeout"; - - /** . */ - private final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); - - /** . */ private GGProvider provider = new GGProvider(); - - public void init() throws PortletException + @Override + protected WidgetProvider getProvider() { - provider.start(); - String timeout = getPortletConfig().getInitParameter(INIT_PARAM_CONNECTION_TIMEOUT); - if (timeout != null && timeout.length() > 0) - { - try - { - provider.setConnectionTimeout(Integer.parseInt(timeout)); - } - catch (NumberFormatException e) - { - log.error("Failed to parse connectionTimeout init parameter - should be integer number: ", e); - } - } + return provider; } - public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { if (req.getParameter("content.action.select") != null) { + PortletConfig conf = getPortletConfig(); + String contentURI = req.getParameter("content.uri"); if (contentURI != null) { @@ -167,7 +151,7 @@ protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException { resp.setContentType("text/html"); - + Map map = req.getParameterMap(); // req.setAttribute("provider", provider); @@ -175,9 +159,4 @@ PortletRequestDispatcher dispatcher = getPortletContext().getRequestDispatcher("/WEB-INF/jsp/edit_content.jsp"); dispatcher.include(req, resp); } - - public void destroy() - { - provider.stop(); - } } Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/NetvibesWidgetPortlet.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -30,54 +30,35 @@ import javax.portlet.ActionRequest; import javax.portlet.ActionResponse; -import javax.portlet.GenericPortlet; import javax.portlet.PortletException; -import javax.portlet.PortletMode; import javax.portlet.PortletRequestDispatcher; import javax.portlet.PortletSecurityException; import javax.portlet.RenderRequest; import javax.portlet.RenderResponse; +import org.jboss.portal.widget.AbstractWidgetPortlet; import org.jboss.portal.widget.Widget; +import org.jboss.portal.widget.WidgetProvider; import org.jboss.portal.widget.netvibes.provider.NetvibesProvider; /** * @author <a href="mailto:emuckenh@redhat.com">Emanuel Muckenhuber</a> * @version $Revision$ */ -public class NetvibesWidgetPortlet extends GenericPortlet +public class NetvibesWidgetPortlet extends AbstractWidgetPortlet { /** . */ private static final org.jboss.logging.Logger log = org.jboss.logging.Logger.getLogger(NetvibesWidgetPortlet.class); - + /** . */ - public final static String INIT_PARAM_CONNECTION_TIMEOUT = "connectionTimeout"; - - /** . */ - private final PortletMode EDIT_CONTENT = new PortletMode("edit_content"); - - /** . */ private NetvibesProvider provider = new NetvibesProvider(); - public void init() throws PortletException + protected WidgetProvider getProvider() { - provider.start(); - String timeout = getPortletConfig().getInitParameter(INIT_PARAM_CONNECTION_TIMEOUT); - if (timeout != null && timeout.length() > 0) - { - try - { - provider.setConnectionTimeout(Integer.parseInt(timeout)); - } - catch (NumberFormatException e) - { - log.error("Failed to parse connectionTimeout init parameter - should be integer number: ", e); - } - } + return provider; } - - + public void processAction(ActionRequest req, ActionResponse resp) throws PortletException, PortletSecurityException, IOException { if (req.getParameter("content.action.select") != null) @@ -162,7 +143,6 @@ protected void doEditContent(RenderRequest req, RenderResponse resp) throws PortletException, PortletSecurityException, IOException { resp.setContentType("text/html"); - // req.setAttribute("provider", provider); @@ -171,8 +151,4 @@ dispatcher.include(req, resp); } - public void destroy() - { - provider.stop(); - } } Modified: branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesJSONInfoBuilder.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesJSONInfoBuilder.java 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/main/org/jboss/portal/widget/netvibes/provider/NetvibesJSONInfoBuilder.java 2007-11-14 11:03:32 UTC (rev 8921) @@ -25,9 +25,7 @@ import java.net.MalformedURLException; import java.net.URL; import java.util.ArrayList; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.jboss.portal.common.i18n.LocalizedString; import org.jboss.portal.common.net.URLTools; Modified: branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp =================================================================== --- branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2007-11-14 10:04:44 UTC (rev 8920) +++ branches/JBoss_Portal_Branch_2_6/widget/src/resources/portal-widget-war/WEB-INF/jsp/edit_content.jsp 2007-11-14 11:03:32 UTC (rev 8921) @@ -32,8 +32,16 @@ selWidget = (GGWidget) provider.getWidget(uri); } + + // Number of results to display + int numberOfResults = 10; + String resultSize= request.getParameter("numberOfResults"); + if (resultSize != null && !resultSize.equals("")) + { + numberOfResults = Integer.parseInt(resultSize); + } + // Pagination - int numberOfResults = 10; int currentPage = 0; String tempPage = request.getParameter("currentPage"); if ( tempPage != null && !tempPage.equals("")) @@ -59,7 +67,7 @@ // Compute query int queryStart = currentPage * numberOfResults; - GGQuery query = new GGQuery(queryStart, numberOfResults, catTerm, queryTerm, request.getLocale()); + GGQuery query = new GGQuery(queryStart, numberOfResults + 1, catTerm, queryTerm, request.getLocale()); List queryResults = provider.search(query); String ggPickMethod = request.getParameter("gg_pick_method"); @@ -121,10 +129,11 @@ <div id="<p:namespace/>directory_search_div" style="display: <%= !uriPickMethod ? "block" : "none" %>;"> <form action="<p:renderURL></p:renderURL>" method="post"> - <input type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/> + <input type="text" name="query" value="<%= queryTerm %>" class="portlet-form-field"/>  <select name="cat" class="portlet-form-field"> <option value=""> </option> <% + // Category dropdown for (Iterator i = provider.getCategories().iterator(); i.hasNext();) { GGWidgetCategoryInfo cat = (GGWidgetCategoryInfo)i.next(); @@ -135,7 +144,18 @@ <% } %> + </select>  + <select name="numberOfResults" class="portlet-form-field"> + <% + // Number of results dropdown + for(int i = 5; i <= 25; i = i + 5) + { + boolean selected = i == numberOfResults; + %><option value="<%= i %>" <%= selected ? "selected=\"selected\"" : "" %>><%= i %></option><% + } + %> </select> + <br/> <input type="submit" value="Search Gadgets" class="portlet-form-button"/> </form> @@ -144,21 +164,26 @@ <% for (IteratorStatus i = new IteratorStatus(queryResults.iterator()); i.hasNext();) { + if ( (i.getIndex() + 1) >= numberOfResults) + { + break; + } + DirectoryQueryResultEntry result = (DirectoryQueryResultEntry) i.next(); boolean selected = selWidget != null && selWidget.getId().equals(result.getURL().toString()); PortletURL selectURL = renderResponse.createActionURL(); - + // Set parameters for selection selectURL.setParameter("content.action.select", "content.action.select"); selectURL.setParameter("content.uri", result.getURL().toString()); // Set default parametrization state - // TODO ? really needed // Propagage search nav state selectURL.setParameter("cat", catTerm); selectURL.setParameter("query", queryTerm); selectURL.setParameter("currentPage", String.valueOf(currentPage)); + selectURL.setParameter("numberOfResults", String.valueOf(numberOfResults)); // String rowClass = selected ? "portlet-section-selected" : (i.getIndex() % 2 == 0 ? "portlet-section-body" : "portlet-section-alternate"); @@ -181,6 +206,7 @@ PortletURL prevURL = renderResponse.createRenderURL(); prevURL.setParameter("cat", catTerm); prevURL.setParameter("query", queryTerm); + prevURL.setParameter("numberOfResults", String.valueOf(numberOfResults)); String prevPage = String.valueOf(currentPage - 1); @@ -191,11 +217,12 @@ </td> <td style="text-align: right;"> <% // next page - if ( queryResults.size() >= numberOfResults ) + if ( queryResults.size() > numberOfResults ) { PortletURL nextURL = renderResponse.createRenderURL(); nextURL.setParameter("cat", catTerm); nextURL.setParameter("query", queryTerm); + nextURL.setParameter("numberOfResults", String.valueOf(numberOfResults)); String nextPage = String.valueOf(currentPage + 1); @@ -223,6 +250,7 @@ selectURL.setParameter("cat", catTerm); selectURL.setParameter("query", queryTerm); selectURL.setParameter("currentPage", String.valueOf(currentPage)); + selectURL.setParameter("numberOfResults", String.valueOf(numberOfResults)); //propagate visable div if (uriPickMethod)

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8920 - branches/JBoss_Portal_Branch_2_6/tools/lib.

by portal-commits＠lists.jboss.org

Author: thomas.heute(a)jboss.com Date: 2007-11-14 05:04:44 -0500 (Wed, 14 Nov 2007) New Revision: 8920 Added: branches/JBoss_Portal_Branch_2_6/tools/lib/ant-trax.jar Removed: branches/JBoss_Portal_Branch_2_6/tools/lib/saxon.jar branches/JBoss_Portal_Branch_2_6/tools/lib/xalan.jar Log: Fix embedded ant reports Added: branches/JBoss_Portal_Branch_2_6/tools/lib/ant-trax.jar =================================================================== (Binary files differ) Property changes on: branches/JBoss_Portal_Branch_2_6/tools/lib/ant-trax.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Deleted: branches/JBoss_Portal_Branch_2_6/tools/lib/saxon.jar =================================================================== (Binary files differ) Deleted: branches/JBoss_Portal_Branch_2_6/tools/lib/xalan.jar =================================================================== (Binary files differ)

16 years, 12 months

1
0
0 / 0

JBoss Portal SVN: r8918 - in branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal: wsrp/producer/config and 2 other directories.

by portal-commits＠lists.jboss.org

Author: chris.laprun(a)jboss.com Date: 2007-11-13 18:55:03 -0500 (Tue, 13 Nov 2007) New Revision: 8918 Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java Log: - Properly update the parent when a RegistrationPropertyDescription is renamed. Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2007-11-13 23:03:14 UTC (rev 8917) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/test/wsrp/other/RegistrationPropertyDescriptionTestCase.java 2007-11-13 23:55:03 UTC (rev 8918) @@ -60,6 +60,17 @@ assertTrue(parent.notifyCalled); } + public void testChangingNameUpdatesParent() + { + TestParent parent = new TestParent(); + desc.setParent(parent); + assertNotNull(parent.getRegistrationPropertyWith("foo")); + + desc.setName(QName.valueOf("bar")); + assertEquals(desc, parent.getRegistrationPropertyWith("bar")); + assertNull(parent.getRegistrationPropertyWith("foo")); + } + public void testModifyIfNeeded() { String oldValue = "old"; @@ -82,6 +93,9 @@ { private boolean notifyCalled; + // prop name fakes the existence of a property as only one property exists for the tests + private String propName = "foo"; + void resetNotifyCalled() { notifyCalled = false; @@ -138,6 +152,12 @@ public RegistrationPropertyDescription getRegistrationPropertyWith(String name) { + // return desc only if it matches the name we know about (used to fake property name updates) + if (propName.equals(name)) + { + return desc; + } + return null; } @@ -175,5 +195,16 @@ public void reloadPolicyFrom(String policyClassName, String validatorClassName) { } + + public void propertyHasBeenRenamed(RegistrationPropertyDescription propertyDescription, QName oldName) + { + // fake updating the property map + // if the old name was foo... + if ("foo".equals(oldName.getLocalPart())) + { + // then set the prop name to the new property name + propName = propertyDescription.getName().getLocalPart(); + } + } } } Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2007-11-13 23:03:14 UTC (rev 8917) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/ProducerRegistrationRequirements.java 2007-11-13 23:55:03 UTC (rev 8918) @@ -79,4 +79,6 @@ RegistrationPolicy getPolicy(); void reloadPolicyFrom(String policyClassName, String validatorClassName); + + void propertyHasBeenRenamed(RegistrationPropertyDescription propertyDescription, QName oldName); } Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2007-11-13 23:03:14 UTC (rev 8917) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/producer/config/impl/ProducerRegistrationRequirementsImpl.java 2007-11-13 23:55:03 UTC (rev 8918) @@ -286,7 +286,22 @@ } } + public void propertyHasBeenRenamed(RegistrationPropertyDescription propertyDescription, QName oldName) + { + ParameterValidation.throwIllegalArgExceptionIfNull(propertyDescription, "RegistrationPropertyDescription"); + ParameterValidation.throwIllegalArgExceptionIfNull(oldName, "property old name"); + if (registrationProperties.containsKey(oldName)) + { + synchronized (this) + { + registrationProperties.remove(oldName); + registrationProperties.put(propertyDescription.getName(), propertyDescription); + } + } + } + + public void setPolicyClassName(String policyClassName) { this.policyClassName = policyClassName; Modified: branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java =================================================================== --- branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java 2007-11-13 23:03:14 UTC (rev 8917) +++ branches/JBoss_Portal_Branch_2_6/wsrp/src/main/org/jboss/portal/wsrp/registration/RegistrationPropertyDescription.java 2007-11-13 23:55:03 UTC (rev 8918) @@ -166,7 +166,16 @@ public void setName(QName name) { - this.name = (QName)modifyIfNeeded(this.name, name); + if (valueWillBeUpdated(this.name, name)) + { + QName oldName = this.name; + this.name = name; + if (parent != null) + { + parent.notifyRegistrationPropertyChangeListeners(); + parent.propertyHasBeenRenamed(this, oldName); + } + } } public QName getType() @@ -320,7 +329,7 @@ public Object modifyIfNeeded(Object oldValue, Object newValue) { - if ((oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null)) + if (valueWillBeUpdated(oldValue, newValue)) { oldValue = newValue; notifyParentOfChangeIfNeeded(); @@ -329,6 +338,11 @@ return oldValue; } + private boolean valueWillBeUpdated(Object oldValue, Object newValue) + { + return (oldValue != null && !oldValue.equals(newValue)) || (oldValue == null && newValue != null); + } + /** * Tries to heuristically determine the language for this RegistrationPropertyDescription *

17 years

1
0
0 / 0

JBoss Portal SVN: r8917 - in branches/UIServer/uiserver/src/main/org/jboss/portal/presentation: impl/model2 and 1 other directories.

by portal-commits＠lists.jboss.org

Author: sohil.shah(a)jboss.com Date: 2007-11-13 18:03:14 -0500 (Tue, 13 Nov 2007) New Revision: 8917 Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContainerImpl.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContextImpl.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPageImpl.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPortalImpl.java branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIWindowImpl.java Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model2/UIObject.java Log: model implementation Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContainerImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContainerImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContainerImpl.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +import org.jboss.portal.presentation.model2.UIContainer; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class UIContainerImpl extends UIObjectImpl implements UIContainer +{ + +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContextImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContextImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIContextImpl.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -0,0 +1,41 @@ +/****************************************************************************** + * 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.presentation.impl.model2; + +import org.jboss.portal.presentation.model2.UIContext; +import org.jboss.portal.presentation.model2.UIObject; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class UIContextImpl extends UIObjectImpl implements UIContext +{ + /** + * + */ + public UIObject getObject(String id) + { + return null; + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIObjectImpl.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -0,0 +1,211 @@ +/****************************************************************************** + * 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.presentation.impl.model2; + +import java.util.List; +import java.util.ArrayList; + +import org.jboss.portal.presentation.model2.UIObject; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public abstract class UIObjectImpl implements UIObject +{ + /** + * + */ + protected String id = null; + + /** + * + */ + protected String name = null; + + /** + * + */ + protected List<UIObject> children = new ArrayList<UIObject>(); + + /** + * + */ + protected UIObject parent = null; + + /** + * + */ + public UIObjectImpl() + { + } + + /** + * + */ + public String getId() + { + return this.id; + } + + /** + * + */ + public String getName() + { + return this.name; + } + + /** + * + */ + public UIObject getParent() + { + return this.parent; + } + + /** + * + */ + public <T extends UIObject> T createChild(String name, Class<T> type) throws IllegalArgumentException + { + try + { + T child = null; + + if(type == UIContainerImpl.class) + { + child = type.newInstance(); + ((UIContainerImpl)child).name = name; + ((UIContainerImpl)child).parent = this; + ((UIContainerImpl)child).id = this.generateId(name); + } + else if(type == UIContextImpl.class) + { + child = type.newInstance(); + ((UIContextImpl)child).name = name; + ((UIContextImpl)child).parent = this; + ((UIContextImpl)child).id = this.generateId(name); + } + else if(type == UIPageImpl.class) + { + child = type.newInstance(); + ((UIPageImpl)child).name = name; + ((UIPageImpl)child).parent = this; + ((UIPageImpl)child).id = this.generateId(name); + } + else if(type == UIPortalImpl.class) + { + child = type.newInstance(); + ((UIPortalImpl)child).name = name; + ((UIPortalImpl)child).parent = this; + ((UIPortalImpl)child).id = this.generateId(name); + } + else if(type == UIWindowImpl.class) + { + child = type.newInstance(); + ((UIWindowImpl)child).name = name; + ((UIWindowImpl)child).parent = this; + ((UIWindowImpl)child).id = this.generateId(name); + } + + this.children.add(child); + return child; + } + catch(InstantiationException ie) + { + throw new RuntimeException(ie); + } + catch(IllegalAccessException iae) + { + throw new RuntimeException(iae); + } + } + + /** + * + */ + public void destroyChild(String name) + { + if(this.children != null) + { + for(int i=0; i<this.children.size(); i++) + { + UIObject child = this.children.get(i); + if(child.getName().equals(name)) + { + this.children.remove(child); + break; + } + } + } + } + + /** + * + */ + public List<UIObject> getChildren() + { + return this.children; + } + + /** + * + */ + public <T extends UIObject> List<UIObject> getChildren(Class<T> type) + { + List<UIObject> filteredList = new ArrayList<UIObject>(); + if(this.children != null) + { + for(int i=0; i<this.children.size(); i++) + { + UIObject child = this.children.get(i); + if(type == child.getClass()) + { + filteredList.add(child); + } + } + } + return filteredList; + } + + /** + * + * @return + */ + private String generateId(String childName) + { + String newId = null; + + if(this.parent != null) + { + newId = this.parent.getId() + "/" + this.name + "/" + childName; + } + else + { + newId = this.name + "/" + childName; + } + + return newId; + } +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPageImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPageImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPageImpl.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -0,0 +1,33 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +import org.jboss.portal.presentation.model2.UIPage; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class UIPageImpl extends UIObjectImpl implements UIPage +{ +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPortalImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPortalImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIPortalImpl.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -0,0 +1,34 @@ +/****************************************************************************** + * JBoss, a division of Red Hat * + * Copyright 2006, Red Hat Middleware, LLC, and individual * + * contributors as indicated by the @authors tag. See the * + * copyright.txt in the distribution for a full listing of * + * individual contributors. * + * * + * This is free software; you can redistribute it and/or modify it * + * under the terms of the GNU Lesser General Public License as * + * published by the Free Software Foundation; either version 2.1 of * + * the License, or (at your option) any later version. * + * * + * This software is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * + * Lesser General Public License for more details. * + * * + * You should have received a copy of the GNU Lesser General Public * + * License along with this software; if not, write to the Free * + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA * + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. * + ******************************************************************************/ +package org.jboss.portal.presentation.impl.model2; + +import org.jboss.portal.presentation.model2.UIPortal; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class UIPortalImpl extends UIObjectImpl implements UIPortal +{ + +} Added: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIWindowImpl.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIWindowImpl.java (rev 0) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/impl/model2/UIWindowImpl.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -0,0 +1,97 @@ +/****************************************************************************** + * 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.presentation.impl.model2; + +import org.jboss.portal.Mode; +import org.jboss.portal.WindowState; +import org.jboss.portal.presentation.model2.UIWindow; + +/** + * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a> + * + */ +public class UIWindowImpl extends UIObjectImpl implements UIWindow +{ + /** + * + */ + private Mode mode = null; + + /** + * + */ + private WindowState windowState = null; + + /** + * + */ + private String title = null; + + /** + * + */ + public Mode getMode() + { + return this.mode; + } + + /** + * + */ + public String getTitle() + { + return this.title; + } + + /** + * + */ + public WindowState getWindowState() + { + return this.windowState; + } + + /** + * + */ + public void setMode(Mode mode) + { + this.mode = mode; + } + + /** + * + */ + public void setTitle(String title) + { + this.title = title; + } + + /** + * + */ + public void setWindowState(WindowState windowState) + { + this.windowState = windowState; + } +} Modified: branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model2/UIObject.java =================================================================== --- branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model2/UIObject.java 2007-11-13 22:07:31 UTC (rev 8916) +++ branches/UIServer/uiserver/src/main/org/jboss/portal/presentation/model2/UIObject.java 2007-11-13 23:03:14 UTC (rev 8917) @@ -30,8 +30,23 @@ */ public interface UIObject { - + /** + * + * @return + */ String getId(); + + /** + * + * @return + */ + String getName(); + + /** + * + * @return + */ + UIObject getParent(); /** * Create a child with a specified type. @@ -41,12 +56,25 @@ * @return the newly created child * @throws IllegalArgumentException if the name is null, already exists or this kind of object does not accept children of the specified type */ - <T extends UIObject> T createChild(String name, Class<T> type) throws IllegalArgumentException; + <T extends UIObject>T createChild(String name, Class<T> type) throws IllegalArgumentException; + /** + * + * @param name + */ void destroyChild(String name); + /** + * + * @return + */ List<UIObject> getChildren(); - <T extends UIObject> List<T> getChildren(Class<T> type); - + /** + * + * @param <T> + * @param type + * @return + */ + <T extends UIObject> List<UIObject> getChildren(Class<T> type); }

17 years

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

portal-commits November 2007