November 2009 - weld-commits - Jboss List Archives

Weld SVN: r4827 - in extensions/trunk/servlet: int/src/main/java/org/jboss/weld/environment/servlet and 4 other directories.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-11-08 22:56:44 -0500 (Sun, 08 Nov 2009) New Revision: 4827 Added: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java Modified: extensions/trunk/servlet/int/pom.xml extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/AbstractScanner.java extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/URLScanner.java extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/WeldApplication.java extensions/trunk/servlet/tests/pom.xml Log: WELDX-44 Introduce a delegating ELResolver that plugs in the ELResolver when it becomes available Remove weld-logging dependencies in favor of slf4j Modified: extensions/trunk/servlet/int/pom.xml =================================================================== --- extensions/trunk/servlet/int/pom.xml 2009-11-09 03:55:27 UTC (rev 4826) +++ extensions/trunk/servlet/int/pom.xml 2009-11-09 03:56:44 UTC (rev 4827) @@ -39,11 +39,6 @@ </dependency> <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-logging</artifactId> - </dependency> - - <dependency> <groupId>org.apache.tomcat</groupId> <artifactId>catalina</artifactId> <version>6.0.18</version> @@ -67,6 +62,23 @@ <artifactId>jsp-api</artifactId> <scope>provided</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-jcl</artifactId> + <version>1.5.8</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> </dependencies> Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2009-11-09 03:55:27 UTC (rev 4826) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/Listener.java 2009-11-09 03:56:44 UTC (rev 4827) @@ -17,7 +17,6 @@ package org.jboss.weld.environment.servlet; import javax.el.ELContextListener; -import javax.enterprise.inject.spi.BeanManager; import javax.servlet.ServletContextEvent; import javax.servlet.jsp.JspApplicationContext; import javax.servlet.jsp.JspFactory; @@ -32,19 +31,19 @@ import org.jboss.weld.environment.servlet.util.Reflections; import org.jboss.weld.environment.tomcat.WeldAnnotationProcessor; import org.jboss.weld.injection.spi.ResourceInjectionServices; -import org.jboss.weld.log.Log; -import org.jboss.weld.log.Logging; import org.jboss.weld.manager.api.WeldManager; import org.jboss.weld.servlet.api.ServletListener; import org.jboss.weld.servlet.api.ServletServices; import org.jboss.weld.servlet.api.helpers.ForwardingServletListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * @author Pete Muir */ public class Listener extends ForwardingServletListener -{ - private static final Log log = Logging.getLog(Listener.class); +{ + private static final Logger log = LoggerFactory.getLogger(Listener.class); private static final String BOOTSTRAP_IMPL_CLASS_NAME = "org.jboss.weld.bootstrap.WeldBootstrap"; private static final String WELD_LISTENER_CLASS_NAME = "org.jboss.weld.servlet.WeldListener"; @@ -55,7 +54,7 @@ private final transient ServletListener weldListener; private WeldManager manager; - public Listener() + public Listener() { try { @@ -79,7 +78,6 @@ public void contextDestroyed(ServletContextEvent sce) { bootstrap.shutdown(); - sce.getServletContext().removeAttribute(BeanManager.class.getName()); sce.getServletContext().removeAttribute(WeldAnnotationProcessor.class.getName()); super.contextDestroyed(sce); } @@ -90,8 +88,6 @@ BeanStore applicationBeanStore = new ConcurrentHashMapBeanStore(); sce.getServletContext().setAttribute(APPLICATION_BEAN_STORE_ATTRIBUTE_NAME, applicationBeanStore); - - ServletDeployment deployment = new ServletDeployment(sce.getServletContext()); try { @@ -100,11 +96,11 @@ } catch (NoClassDefFoundError e) { - // Support GAE + // Support GAE log.warn("@Resource injection not available in simple beans"); } - deployment.getServices().add(ServletServices.class, + deployment.getServices().add(ServletServices.class, new ServletServicesImpl(deployment.getWebAppBeanDeploymentArchive())); bootstrap.startContainer(Environments.SERVLET, deployment, applicationBeanStore).startInitialization(); @@ -115,7 +111,7 @@ { Reflections.classForName("org.apache.AnnotationProcessor"); } - catch (IllegalArgumentException e) + catch (IllegalArgumentException e) { log.info("JSR-299 injection will not be available in Servlets, Filters etc. This facility is only available in Tomcat"); tomcat = false; @@ -130,14 +126,13 @@ Object annotationProcessor = clazz.getConstructor(WeldManager.class).newInstance(manager); sce.getServletContext().setAttribute(WeldAnnotationProcessor.class.getName(), annotationProcessor); } - catch (Exception e) + catch (Exception e) { log.error("Unable to create Tomcat AnnotationProcessor. JSR-299 injection will not be available in Servlets, Filters etc.", e); } } // Push the manager into the servlet context so we can access in JSF - sce.getServletContext().setAttribute(BeanManager.class.getName(), manager); if (JspFactory.getDefaultFactory() != null) { @@ -151,7 +146,7 @@ newInstance("org.jboss.weld.el.WeldELContextListener")); // Push the wrapped expression factory into the servlet context so that Tomcat or Jetty can hook it in using a container code - sce.getServletContext().setAttribute(EXPRESSION_FACTORY_NAME, + sce.getServletContext().setAttribute(EXPRESSION_FACTORY_NAME, manager.wrapExpressionFactory(jspApplicationContext.getExpressionFactory())); } @@ -159,8 +154,6 @@ super.contextInitialized(sce); } - - @Override protected ServletListener delegate() { Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/AbstractScanner.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/AbstractScanner.java 2009-11-09 03:55:27 UTC (rev 4826) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/AbstractScanner.java 2009-11-09 03:56:44 UTC (rev 4827) @@ -18,8 +18,8 @@ import java.net.URL; -import org.jboss.weld.log.Log; -import org.jboss.weld.log.Logging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Abstract base class for {@link Scanner} providing common functionality @@ -32,7 +32,8 @@ public abstract class AbstractScanner implements Scanner { - private static final Log log = Logging.getLog(Scanner.class); + private static final Logger log = LoggerFactory.getLogger(Scanner.class); + private final ClassLoader classLoader; private final WebAppBeanDeploymentArchive webAppBeanDeploymentArchive; Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/URLScanner.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/URLScanner.java 2009-11-09 03:55:27 UTC (rev 4826) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/deployment/URLScanner.java 2009-11-09 03:56:44 UTC (rev 4827) @@ -29,8 +29,8 @@ import java.util.zip.ZipException; import java.util.zip.ZipFile; -import org.jboss.weld.log.Log; -import org.jboss.weld.log.Logging; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Implementation of {@link Scanner} which can scan a {@link URLClassLoader} @@ -43,7 +43,7 @@ */ public class URLScanner extends AbstractScanner { - private static final Log log = Logging.getLog(URLScanner.class); + private static final Logger log = LoggerFactory.getLogger(URLScanner.class); public URLScanner(ClassLoader classLoader, WebAppBeanDeploymentArchive webBeanDiscovery) { Modified: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/WeldApplication.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/WeldApplication.java 2009-11-09 03:55:27 UTC (rev 4826) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/jsf/WeldApplication.java 2009-11-09 03:56:44 UTC (rev 4827) @@ -9,7 +9,7 @@ * 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, + * 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. @@ -17,39 +17,69 @@ package org.jboss.weld.environment.servlet.jsf; import javax.el.ELContextListener; +import javax.el.ELResolver; import javax.el.ExpressionFactory; import javax.enterprise.inject.spi.BeanManager; import javax.faces.application.Application; import javax.faces.context.FacesContext; import javax.servlet.ServletContext; +import org.jboss.weld.environment.servlet.util.ForwardingELResolver; import org.jboss.weld.environment.servlet.util.Reflections; /** - * @author pmuir - * + * @author Pete Muir + * @author Dan Allen */ public class WeldApplication extends ForwardingApplication { + /** + * The BeanManager may not have been initialized at the time JSF is initializing. Therefore, + * we stick in an ELResolver that delegates to the BeanManager ELResolver, which will + * be plugged in when it's available. If the ELResolver is invoked before the BeanManager + * is available, an IllegalStateException is thrown (is this the desired behavior?) + */ + private static class LazyBeanManagerIntegrationELResolver extends ForwardingELResolver + { + private ELResolver delegate = null; + + public void beanManagerReady(BeanManager beanManager) + { + this.delegate = beanManager.getELResolver(); + } + + @Override + protected ELResolver delegate() + { + if (delegate == null) { + throw new IllegalStateException("Attempt to use JSR-299 ELResolver before BeanManager initialized."); + } + return delegate; + } + } - private static final ELContextListener[] EMPTY_LISTENERS = {}; - private final Application application; + private LazyBeanManagerIntegrationELResolver elResolver; private ExpressionFactory expressionFactory; private BeanManager beanManager; public WeldApplication(Application application) { this.application = application; + // QUESTION should the context listener be registered in init() instead? + application.addELContextListener(Reflections.<ELContextListener>newInstance("org.jboss.weld.el.WeldELContextListener")); + elResolver = new LazyBeanManagerIntegrationELResolver(); + application.addELResolver(elResolver); } private void init() { - if (expressionFactory == null && application.getExpressionFactory() != null && beanManager() != null) + ExpressionFactory expressionFactory = null; + BeanManager beanManager = null; + if (expressionFactory == null && (expressionFactory = application.getExpressionFactory()) != null && (beanManager = beanManager()) != null) { - application.addELContextListener(Reflections.<ELContextListener>newInstance("org.jboss.weld.el.WeldELContextListener")); - application.addELResolver(beanManager().getELResolver()); - this.expressionFactory = beanManager().wrapExpressionFactory(application.getExpressionFactory()); + elResolver.beanManagerReady(beanManager); + this.expressionFactory = beanManager.wrapExpressionFactory(expressionFactory); } } @@ -90,8 +120,8 @@ } this.beanManager = (BeanManager) ctx.getAttribute(BeanManager.class.getName()); } + return beanManager; - } } Added: extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java =================================================================== --- extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java (rev 0) +++ extensions/trunk/servlet/int/src/main/java/org/jboss/weld/environment/servlet/util/ForwardingELResolver.java 2009-11-09 03:56:44 UTC (rev 4827) @@ -0,0 +1,88 @@ +/* + * 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.environment.servlet.util; + +import java.beans.FeatureDescriptor; +import java.util.Iterator; + +import javax.el.ELContext; +import javax.el.ELResolver; + +/** + * Copied from Weld core. Consider putting this class in the SPI? + * + * @author Dan Allen + */ +public abstract class ForwardingELResolver extends ELResolver +{ + protected abstract ELResolver delegate(); + + @Override + public Class<?> getCommonPropertyType(ELContext context, Object base) + { + return delegate().getCommonPropertyType(context, base); + } + + @Override + public Iterator<FeatureDescriptor> getFeatureDescriptors(ELContext context, Object base) + { + return delegate().getFeatureDescriptors(context, base); + } + + @Override + public Class<?> getType(ELContext context, Object base, Object property) + { + return delegate().getType(context, base, property); + } + + @Override + public Object getValue(ELContext context, Object base, Object property) + { + return delegate().getValue(context, base, property); + } + + @Override + public boolean isReadOnly(ELContext context, Object base, Object property) + { + return delegate().isReadOnly(context, base, property); + } + + @Override + public void setValue(ELContext context, Object base, Object property, Object value) + { + delegate().setValue(context, base, property, value); + } + + @Override + public boolean equals(Object obj) + { + return this == obj || delegate().equals(obj); + } + + @Override + public int hashCode() + { + return delegate().hashCode(); + } + + @Override + public String toString() + { + return delegate().toString(); + } + +} Modified: extensions/trunk/servlet/tests/pom.xml =================================================================== --- extensions/trunk/servlet/tests/pom.xml 2009-11-09 03:55:27 UTC (rev 4826) +++ extensions/trunk/servlet/tests/pom.xml 2009-11-09 03:56:44 UTC (rev 4827) @@ -115,7 +115,13 @@ <groupId>commons-httpclient</groupId> <artifactId>commons-httpclient</artifactId> </dependency> - + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <scope>test</scope> + </dependency> + </dependencies> <build>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4826 - examples/trunk.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-11-08 22:55:27 -0500 (Sun, 08 Nov 2009) New Revision: 4826 Modified: examples/trunk/build.xml Log: tomcat operations should depend on tomcat package Modified: examples/trunk/build.xml =================================================================== --- examples/trunk/build.xml 2009-11-09 03:53:45 UTC (rev 4825) +++ examples/trunk/build.xml 2009-11-09 03:55:27 UTC (rev 4826) @@ -43,6 +43,12 @@ </maven> </target> + <target name="tomcat.package"> + <maven target="install" basedir="${basedir}"> + <arg line="-f ${pom.file} -Ptomcat" /> + </maven> + </target> + <target name="explode" depends="package"> <mkdir dir="${jboss.home}/server/default/deploy/${example.name}.${type}" /> <copy todir="${jboss.home}/server/default/deploy/${example.name}.${type}"> @@ -50,7 +56,7 @@ </copy> </target> - <target name="tomcat.explode" depends="package"> + <target name="tomcat.explode" depends="tomcat.package"> <mkdir dir="${tomcat.home}/webapps/${example.name}" /> <copy todir="${tomcat.home}/webapps/${example.name}"> <fileset dir="${artifact.dir}" /> @@ -62,7 +68,7 @@ <echo message="The app can be accessed at ${final.url}" /> </target> - <target name="tomcat.deploy" depends="package"> + <target name="tomcat.deploy" depends="tomcat.package"> <copy todir="${tomcat.home}/webapps/" file="${artifact.target.dir}/${example.name}.${type}" /> <echo message="The app can be accessed at ${final.url}" /> </target>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4825 - doc/trunk/reference/en-US.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-11-08 22:53:45 -0500 (Sun, 08 Nov 2009) New Revision: 4825 Modified: doc/trunk/reference/en-US/extensions.xml Log: TODO note Modified: doc/trunk/reference/en-US/extensions.xml =================================================================== --- doc/trunk/reference/en-US/extensions.xml 2009-11-09 03:22:59 UTC (rev 4824) +++ doc/trunk/reference/en-US/extensions.xml 2009-11-09 03:53:45 UTC (rev 4825) @@ -2,6 +2,9 @@ "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" [ ]> <chapter id="extensions"> +  + <title>CDI extensions available as part of Weld</title> <important>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4824 - core/trunk/impl/src/main/resources/org/jboss/weld/messages.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-11-08 22:22:59 -0500 (Sun, 08 Nov 2009) New Revision: 4824 Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties Log: change @Current to @Inject Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2009-11-09 03:07:22 UTC (rev 4823) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bootstrap_en.properties 2009-11-09 03:22:59 UTC (rev 4824) @@ -1,5 +1,5 @@ VALIDATING_BEANS=Weld initialized. Validating beans -JTA_UNAVAILABLE=Transactional services not available. Injection of @Current UserTransaction not available. Transactional observers will be invoked synchronously. +JTA_UNAVAILABLE=Transactional services not available. Injection of @Inject UserTransaction not available. Transactional observers will be invoked synchronously. ENABLED_POLICIES=Enabled policies for {0}: {1} {2} ENABLED_DECORATORS=Enabled decorator types for {0}: {1} ENABLED_INTERCEPTORS=Enabled interceptor types for {0}: {1}

14 years, 11 months

1
0
0 / 0

Weld SVN: r4823 - examples/trunk/jsf/permalink.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-11-08 22:07:22 -0500 (Sun, 08 Nov 2009) New Revision: 4823 Modified: examples/trunk/jsf/permalink/pom.xml Log: stick to weld-permalink as final name for now Modified: examples/trunk/jsf/permalink/pom.xml =================================================================== --- examples/trunk/jsf/permalink/pom.xml 2009-11-09 02:30:22 UTC (rev 4822) +++ examples/trunk/jsf/permalink/pom.xml 2009-11-09 03:07:22 UTC (rev 4823) @@ -88,7 +88,10 @@ <build> <defaultGoal>package</defaultGoal> + <finalName>weld-permalink</finalName> +  <plugins> <plugin>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4822 - extensions/trunk/servlet.

by weld-commits＠lists.jboss.org

Author: dan.j.allen Date: 2009-11-08 21:30:22 -0500 (Sun, 08 Nov 2009) New Revision: 4822 Modified: extensions/trunk/servlet/pom.xml Log: update URL Modified: extensions/trunk/servlet/pom.xml =================================================================== --- extensions/trunk/servlet/pom.xml 2009-11-09 01:20:38 UTC (rev 4821) +++ extensions/trunk/servlet/pom.xml 2009-11-09 02:30:22 UTC (rev 4822) @@ -37,13 +37,13 @@ <role>Project Lead</role> </roles> <email>pete.muir(a)jboss.org</email> - <organization>Red Hat Inc.</organization> + <organization>Red Hat, Inc.</organization> <url>http://in.relation.to/Bloggers/Pete</url> </developer> <developer> <name>Dan Allen</name> - <organization>Red Hat Inc.</organization> - <url>http://in.relation.to/Bloggers/Pete</url> + <organization>Red Hat, Inc.</organization> + <url>http://in.relation.to/Bloggers/Dan</url> </developer> </developers>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4821 - doc/trunk/reference.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-08 20:20:38 -0500 (Sun, 08 Nov 2009) New Revision: 4821 Modified: doc/trunk/reference/pom.xml Log: use newer parent Modified: doc/trunk/reference/pom.xml =================================================================== --- doc/trunk/reference/pom.xml 2009-11-09 01:16:46 UTC (rev 4820) +++ doc/trunk/reference/pom.xml 2009-11-09 01:20:38 UTC (rev 4821) @@ -12,15 +12,9 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>5</version> + <version>6</version> </parent> - <properties> - <weld.docbook.version>1.1.1-Beta3</weld.docbook.version> - <seam.docbook.version>1.1.0.GA</seam.docbook.version> - <jbossorg.docbook.version>1.1.0</jbossorg.docbook.version> - </properties> - <pluginRepositories> <pluginRepository> <id>repository.jboss.org</id> @@ -36,104 +30,18 @@ </repository> </repositories> + <properties> + <pdf.name>weld-reference.pdf</pdf.name> + </properties> + <build> <defaultGoal>process-classes</defaultGoal> <plugins> <plugin> <groupId>org.jboss.maven.plugins</groupId> <artifactId>maven-jdocbook-plugin</artifactId> - <extensions>true</extensions> - <dependencies> - <dependency> - <groupId>org.jboss.weld</groupId> - <artifactId>weld-docbook-xslt</artifactId> - <version>${weld.docbook.version}</version> - <exclusions> - <exclusion> - <groupId>org.eclipse.wst.css</groupId> - <artifactId>core</artifactId> - </exclusion> - <exclusion> - <groupId>org.eclipse.wst.sse</groupId> - <artifactId>core</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>seam-jdocbook-style</artifactId> - <version>${seam.docbook.version}</version> - <type>jdocbook-style</type> - </dependency> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>jbossorg-jdocbook-style</artifactId> - <version>${jbossorg.docbook.version}</version> - <type>jdocbook-style</type> - </dependency> - </dependencies> - <configuration> - <sourceDirectory>${pom.basedir}</sourceDirectory> - <sourceDocumentName>master.xml</sourceDocumentName> - <masterTranslation>en-US</masterTranslation> - <imageResource> - <directory>${pom.basedir}/en-US</directory> - <includes> - <include>images/*.png</include> - </includes> - </imageResource> - <formats> - <format> - <formatName>pdf</formatName> - <stylesheetResource> - classpath:/xslt/org/jboss/weld/pdf.xsl - </stylesheetResource> - <finalName>weld_reference.pdf</finalName> - </format> - <format> - <formatName>html</formatName> - <stylesheetResource> - classpath:/xslt/org/jboss/weld/xhtml.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - <format> - <formatName>html_single</formatName> - <stylesheetResource> - classpath:/xslt/org/jboss/weld/xhtml-single.xsl - </stylesheetResource> - <finalName>index.html</finalName> - </format> - </formats> - <options> - <xincludeSupported>true</xincludeSupported> - <xmlTransformerType>saxon</xmlTransformerType> -  -  - <docbookVersion>1.72.0</docbookVersion> - <localeSeparator>-</localeSeparator> - </options> - </configuration> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>2.4</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <arguments>-Ptranslations</arguments> - </configuration> - </plugin> - <plugin> <artifactId>maven-antrun-plugin</artifactId> <executions> <execution> @@ -141,7 +49,7 @@ <configuration> <tasks> <copy - file="${basedir}/target/docbook/publish/en-US/pdf/weld_reference.pdf" + file="${basedir}/target/docbook/publish/en-US/pdf/${pdf.name}" todir="${basedir}" /> </tasks> </configuration> @@ -152,65 +60,29 @@ </executions> </plugin> <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-enforcer-plugin</artifactId> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>attach-zip</id> + <phase>package</phase> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>${project.build.outputDirectory}/${project.artifactId}-${project.version}.war</file> + <type>war</type> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <configuration> - <arguments>-Ptranslations</arguments> - </configuration> - </plugin> </plugins> </build> - <profiles> - <profile> - <id>translations</id> - <build> - <plugins> - <plugin> - <groupId>org.jboss.maven.plugins</groupId> - <artifactId>maven-jdocbook-plugin</artifactId> - <executions> - <execution> - <phase>process-resources</phase> - <goals> - <goal>translate</goal> - </goals> - </execution> - </executions> - <configuration> - <translations> - <translation>it-IT</translation> - <translation>zh-CN</translation> - <translation>zh-TW</translation> - <translation>es-ES</translation> - <translation>ko-KR</translation> - <translation>de-DE</translation> - <translation>pt-BR</translation> - </translations> - </configuration> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <ciManagement> - <system>Hudson</system> - <url /> - - </ciManagement> - - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/browse/WELD</url> - </issueManagement> - - <inceptionYear>2008</inceptionYear> - <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/weld/doc</connection>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4820 - in core/trunk: bom and 2 other directories.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-08 20:16:46 -0500 (Sun, 08 Nov 2009) New Revision: 4820 Modified: core/trunk/bom/pom.xml core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java core/trunk/jboss-tck-runner/pom.xml core/trunk/pom.xml Log: update versions Modified: core/trunk/bom/pom.xml =================================================================== --- core/trunk/bom/pom.xml 2009-11-09 01:00:41 UTC (rev 4819) +++ core/trunk/bom/pom.xml 2009-11-09 01:16:46 UTC (rev 4820) @@ -8,7 +8,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>4</version> + <version>6</version> </parent> <name>Weld Core BOM</name> @@ -71,10 +71,10 @@ </repositories> <properties> - <weld.api.version>1.0-CR4</weld.api.version> + <weld.api.version>1.0</weld.api.version> <google.collections.version>1.0-rc3</google.collections.version> <javassist.version>3.11.0.GA</javassist.version> - <cdi.tck.version>1.0.0-CR6</cdi.tck.version> + <cdi.tck.version>1.0.0-CR7</cdi.tck.version> <atinject.tck.version>1.0.0-PFD-3</atinject.tck.version> <jboss.interceptor.version>1.0.0-CR5</jboss.interceptor.version> <slf4j.version>1.5.9.RC1</slf4j.version> Modified: core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java =================================================================== --- core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-11-09 01:00:41 UTC (rev 4819) +++ core/trunk/impl/src/main/java/org/jboss/weld/util/Names.java 2009-11-09 01:16:46 UTC (rev 4820) @@ -337,7 +337,16 @@ String version = pkg.getImplementationVersion(); if (version != null) { - return new StringBuilder().append(version.substring(0, version.lastIndexOf("-"))).append(" (").append(version.substring(version.lastIndexOf("-") + 1)).append(")").toString(); + String separator = null; + if (version.indexOf("-") > 0) + { + separator = "-"; + } + else + { + separator = "."; + } + return new StringBuilder().append(version.substring(0, version.lastIndexOf(separator))).append(" (").append(version.substring(version.lastIndexOf(separator) + 1)).append(")").toString(); } } return "SNAPSHOT"; Modified: core/trunk/jboss-tck-runner/pom.xml =================================================================== --- core/trunk/jboss-tck-runner/pom.xml 2009-11-09 01:00:41 UTC (rev 4819) +++ core/trunk/jboss-tck-runner/pom.xml 2009-11-09 01:16:46 UTC (rev 4820) @@ -92,7 +92,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> </suiteXmlFiles> <argLine>-Xmx748m</argLine> <forkMode>once</forkMode> @@ -167,7 +167,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> </suiteXmlFiles> <systemProperties> <property> @@ -210,7 +210,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <suiteXmlFiles> - <suiteXmlFile>${project.build.directory}/dependency/jsr299-tck-impl-suite.xml</suiteXmlFile> + <suiteXmlFile>src/test/resources/tck-tests.xml</suiteXmlFile> </suiteXmlFiles> <systemProperties> <property> Modified: core/trunk/pom.xml =================================================================== --- core/trunk/pom.xml 2009-11-09 01:00:41 UTC (rev 4819) +++ core/trunk/pom.xml 2009-11-09 01:16:46 UTC (rev 4820) @@ -9,7 +9,7 @@ <parent> <groupId>org.jboss.weld</groupId> <artifactId>weld-parent</artifactId> - <version>4</version> + <version>6</version> </parent> <name>Weld Build Aggregator</name>

14 years, 11 months

1
0
0 / 0

Weld SVN: r4819 - core/trunk/impl/src/main/resources/org/jboss/weld/messages.

by weld-commits＠lists.jboss.org

Author: pete.muir(a)jboss.org Date: 2009-11-08 20:00:41 -0500 (Sun, 08 Nov 2009) New Revision: 4819 Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties Log: minor Modified: core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties =================================================================== --- core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2009-11-09 00:44:12 UTC (rev 4818) +++ core/trunk/impl/src/main/resources/org/jboss/weld/messages/bean_en.properties 2009-11-09 01:00:41 UTC (rev 4819) @@ -52,11 +52,11 @@ RETURN_TYPE_MUST_BE_CONCRETE=Return type must be concrete\: {0} NULL_NOT_ALLOWED_FROM_PRODUCER=Cannot return null from a non-dependent producer method\: {0} NON_SERIALIZABLE_PRODUCT_ERROR=Producers cannot declare passivating scope and return a non-serializable class\: {0} -NON_SERIALIZABLE_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into non-transient fields of passivating beans\\n\\nProducer\: {0}\\nInjection Point\: {1} +NON_SERIALIZABLE_FIELD_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into non-transient fields of passivating beans\\n\\nProducer\: {0}\\nInjection Point\: {1} NON_SERIALIZABLE_INITIALIZER_PARAM_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into parameters of initializers of beans declaring passivating scope.\\n\\nBean\: {0}\\nInjection Point\: {1} NON_SERIALIZABLE_PRODUCER_PARAM_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into parameters of producer methods declaring passivating scope.\\n\\nBean\: {0}\\nInjection Point\: {1} NON_SERIALIZABLE_CONSTRUCTOR_PARAM_INJECTION_ERROR=Producers cannot produce non-serializable instances for injection into parameters of constructors of beans declaring passivating scope.\\n\\nBean\: {0}\\nInjection Point\: {1} -DECORATES_ON_NON_INITIALIZER_METHOD=Method with @Delegate parameter must be an initializer method\: {0} +DELEGATE_ON_NON_INITIALIZER_METHOD=Method with @Delegate parameter must be an initializer method\: {0} NO_DELEGATE_FOR_DECORATOR=No delegate injection points defined for {0} TOO_MANY_DELEGATES_FOR_DECORATOR=Too many delegate injection points defined for {0} DELEGATE_MUST_SUPPORT_EVERY_DECORATED_TYPE=The delegate type must extend or implement every decorated type. Decorated type {0} on {1}

14 years, 11 months

1
0
0 / 0

Weld SVN: r4818 - cdi-tck/trunk/impl/src/main/resources.

by weld-commits＠lists.jboss.org

Author: shane.bryzak(a)jboss.com Date: 2009-11-08 19:44:12 -0500 (Sun, 08 Nov 2009) New Revision: 4818 Added: cdi-tck/trunk/impl/src/main/resources/readme_sigtest.txt Log: add sigtest readme Added: cdi-tck/trunk/impl/src/main/resources/readme_sigtest.txt =================================================================== --- cdi-tck/trunk/impl/src/main/resources/readme_sigtest.txt (rev 0) +++ cdi-tck/trunk/impl/src/main/resources/readme_sigtest.txt 2009-11-09 00:44:12 UTC (rev 4818) @@ -0,0 +1,22 @@ +Generating the signature file +----------------------------- + +The general command for generating a signature file looks like this: + +java -jar sigtestdev.jar Setup -classpath "%JAVA_HOME%\jre\lib\rt.jar:cdi-api.jar:javax.inject.jar:el-api.jar:jboss-interceptor-api.jar" -Package javax.decorator -Package javax.enterprise -FileName cdi-api.sig -static + +Usually all the required libraries will be located in a local Maven repository, so here's a working example with the classpaths filled out: + +java -jar "/home/shane/java/sigtest-2.1/lib/sigtestdev.jar" Setup -classpath "/usr/local/java/jre/lib/rt.jar:/home/shane/.m2/repository/javax/enterprise/cdi-api/1.0.0-SNAPSHOT/cdi-api-1.0.0-SNAPSHOT.jar:/home/shane/.m2/repository/javax/inject/javax.inject/1.0-PFD-1/javax.inject-1.0-PFD-1.jar:/home/shane/.m2/repository/javax/el/el-api/2.1.2-b04/el-api-2.1.2-b04.jar:/home/shane/.m2/repository/org/jboss/interceptor/jboss-interceptor-api/3.1.0-CR1/jboss-interceptor-api-3.1.0-CR1.jar" -Package javax.decorator -Package javax.enterprise -FileName cdi-api.sig -static + +Running the signature test +-------------------------- + +To run the signature test simply change the execution command from Setup to SignatureTest: + +java -jar sigtestdev.jar SignatureTest -classpath "%JAVA_HOME%\jre\lib\rt.jar:cdi-api.jar:javax.inject.jar:el-api.jar:jboss-interceptor-api.jar" -Package javax.decorator -Package javax.enterprise -FileName cdi-api.sig -static + +Once again, here's a working example: + +java -jar "/home/shane/java/sigtest-2.1/lib/sigtestdev.jar" SignatureTest -classpath "/usr/local/java/jre/lib/rt.jar:/home/shane/.m2/repository/javax/enterprise/cdi-api/1.0.0-SNAPSHOT/cdi-api-1.0.0-SNAPSHOT.jar:/home/shane/.m2/repository/javax/inject/javax.inject/1.0-PFD-1/javax.inject-1.0-PFD-1.jar:/home/shane/.m2/repository/javax/el/el-api/2.1.2-b04/el-api-2.1.2-b04.jar:/home/shane/.m2/repository/org/jboss/interceptor/jboss-interceptor-api/3.1.0-CR1/jboss-interceptor-api-3.1.0-CR1.jar" -Package javax.decorator -Package javax.enterprise -FileName cdi-api.sig -static +

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

weld-commits November 2009