[weld-commits] Weld SVN: r4715 - in core/trunk/impl/src/main/java/org/jboss/weld: bean/ee and 1 other directories.

Author: pete.muir(a)jboss.org Date: 2009-11-06 07:58:14 -0500 (Fri, 06 Nov 2009) New Revision: 4715 Added: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java Removed: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java Log: reorg Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java 2009-11-06 12:34:09 UTC (rev 4714) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -1,72 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.bean.builtin; - -import java.lang.reflect.Type; -import java.util.Set; - -import javax.enterprise.context.spi.CreationalContext; -import javax.validation.Validator; - -import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.Container; -import org.jboss.weld.util.collections.Arrays2; -import org.jboss.weld.validation.spi.ValidationServices; - -/** - * @author pmuir - * - */ -public class DefaultValidatorBean extends AbstractBuiltInBean<Validator> -{ - - private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Validator.class); - - public DefaultValidatorBean(BeanManagerImpl manager) - { - super(Validator.class.getSimpleName(), manager); - } - - @Override - public Class<Validator> getType() - { - return Validator.class; - } - - public Set<Type> getTypes() - { - return TYPES; - } - - public Validator create(CreationalContext<Validator> creationalContext) - { - if (getManager().getServices().contains(ValidationServices.class)) - { - return Container.instance().deploymentServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator(); - } - else - { - throw new IllegalStateException("ValidationServices not available"); - } - } - - public void destroy(Validator instance, CreationalContext<Validator> creationalContext) - { - // No-op - } - -} Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java 2009-11-06 12:34:09 UTC (rev 4714) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.bean.builtin; - -import java.lang.reflect.Type; -import java.util.Set; - -import javax.enterprise.context.spi.CreationalContext; -import javax.validation.ValidatorFactory; - -import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.util.collections.Arrays2; -import org.jboss.weld.validation.spi.ValidationServices; - -/** - * @author pmuir - * - */ -public class DefaultValidatorFactoryBean extends AbstractBuiltInBean<ValidatorFactory> -{ - - private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, ValidatorFactory.class); - - public DefaultValidatorFactoryBean(BeanManagerImpl manager) - { - super(ValidatorFactory.class.getSimpleName(), manager); - } - - @Override - public Class<ValidatorFactory> getType() - { - return ValidatorFactory.class; - } - - public Set<Type> getTypes() - { - return TYPES; - } - - public ValidatorFactory create(CreationalContext<ValidatorFactory> creationalContext) - { - if (getManager().getServices().contains(ValidationServices.class)) - { - return getManager().getServices().get(ValidationServices.class).getDefaultValidatorFactory(); - } - else - { - throw new IllegalStateException("ValidationServices not available"); - } - } - - public void destroy(ValidatorFactory instance, CreationalContext<ValidatorFactory> creationalContext) - { - // No-op - } - -} Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java 2009-11-06 12:34:09 UTC (rev 4714) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.bean.builtin; - -import java.lang.reflect.Type; -import java.security.Principal; -import java.util.Set; - -import javax.enterprise.context.spi.CreationalContext; - -import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.security.spi.SecurityServices; -import org.jboss.weld.util.collections.Arrays2; - -/** - * @author pmuir - * - */ -public class PrincipalBean extends AbstractBuiltInBean<Principal> -{ - - private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Principal.class); - - public PrincipalBean(BeanManagerImpl manager) - { - super(Principal.class.getSimpleName(), manager); - } - - @Override - public Class<Principal> getType() - { - return Principal.class; - } - - public Set<Type> getTypes() - { - return TYPES; - } - - public Principal create(CreationalContext<Principal> creationalContext) - { - if (getManager().getServices().contains(SecurityServices.class)) - { - return getManager().getServices().get(SecurityServices.class).getPrincipal(); - } - else - { - throw new IllegalStateException("SecurityServices not available"); - } - } - - public void destroy(Principal instance, CreationalContext<Principal> creationalContext) - { - // No-op - } - -} Deleted: core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java 2009-11-06 12:34:09 UTC (rev 4714) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -1,71 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jboss.weld.bean.builtin; - -import java.lang.reflect.Type; -import java.util.Set; - -import javax.enterprise.context.spi.CreationalContext; -import javax.transaction.UserTransaction; - -import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.transaction.spi.TransactionServices; -import org.jboss.weld.util.collections.Arrays2; - -/** - * @author pmuir - * - */ -public class UserTransactionBean extends AbstractBuiltInBean<UserTransaction> -{ - - private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, UserTransaction.class); - - public UserTransactionBean(BeanManagerImpl manager) - { - super(UserTransaction.class.getSimpleName(), manager); - } - - @Override - public Class<UserTransaction> getType() - { - return UserTransaction.class; - } - - public Set<Type> getTypes() - { - return TYPES; - } - - public UserTransaction create(CreationalContext<UserTransaction> creationalContext) - { - if (getManager().getServices().contains(TransactionServices.class)) - { - return getManager().getServices().get(TransactionServices.class).getUserTransaction(); - } - else - { - throw new IllegalStateException("TransactionServices not available"); - } - } - - public void destroy(UserTransaction instance, CreationalContext<UserTransaction> creationalContext) - { - // No-op - } - -} Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorBean.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -0,0 +1,73 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.bean.ee; + +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.context.spi.CreationalContext; +import javax.validation.Validator; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.Container; +import org.jboss.weld.bean.builtin.AbstractBuiltInBean; +import org.jboss.weld.util.collections.Arrays2; +import org.jboss.weld.validation.spi.ValidationServices; + +/** + * @author pmuir + * + */ +public class DefaultValidatorBean extends AbstractBuiltInBean<Validator> +{ + + private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Validator.class); + + public DefaultValidatorBean(BeanManagerImpl manager) + { + super(Validator.class.getSimpleName(), manager); + } + + @Override + public Class<Validator> getType() + { + return Validator.class; + } + + public Set<Type> getTypes() + { + return TYPES; + } + + public Validator create(CreationalContext<Validator> creationalContext) + { + if (getManager().getServices().contains(ValidationServices.class)) + { + return Container.instance().deploymentServices().get(ValidationServices.class).getDefaultValidatorFactory().getValidator(); + } + else + { + throw new IllegalStateException("ValidationServices not available"); + } + } + + public void destroy(Validator instance, CreationalContext<Validator> creationalContext) + { + // No-op + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/DefaultValidatorFactoryBean.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.bean.ee; + +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.context.spi.CreationalContext; +import javax.validation.ValidatorFactory; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.builtin.AbstractBuiltInBean; +import org.jboss.weld.util.collections.Arrays2; +import org.jboss.weld.validation.spi.ValidationServices; + +/** + * @author pmuir + * + */ +public class DefaultValidatorFactoryBean extends AbstractBuiltInBean<ValidatorFactory> +{ + + private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, ValidatorFactory.class); + + public DefaultValidatorFactoryBean(BeanManagerImpl manager) + { + super(ValidatorFactory.class.getSimpleName(), manager); + } + + @Override + public Class<ValidatorFactory> getType() + { + return ValidatorFactory.class; + } + + public Set<Type> getTypes() + { + return TYPES; + } + + public ValidatorFactory create(CreationalContext<ValidatorFactory> creationalContext) + { + if (getManager().getServices().contains(ValidationServices.class)) + { + return getManager().getServices().get(ValidationServices.class).getDefaultValidatorFactory(); + } + else + { + throw new IllegalStateException("ValidationServices not available"); + } + } + + public void destroy(ValidatorFactory instance, CreationalContext<ValidatorFactory> creationalContext) + { + // No-op + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/DefaultValidatorFactoryBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/PrincipalBean.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.bean.ee; + +import java.lang.reflect.Type; +import java.security.Principal; +import java.util.Set; + +import javax.enterprise.context.spi.CreationalContext; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.builtin.AbstractBuiltInBean; +import org.jboss.weld.security.spi.SecurityServices; +import org.jboss.weld.util.collections.Arrays2; + +/** + * @author pmuir + * + */ +public class PrincipalBean extends AbstractBuiltInBean<Principal> +{ + + private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, Principal.class); + + public PrincipalBean(BeanManagerImpl manager) + { + super(Principal.class.getSimpleName(), manager); + } + + @Override + public Class<Principal> getType() + { + return Principal.class; + } + + public Set<Type> getTypes() + { + return TYPES; + } + + public Principal create(CreationalContext<Principal> creationalContext) + { + if (getManager().getServices().contains(SecurityServices.class)) + { + return getManager().getServices().get(SecurityServices.class).getPrincipal(); + } + else + { + throw new IllegalStateException("SecurityServices not available"); + } + } + + public void destroy(Principal instance, CreationalContext<Principal> creationalContext) + { + // No-op + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/PrincipalBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Copied: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java (from rev 4706, core/trunk/impl/src/main/java/org/jboss/weld/bean/builtin/UserTransactionBean.java) =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java (rev 0) +++ core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.jboss.weld.bean.ee; + +import java.lang.reflect.Type; +import java.util.Set; + +import javax.enterprise.context.spi.CreationalContext; +import javax.transaction.UserTransaction; + +import org.jboss.weld.BeanManagerImpl; +import org.jboss.weld.bean.builtin.AbstractBuiltInBean; +import org.jboss.weld.transaction.spi.TransactionServices; +import org.jboss.weld.util.collections.Arrays2; + +/** + * @author pmuir + * + */ +public class UserTransactionBean extends AbstractBuiltInBean<UserTransaction> +{ + + private static final Set<Type> TYPES = Arrays2.<Type>asSet(Object.class, UserTransaction.class); + + public UserTransactionBean(BeanManagerImpl manager) + { + super(UserTransaction.class.getSimpleName(), manager); + } + + @Override + public Class<UserTransaction> getType() + { + return UserTransaction.class; + } + + public Set<Type> getTypes() + { + return TYPES; + } + + public UserTransaction create(CreationalContext<UserTransaction> creationalContext) + { + if (getManager().getServices().contains(TransactionServices.class)) + { + return getManager().getServices().get(TransactionServices.class).getUserTransaction(); + } + else + { + throw new IllegalStateException("TransactionServices not available"); + } + } + + public void destroy(UserTransaction instance, CreationalContext<UserTransaction> creationalContext) + { + // No-op + } + +} Property changes on: core/trunk/impl/src/main/java/org/jboss/weld/bean/ee/UserTransactionBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-06 12:34:09 UTC (rev 4714) +++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java 2009-11-06 12:58:14 UTC (rev 4715) @@ -23,14 +23,14 @@ import static org.jboss.weld.logging.messages.BootstrapMessage.ENABLED_POLICIES; import org.jboss.weld.BeanManagerImpl; -import org.jboss.weld.bean.builtin.DefaultValidatorBean; -import org.jboss.weld.bean.builtin.DefaultValidatorFactoryBean; import org.jboss.weld.bean.builtin.InjectionPointBean; import org.jboss.weld.bean.builtin.ManagerBean; -import org.jboss.weld.bean.builtin.PrincipalBean; -import org.jboss.weld.bean.builtin.UserTransactionBean; import org.jboss.weld.bean.builtin.facade.EventBean; import org.jboss.weld.bean.builtin.facade.InstanceBean; +import org.jboss.weld.bean.ee.DefaultValidatorBean; +import org.jboss.weld.bean.ee.DefaultValidatorFactoryBean; +import org.jboss.weld.bean.ee.PrincipalBean; +import org.jboss.weld.bean.ee.UserTransactionBean; import org.jboss.weld.bootstrap.api.Environment; import org.jboss.weld.bootstrap.api.ServiceRegistry; import org.jboss.weld.bootstrap.api.helpers.SimpleServiceRegistry;