[seam-commits] Seam SVN: r13822 - in modules/security/trunk: examples/openid-op/src/main/webapp/WEB-INF and 8 other directories.

Author: marcelkolsteren Date: 2010-10-10 12:49:49 -0400 (Sun, 10 Oct 2010) New Revision: 13822 Modified: modules/security/trunk/examples/openid-op/src/main/java/org/jboss/seam/security/examples/openid/Configuration.java modules/security/trunk/examples/openid-op/src/main/webapp/WEB-INF/beans.xml modules/security/trunk/examples/openid-rp/src/main/webapp/WEB-INF/beans.xml modules/security/trunk/examples/saml-idp/src/main/webapp/WEB-INF/beans.xml modules/security/trunk/examples/saml-sp/src/main/webapp/WEB-INF/beans.xml modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdProviderBean.java modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdRpBean.java modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/idp/SamlIdpBean.java modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/sp/SamlSpBean.java modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplication.java modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplicationScoped.java modules/security/trunk/external/src/test/resources/WEB-INF/idp-beans.xml modules/security/trunk/external/src/test/resources/WEB-INF/op-beans.xml modules/security/trunk/external/src/test/resources/WEB-INF/rp-beans.xml modules/security/trunk/external/src/test/resources/WEB-INF/sp-beans.xml modules/security/trunk/external/src/test/resources/WEB-INF/web.xml Log: Fixed some problems that popped up when trying to run the external authentication tests and sample applications on JBoss AS 6.0.0.M5. Modified: modules/security/trunk/examples/openid-op/src/main/java/org/jboss/seam/security/examples/openid/Configuration.java =================================================================== --- modules/security/trunk/examples/openid-op/src/main/java/org/jboss/seam/security/examples/openid/Configuration.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/examples/openid-op/src/main/java/org/jboss/seam/security/examples/openid/Configuration.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -24,19 +24,14 @@ import javax.enterprise.inject.Model; import javax.inject.Inject; -import org.jboss.seam.security.external.openid.api.OpenIdRelyingPartyConfigurationApi; +import org.jboss.seam.security.external.openid.api.OpenIdProviderConfigurationApi; @Model public class Configuration { @Inject - private OpenIdRelyingPartyConfigurationApi confApi; + private OpenIdProviderConfigurationApi confApi; - public String getRealm() - { - return confApi.getRealm(); - } - public String getXrdsURL() { return confApi.getXrdsURL(); Modified: modules/security/trunk/examples/openid-op/src/main/webapp/WEB-INF/beans.xml =================================================================== --- modules/security/trunk/examples/openid-op/src/main/webapp/WEB-INF/beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/examples/openid-op/src/main/webapp/WEB-INF/beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -2,6 +2,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.openid.OpenIdProviderInApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.openid.OpenIdProviderInApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/examples/openid-rp/src/main/webapp/WEB-INF/beans.xml =================================================================== --- modules/security/trunk/examples/openid-rp/src/main/webapp/WEB-INF/beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/examples/openid-rp/src/main/webapp/WEB-INF/beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -2,6 +2,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.openid.OpenIdRpInApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.openid.OpenIdRpInApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/examples/saml-idp/src/main/webapp/WEB-INF/beans.xml =================================================================== --- modules/security/trunk/examples/saml-idp/src/main/webapp/WEB-INF/beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/examples/saml-idp/src/main/webapp/WEB-INF/beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -2,6 +2,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.saml.idp.SamlIdpInApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.saml.idp.SamlIdpInApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/examples/saml-sp/src/main/webapp/WEB-INF/beans.xml =================================================================== --- modules/security/trunk/examples/saml-sp/src/main/webapp/WEB-INF/beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/examples/saml-sp/src/main/webapp/WEB-INF/beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -2,6 +2,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.saml.sp.SamlSpInVirtualApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.saml.sp.SamlSpInVirtualApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdProviderBean.java =================================================================== --- modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdProviderBean.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdProviderBean.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -29,6 +29,7 @@ import java.util.Map; import javax.enterprise.inject.Instance; +import javax.enterprise.inject.Typed; import javax.inject.Inject; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletResponse; @@ -56,6 +57,7 @@ * @author Marcel Kolsteren * */ +(a)Typed(OpenIdProviderBean.class) public class OpenIdProviderBean extends EntityBean implements OpenIdProviderApi, OpenIdProviderConfigurationApi { @Inject Modified: modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdRpBean.java =================================================================== --- modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdRpBean.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/openid/OpenIdRpBean.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -24,6 +24,7 @@ import java.io.Writer; import java.util.List; +import javax.enterprise.inject.Typed; import javax.inject.Inject; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletResponse; @@ -50,6 +51,7 @@ * @author Marcel Kolsteren * */ +(a)Typed(OpenIdRpBean.class) public class OpenIdRpBean extends EntityBean implements OpenIdRelyingPartyApi, OpenIdRelyingPartyConfigurationApi { @Inject Modified: modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/idp/SamlIdpBean.java =================================================================== --- modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/idp/SamlIdpBean.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/idp/SamlIdpBean.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -30,6 +30,7 @@ import java.util.Set; import javax.enterprise.inject.Instance; +import javax.enterprise.inject.Typed; import javax.inject.Inject; import javax.servlet.http.HttpServletResponse; import javax.xml.bind.JAXBException; @@ -60,6 +61,7 @@ * @author Marcel Kolsteren * */ +(a)Typed(SamlIdpBean.class) public class SamlIdpBean extends SamlEntityBean implements SamlMultiUserIdentityProviderApi, SamlIdentityProviderConfigurationApi { @Inject Modified: modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/sp/SamlSpBean.java =================================================================== --- modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/sp/SamlSpBean.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/saml/sp/SamlSpBean.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -28,6 +28,7 @@ import java.util.List; import java.util.Set; +import javax.enterprise.inject.Typed; import javax.inject.Inject; import javax.servlet.http.HttpServletResponse; import javax.xml.bind.JAXBException; @@ -52,6 +53,7 @@ * @author Marcel Kolsteren * */ +(a)Typed(SamlSpBean.class) public class SamlSpBean extends SamlEntityBean implements SamlMultiUserServiceProviderApi, SamlServiceProviderConfigurationApi { private List<SamlExternalIdentityProvider> identityProviders = new LinkedList<SamlExternalIdentityProvider>(); Modified: modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplication.java =================================================================== --- modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplication.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplication.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -25,7 +25,7 @@ * This virtual application scoped bean is automatically created in the virtual * application scope as soon as the virtual application is created. It can be * used to get virtual application properties. For background about the virtual - * application scope, see {@link VirtualApplication}. + * application scope, see {@link VirtualApplicationScoped}. * * @author Marcel Kolsteren * Modified: modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplicationScoped.java =================================================================== --- modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplicationScoped.java 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/main/java/org/jboss/seam/security/external/virtualapplications/api/VirtualApplicationScoped.java 2010-10-10 16:49:49 UTC (rev 13822) @@ -34,12 +34,23 @@ * The virtual application scope corresponds to a part of the application that * serves a certain host name. It can be used for situations where a single * application is used by different companies, each accessing the application - * using a host name that is part of the company's internet domain name. It is - * comparable to virtual hosting mechanisms that can be used to share one - * webserver with one IP-address by multiple companies. + * using a host name that is part of the company's internet domain name. * </p> * * <p> + * The virtual application scope is intented to be used in a multi-tenant + * software architecture. Wikipedia describes this architecture as follows: + * "Multi-tenancy refers to a principle in software architecture where a single + * instance of the software runs on a server, serving multiple client + * organizations (tenants). Multi-tenancy is contrasted with a multi-instance + * architecture where separate software instances (or hardware systems) are set + * up for different client organizations. With a multi-tenant architecture, a + * software application is designed to virtually partition its data and + * configuration thus each client organization works with a customized virtual + * application instance." + * </p> + * + * <p> * In the application context, one stores the configuration or data that is * specific for one company using the application. In the context of Seam * security, the virtual application context can be used to store the Modified: modules/security/trunk/external/src/test/resources/WEB-INF/idp-beans.xml =================================================================== --- modules/security/trunk/external/src/test/resources/WEB-INF/idp-beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/test/resources/WEB-INF/idp-beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -1,6 +1,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.saml.idp.SamlIdpInApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.saml.idp.SamlIdpInApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/external/src/test/resources/WEB-INF/op-beans.xml =================================================================== --- modules/security/trunk/external/src/test/resources/WEB-INF/op-beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/test/resources/WEB-INF/op-beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -1,6 +1,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.openid.OpenIdProviderInApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.openid.OpenIdProviderInApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/external/src/test/resources/WEB-INF/rp-beans.xml =================================================================== --- modules/security/trunk/external/src/test/resources/WEB-INF/rp-beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/test/resources/WEB-INF/rp-beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -1,6 +1,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.openid.OpenIdRpInApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.openid.OpenIdRpInApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/external/src/test/resources/WEB-INF/sp-beans.xml =================================================================== --- modules/security/trunk/external/src/test/resources/WEB-INF/sp-beans.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/test/resources/WEB-INF/sp-beans.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -1,6 +1,6 @@ <beans xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/beans_1_0.xsd"> <alternatives> - <classes>org.jboss.seam.security.external.saml.sp.SamlSpInVirtualApplicationScopeProducer</classes> + <class>org.jboss.seam.security.external.saml.sp.SamlSpInVirtualApplicationScopeProducer</class> </alternatives> </beans> Modified: modules/security/trunk/external/src/test/resources/WEB-INF/web.xml =================================================================== --- modules/security/trunk/external/src/test/resources/WEB-INF/web.xml 2010-10-10 00:28:38 UTC (rev 13821) +++ modules/security/trunk/external/src/test/resources/WEB-INF/web.xml 2010-10-10 16:49:49 UTC (rev 13822) @@ -4,5 +4,4 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - </web-app>