May 2007 - ajax4jsf-svn-commits - Jboss List Archives

JBoss Ajax4JSF SVN: r214 - in trunk: a4j-portlet and 8 other directories.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-23 20:27:35 -0400 (Wed, 23 May 2007) New Revision: 214 Modified: trunk/a4j-portlet/pom.xml trunk/cdk/compiler/pom.xml trunk/cdk/generator/pom.xml trunk/cdk/maven-archetype-jsf-component/pom.xml trunk/cdk/maven-archetype-jsfwebapp/pom.xml trunk/cdk/maven-cdk-plugin/pom.xml trunk/cdk/pom.xml trunk/framework/pom.xml trunk/pom.xml trunk/test/pom.xml Log: [maven-release-plugin] prepare release 1_1_1_rc5 Modified: trunk/a4j-portlet/pom.xml =================================================================== --- trunk/a4j-portlet/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/a4j-portlet/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> @@ -55,12 +55,12 @@ <dependency> <groupId>org.ajax4jsf</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </dependency> <dependency> <groupId>org.ajax4jsf</groupId> <artifactId>test</artifactId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> <scope>test</scope> </dependency> </dependencies> Modified: trunk/cdk/compiler/pom.xml =================================================================== --- trunk/cdk/compiler/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/cdk/compiler/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/cdk/generator/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-cdk-plugin/pom.xml =================================================================== --- trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/cdk/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -3,14 +3,14 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> <artifactId>cdk</artifactId> <packaging>pom</packaging> <name>JSF Components Development kit</name> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> <dependencies /> <build> Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/framework/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -3,7 +3,7 @@ <groupId>org.ajax4jsf</groupId> <artifactId>master</artifactId> <packaging>pom</packaging> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> <name>Ajax for Java Server faces core project</name> <url>http://labs.jboss.com/jbossajax4jsf</url> <properties> @@ -126,9 +126,9 @@ </repository> </repositories> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/</developerConnection> - <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc5</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc5</developerConnection> + <url>http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc5</url> </scm>  Modified: trunk/test/pom.xml =================================================================== --- trunk/test/pom.xml 2007-05-23 23:46:35 UTC (rev 213) +++ trunk/test/pom.xml 2007-05-24 00:27:35 UTC (rev 214) @@ -2,7 +2,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> + <version>1.1.1-rc5</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId>

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r213 - in trunk/framework/src/main: java/org/ajax4jsf/renderkit/html and 1 other directories.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-23 19:46:35 -0400 (Wed, 23 May 2007) New Revision: 213 Modified: trunk/framework/src/main/config/component/push.xml trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxSupportRenderer.java trunk/framework/src/main/javascript/ajaxjsf/JSFAJAX.js Log: Fix AJSF-42 issue ( process onsubmit function before send poll request ) Modified: trunk/framework/src/main/config/component/push.xml =================================================================== --- trunk/framework/src/main/config/component/push.xml 2007-05-23 22:53:03 UTC (rev 212) +++ trunk/framework/src/main/config/component/push.xml 2007-05-23 23:46:35 UTC (rev 213) @@ -62,7 +62,8 @@ <name>actionExpression</name> <classname>java.lang.String</classname> <description>The action method binding expression.</description> - </property> + </property> +  <property> <name>interval</name> <classname>int</classname> Modified: trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-05-23 22:53:03 UTC (rev 212) +++ trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxPollRenderer.java 2007-05-23 23:46:35 UTC (rev 213) @@ -32,6 +32,7 @@ import org.ajax4jsf.framework.renderer.AjaxRendererUtils; import org.ajax4jsf.framework.renderer.RendererUtils.HTML; import org.ajax4jsf.framework.util.javascript.JSFunction; +import org.ajax4jsf.framework.util.javascript.JSFunctionDefinition; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; /** @@ -62,6 +63,13 @@ Integer interval = new Integer(poll.getInterval()); options.put("pollinterval", interval); options.put("pollId", component.getClientId(context)); + Object onsubmit = component.getAttributes().get("onsubmit"); + if (null != onsubmit) { + JSFunctionDefinition onsubmitFunction = new JSFunctionDefinition(); + onsubmitFunction.addToBody(onsubmit); + options.put("onsubmit", onsubmitFunction); + } + // options.put("timeout", interval); function.addParameter(options); function.appendScript(script); Modified: trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxSupportRenderer.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxSupportRenderer.java 2007-05-23 22:53:03 UTC (rev 212) +++ trunk/framework/src/main/java/org/ajax4jsf/renderkit/html/AjaxSupportRenderer.java 2007-05-23 23:46:35 UTC (rev 213) @@ -21,9 +21,6 @@ package org.ajax4jsf.renderkit.html; -import javax.faces.context.FacesContext; - -import org.ajax4jsf.framework.renderer.compiler.PreparedTemplate; import org.ajax4jsf.renderkit.AjaxCommandRendererBase; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -57,8 +54,4 @@ return org.ajax4jsf.ajax.UIAjaxSupport.class; } - protected PreparedTemplate getTemplate(FacesContext context) { - return null; - } - } Modified: trunk/framework/src/main/javascript/ajaxjsf/JSFAJAX.js =================================================================== --- trunk/framework/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-05-23 22:53:03 UTC (rev 212) +++ trunk/framework/src/main/javascript/ajaxjsf/JSFAJAX.js 2007-05-23 23:46:35 UTC (rev 213) @@ -401,7 +401,12 @@ }; A4J.AJAX._pollers[options.pollId] = window.setTimeout(function(){ A4J.AJAX._pollers[options.pollId]=undefined; - A4J.AJAX.SubmitRequest(containerId,form,null,options); + if((typeof(options.onsubmit) == 'function') && (!options.onsubmit())){ + // Onsubmit disable current poll, start next interval. + A4J.AJAX.Poll(containerId,form,options); + } else { + A4J.AJAX.SubmitRequest(containerId,form,null,options); + } },options.pollinterval); };

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r212 - in trunk/cdk/generator/src/main: resources/META-INF/schema/entities and 1 other directory.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-23 18:53:03 -0400 (Wed, 23 May 2007) New Revision: 212 Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent Log: Fix RF-213 bug. Merge property description for a JSF Listener generator Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-05-23 00:24:05 UTC (rev 211) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/BuilderConfig.java 2007-05-23 22:53:03 UTC (rev 212) @@ -40,509 +40,573 @@ /** * Parse builder config file for use with component creation. + * * @author asmirnov(a)exadel.com (latest modification by $Author: ishabalov $) * @version $Revision: 1.1.2.10 $ $Date: 2007/02/20 20:57:58 $ - * + * */ -public class BuilderConfig implements LoaderHolder { +public class BuilderConfig implements LoaderHolder { - - /** - * Resource path to config file schemas and entities - */ - public static final String COMPONENT_SCHEMA_BASE = "/META-INF/schema/"; - /** - * Resource path to config file schemas and entities - */ - public static final String ENTITIES_FOLDER = "entities"; - /** - * default URI to dtd in classpath - */ - private static final String COMPONENT_CONFIG_DTD_URI = COMPONENT_SCHEMA_BASE+"component-config.dtd"; - /** - * root element of configuration file - */ - private static final String GENERATOR_CONFIG_ROOT_ELEMENT = "components"; - /** - * PUBLIC Id of configuration schema - */ - private static final String GENERATOR_CONFIG_PUBLIC_ID = "-//AJAX4JSF//CDK Generator config/EN"; - /** - * components described in this configuration - */ - private List<ComponentBean> components = new ArrayList<ComponentBean>(); - - /** - * validators described in this configuration - */ - private List<ValidatorBean> validators = new ArrayList<ValidatorBean>(); - - /** - * components described in this configuration - */ - private List<ConverterBean> converters = new ArrayList<ConverterBean>(); - - /** - * renderers described in this configuration - */ - private List<RendererBean> renderers = new ArrayList<RendererBean>(); + /** + * Resource path to config file schemas and entities + */ + public static final String COMPONENT_SCHEMA_BASE = "/META-INF/schema/"; - private List<ListenerBean> listeners = new ArrayList<ListenerBean>(); + /** + * Resource path to config file schemas and entities + */ + public static final String ENTITIES_FOLDER = "entities"; - private ClassLoader _loader; - - private Logger _log; + /** + * default URI to dtd in classpath + */ + private static final String COMPONENT_CONFIG_DTD_URI = COMPONENT_SCHEMA_BASE + + "component-config.dtd"; - /** - * @param project - current ant project - */ - public BuilderConfig(ClassLoader loader, Logger log) { - _loader = loader; - _log = log; - } - - /** - * Parsing builder configuration file - * @param configFile - * @throws ParsingException - */ - public void parseConfig(final File configFile) throws ParsingException { - getLog().info(" Parse config file "+configFile.toString()); - Digester digester = new Digester(); - digester.setRules( new ExtendedBaseRules() ); - digester.setValidating(false); - digester.setNamespaceAware(false); -// try { - //URL dtd = this.getClass().getClassLoader().getResource(COMPONENT_CONFIG_DTD_URI); - //new URL("resource:/com/exadel/vcp/builder/config/component-config.dtd"); - getLog().debug("Register config DTD as URI "+COMPONENT_CONFIG_DTD_URI); - digester.register(GENERATOR_CONFIG_PUBLIC_ID, COMPONENT_CONFIG_DTD_URI); -// } catch (MalformedURLException e) { -// throw new ParsingException("Malformed URL for internal DTD reference",e); -// } + /** + * root element of configuration file + */ + private static final String GENERATOR_CONFIG_ROOT_ELEMENT = "components"; - // setup custom entity resolver for handle file-resource path's - // resolve DTD even it not pointed in file, and, for entities - resolve it in - // classpath if entity registered in DTD witn path /META-INF/schema - digester.setEntityResolver(new EntityResolver2() { + /** + * PUBLIC Id of configuration schema + */ + private static final String GENERATOR_CONFIG_PUBLIC_ID = "-//AJAX4JSF//CDK Generator config/EN"; - /* (non-Javadoc) - * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String) - */ - public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - getLog().debug("Request for entity with systemId "+systemId+" and publicId "+publicId); - if (GENERATOR_CONFIG_PUBLIC_ID.equals(publicId)) { - return getDTDSource(); - } else if(null != publicId && null != systemId && systemId.contains(ENTITIES_FOLDER)){ - int base = systemId.indexOf(ENTITIES_FOLDER); - String entity = COMPONENT_SCHEMA_BASE+systemId.substring(base); - getLog().debug("attempt to load entity from classpath "+entity); - InputStream entityStream = BuilderConfig.class - .getResourceAsStream(entity); - if (null != entityStream) { - return new InputSource(entityStream); - } - } - return null; - } + /** + * components described in this configuration + */ + private List<ComponentBean> components = new ArrayList<ComponentBean>(); - public InputSource getExternalSubset(String name, String baseURI) throws SAXException, IOException { - getLog().debug("Request for ExternalSubset with name "+name+" and baseURI "+baseURI); - if (GENERATOR_CONFIG_ROOT_ELEMENT.equals(name)) { - return getDTDSource(); - } - return null; - } + /** + * validators described in this configuration + */ + private List<ValidatorBean> validators = new ArrayList<ValidatorBean>(); - public InputSource resolveEntity(String name, String publicId, String baseURI, String systemId) throws SAXException, IOException { - getLog().debug("Request for extended entity with systemId "+systemId+" and publicId "+publicId); - getLog().debug("additional parameters with name "+name+" and baseURI "+baseURI); - if ("[dtd]".equals(name) && GENERATOR_CONFIG_PUBLIC_ID.equals(publicId)) { - return getDTDSource(); - } - else if (null==name || (!name.startsWith("[") && !name.startsWith("&"))) { - return resolveEntity(publicId,systemId); - } - return null; - } - - /** - * Resolve config DTD from classpath - * @return source of config file DTD - */ - private InputSource getDTDSource() { - return new InputSource(BuilderConfig.class.getResourceAsStream(COMPONENT_CONFIG_DTD_URI)); - } - - }); - - // Parsing rules. - - // Components - String path = "components/component"; - digester.addObjectCreate(path, ComponentBean.class); - digester.addBeanPropertySetter(path+"/name"); - digester.addBeanPropertySetter(path+"/family"); - digester.addBeanPropertySetter(path+"/classname"); - digester.addBeanPropertySetter(path+"/superclass"); - digester.addBeanPropertySetter(path+"/description"); - digester.addBeanPropertySetter(path+"/displayname"); - digester.addBeanPropertySetter(path+"/icon"); - // TODO - for superclass, populate from description in config file, if exist - digester.addSetProperties(path); - digester.addSetNext(path, "addComponent"); - path = "components/renderer"; - digester.addObjectCreate(path, RendererBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addRenderer"); - path = "components/component/renderer"; - digester.addObjectCreate(path, RendererBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setRenderer"); - - path = "components/component/facet"; - digester.addObjectCreate(path, JsfBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addFacet"); - path = "components/component/event"; - digester.addObjectCreate(path, EventBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addEvent"); - - // Validators - - path = "components/validator"; - digester.addObjectCreate(path, ValidatorBean.class); - digester.addBeanPropertySetter(path+"/id"); - digester.addBeanPropertySetter(path+"/classname"); - digester.addBeanPropertySetter(path+"/superclass"); - digester.addBeanPropertySetter(path+"/description"); - digester.addBeanPropertySetter(path+"/displayname"); - digester.addBeanPropertySetter(path+"/icon"); - // TODO - for superclass, populate from description in config file, if exist - digester.addSetProperties(path); - digester.addSetNext(path, "addValidator"); - - path = "components/validator/property"; - digester.addObjectCreate(path, PropertyBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addProperty"); - - - - // Converters - - path = "components/converter"; - digester.addObjectCreate(path, ConverterBean.class); - digester.addBeanPropertySetter(path+"/id"); - digester.addBeanPropertySetter(path+"/classname"); - digester.addBeanPropertySetter(path+"/superclass"); - digester.addBeanPropertySetter(path+"/description"); - digester.addBeanPropertySetter(path+"/displayname"); - digester.addBeanPropertySetter(path+"/icon"); - digester.addBeanPropertySetter(path+"/forclass"); - // TODO - for superclass, populate from description in config file, if exist - digester.addSetProperties(path); - digester.addSetNext(path, "addConverter"); - - // - Tags & Tag handlers - - path = "components/component/tag"; - digester.addObjectCreate(path, TagBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTag"); - - path = "components/validator/tag"; - digester.addObjectCreate(path, TagBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTag"); - - path = "components/converter/tag"; - digester.addObjectCreate(path, TagBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTag"); + /** + * components described in this configuration + */ + private List<ConverterBean> converters = new ArrayList<ConverterBean>(); - path = "components/component/tag/test"; - digester.addObjectCreate(path, TestClassHolder.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTest"); + /** + * renderers described in this configuration + */ + private List<RendererBean> renderers = new ArrayList<RendererBean>(); - path = "components/component/test"; - digester.addObjectCreate(path, TestClassHolder.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTest"); - - path = "components/component/taghandler"; - digester.addObjectCreate(path, TagHandlerBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTaghandler"); -/* - path = "components/component/taghandler/test"; - digester.addObjectCreate(path, TestClassHolder.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTest"); -*/ + private List<ListenerBean> listeners = new ArrayList<ListenerBean>(); - // Properties - - path = "components/component/property"; - digester.addObjectCreate(path, PropertyBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addProperty"); - -// path = "components/validator/property"; -// digester.addObjectCreate(path, PropertyBean.class); -// digester.addBeanPropertySetter(path+"/?"); -// digester.addSetProperties(path); -// digester.addSetNext(path, "addProperty"); - - path = "components/converter/property"; - digester.addObjectCreate(path, PropertyBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addProperty"); - - path = "*/properties/property"; - digester.addObjectCreate(path, PropertyBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addProperty"); - - // Listeners + private ClassLoader _loader; - path = "components/listener"; - digester.addObjectCreate(path, ListenerBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addListener"); - path = "components/listener/tag"; - digester.addObjectCreate(path, TagBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTag"); - path = "components/listener/taghandler"; - digester.addObjectCreate(path, TagHandlerBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "setTaghandler"); - path = "components/listener/property"; - digester.addObjectCreate(path, PropertyBean.class); - digester.addBeanPropertySetter(path+"/?"); - digester.addSetProperties(path); - digester.addSetNext(path, "addProperty"); - + private Logger _log; + /** + * @param project - + * current ant project + */ + public BuilderConfig(ClassLoader loader, Logger log) { + _loader = loader; + _log = log; + } - + /** + * Parsing builder configuration file + * + * @param configFile + * @throws ParsingException + */ + public void parseConfig(final File configFile) throws ParsingException { + getLog().info(" Parse config file " + configFile.toString()); + Digester digester = new Digester(); + digester.setRules(new ExtendedBaseRules()); + digester.setValidating(false); + digester.setNamespaceAware(false); + // try { + // URL dtd = + // this.getClass().getClassLoader().getResource(COMPONENT_CONFIG_DTD_URI); + // new + // URL("resource:/com/exadel/vcp/builder/config/component-config.dtd"); + getLog() + .debug("Register config DTD as URI " + COMPONENT_CONFIG_DTD_URI); + digester.register(GENERATOR_CONFIG_PUBLIC_ID, COMPONENT_CONFIG_DTD_URI); + // } catch (MalformedURLException e) { + // throw new ParsingException("Malformed URL for internal DTD + // reference",e); + // } - // Set this config as root. - digester.push(this); - try { - digester.parse(configFile.toString()); - } catch (IOException e) { - // TODO Auto-generated catch block - throw new ParsingException("I/O error on parsing config file ",e); - } catch (SAXException e) { - // TODO Auto-generated catch block - throw new ParsingException("SAX Parsing error in config file ",e); + // setup custom entity resolver for handle file-resource path's + // resolve DTD even it not pointed in file, and, for entities - resolve + // it in + // classpath if entity registered in DTD witn path /META-INF/schema + digester.setEntityResolver(new EntityResolver2() { + + /* + * (non-Javadoc) + * + * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, + * java.lang.String) + */ + public InputSource resolveEntity(String publicId, String systemId) + throws SAXException, IOException { + getLog().debug( + "Request for entity with systemId " + systemId + + " and publicId " + publicId); + if (GENERATOR_CONFIG_PUBLIC_ID.equals(publicId)) { + return getDTDSource(); + } else if (null != publicId && null != systemId + && systemId.contains(ENTITIES_FOLDER)) { + int base = systemId.indexOf(ENTITIES_FOLDER); + String entity = COMPONENT_SCHEMA_BASE + + systemId.substring(base); + getLog().debug( + "attempt to load entity from classpath " + entity); + InputStream entityStream = BuilderConfig.class + .getResourceAsStream(entity); + if (null != entityStream) { + return new InputSource(entityStream); + } } -// checkComopnentProperties(); -// return this; - } - - /** - * Check all components for existing and default properties. - * @param classpath - classpath to find user components, renderers, tags - * @throws ConfigurationException - */ - public void checkComopnentProperties() throws ParsingException { -// ClassLoader loader = getProject().createClassLoader(classpath); -// if(null == loader) { -// loader = this.getClass().getClassLoader(); -// } -// setLoader(loader); + return null; + } - for (ListenerBean listener : getListeners()) { - try { - Class<?> listenerClass = Class.forName(listener.getComponentclass(), false, getLoader()); - for (ComponentBean bean : getComponents()) { - if (bean.getSuperclass() != null) { - Class<?> componentSClass = Class.forName(bean.getSuperclass(), false, getLoader()); - - if (listenerClass.isAssignableFrom(componentSClass)) { - - PropertyBean listenerProperty = new PropertyBean(); - listenerProperty.setClassname("javax.faces.el.MethodBinding"); - listenerProperty.setEl(true); - listenerProperty.setElonly(true); - listenerProperty.setName(listener.getName()); - listenerProperty.setAttachedstate(true); - listenerProperty.setMethodargs(listener.getEventclass() + ".class"); - - bean.addProperty(listenerProperty); - - listener.addSuitableComponent(bean); - } - } - } - } catch (ClassNotFoundException e) { - throw new BuildException(e); - } + public InputSource getExternalSubset(String name, String baseURI) + throws SAXException, IOException { + getLog().debug( + "Request for ExternalSubset with name " + name + + " and baseURI " + baseURI); + if (GENERATOR_CONFIG_ROOT_ELEMENT.equals(name)) { + return getDTDSource(); } - - for (Iterator iter = this.getComponents().iterator(); iter.hasNext();) { - ComponentBaseBean component = (ComponentBaseBean) iter.next(); - component.checkProperties(); + return null; + } + + public InputSource resolveEntity(String name, String publicId, + String baseURI, String systemId) throws SAXException, + IOException { + getLog().debug( + "Request for extended entity with systemId " + systemId + + " and publicId " + publicId); + getLog().debug( + "additional parameters with name " + name + + " and baseURI " + baseURI); + if ("[dtd]".equals(name) + && GENERATOR_CONFIG_PUBLIC_ID.equals(publicId)) { + return getDTDSource(); + } else if (null == name + || (!name.startsWith("[") && !name.startsWith("&"))) { + return resolveEntity(publicId, systemId); } - - for (Iterator iter = this.getValidators().iterator(); iter.hasNext();) { - ComponentBaseBean component = (ComponentBaseBean) iter.next(); - component.checkProperties(); - } - - for (Iterator iter = this.getConverters().iterator(); iter.hasNext();) { - ComponentBaseBean component = (ComponentBaseBean) iter.next(); - component.checkProperties(); - } - - } + return null; + } - /* (non-Javadoc) - * @see com.exadel.vcp.builder.config.LoaderHolder#getLoader() - */ - public ClassLoader getLoader() { - return _loader; - } + /** + * Resolve config DTD from classpath + * + * @return source of config file DTD + */ + private InputSource getDTDSource() { + return new InputSource(BuilderConfig.class + .getResourceAsStream(COMPONENT_CONFIG_DTD_URI)); + } - /* (non-Javadoc) - * @see com.exadel.vcp.builder.config.LoaderHolder#setLoader(java.lang.ClassLoader) - */ - public void setLoader(ClassLoader loader) { - _loader = loader; - } + }); - public Logger getLog() { - return _log; - } + // Parsing rules. - public void addComponent(ComponentBean component) { - this.components.add(component); - component.setParent(this); - } - - public void addValidator(ValidatorBean validator) { - this.validators.add(validator); - validator.setParent(this); - } - - public void addConverter(ConverterBean converter) { - this.converters.add(converter); - converter.setParent(this); - } - - public void addRenderer(RendererBean renderer) { - this.renderers.add(renderer); - renderer.setParent(this); - } + // Components + String path = "components/component"; + digester.addObjectCreate(path, ComponentBean.class); + digester.addBeanPropertySetter(path + "/name"); + digester.addBeanPropertySetter(path + "/family"); + digester.addBeanPropertySetter(path + "/classname"); + digester.addBeanPropertySetter(path + "/superclass"); + digester.addBeanPropertySetter(path + "/description"); + digester.addBeanPropertySetter(path + "/displayname"); + digester.addBeanPropertySetter(path + "/icon"); + // TODO - for superclass, populate from description in config file, if + // exist + digester.addSetProperties(path); + digester.addSetNext(path, "addComponent"); + path = "components/renderer"; + digester.addObjectCreate(path, RendererBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addRenderer"); + path = "components/component/renderer"; + digester.addObjectCreate(path, RendererBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setRenderer"); - public void addListener(ListenerBean listener) { - this.listeners.add(listener); - listener.setParent(this); - } + path = "components/component/facet"; + digester.addObjectCreate(path, JsfBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addFacet"); + path = "components/component/event"; + digester.addObjectCreate(path, EventBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addEvent"); - /* (non-Javadoc) - * @see java.util.List#clear() - */ - public void clear() { - components.clear(); - renderers.clear(); - } + // Validators - /* (non-Javadoc) - * @see java.util.List#contains(java.lang.Object) - */ - public boolean contains(Object o) { - return components.contains(o); - } + path = "components/validator"; + digester.addObjectCreate(path, ValidatorBean.class); + digester.addBeanPropertySetter(path + "/id"); + digester.addBeanPropertySetter(path + "/classname"); + digester.addBeanPropertySetter(path + "/superclass"); + digester.addBeanPropertySetter(path + "/description"); + digester.addBeanPropertySetter(path + "/displayname"); + digester.addBeanPropertySetter(path + "/icon"); + // TODO - for superclass, populate from description in config file, if + // exist + digester.addSetProperties(path); + digester.addSetNext(path, "addValidator"); - /* (non-Javadoc) - * @see java.util.List#get(int) - */ - public ComponentBaseBean get(int index) { - return components.get(index); - } + path = "components/validator/property"; + digester.addObjectCreate(path, PropertyBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addProperty"); - /* (non-Javadoc) - * @see java.util.List#indexOf(java.lang.Object) - */ - public int indexOf(ComponentBaseBean o) { - return components.indexOf(o); - } + // Converters - /* (non-Javadoc) - * @see java.util.List#isEmpty() - */ - public boolean isEmpty() { - return components.isEmpty(); - } + path = "components/converter"; + digester.addObjectCreate(path, ConverterBean.class); + digester.addBeanPropertySetter(path + "/id"); + digester.addBeanPropertySetter(path + "/classname"); + digester.addBeanPropertySetter(path + "/superclass"); + digester.addBeanPropertySetter(path + "/description"); + digester.addBeanPropertySetter(path + "/displayname"); + digester.addBeanPropertySetter(path + "/icon"); + digester.addBeanPropertySetter(path + "/forclass"); + // TODO - for superclass, populate from description in config file, if + // exist + digester.addSetProperties(path); + digester.addSetNext(path, "addConverter"); - /* (non-Javadoc) - * @see java.util.List#listIterator() - */ - public List<ComponentBean> getComponents() { - return components; + // - Tags & Tag handlers + + path = "components/component/tag"; + digester.addObjectCreate(path, TagBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTag"); + + path = "components/validator/tag"; + digester.addObjectCreate(path, TagBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTag"); + + path = "components/converter/tag"; + digester.addObjectCreate(path, TagBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTag"); + + path = "components/component/tag/test"; + digester.addObjectCreate(path, TestClassHolder.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTest"); + + path = "components/component/test"; + digester.addObjectCreate(path, TestClassHolder.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTest"); + + path = "components/component/taghandler"; + digester.addObjectCreate(path, TagHandlerBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTaghandler"); + /* + * path = "components/component/taghandler/test"; + * digester.addObjectCreate(path, TestClassHolder.class); + * digester.addBeanPropertySetter(path+"/?"); + * digester.addSetProperties(path); digester.addSetNext(path, + * "setTest"); + */ + + // Properties + path = "components/component/property"; + digester.addObjectCreate(path, PropertyBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addProperty"); + + // path = "components/validator/property"; + // digester.addObjectCreate(path, PropertyBean.class); + // digester.addBeanPropertySetter(path+"/?"); + // digester.addSetProperties(path); + // digester.addSetNext(path, "addProperty"); + + path = "components/converter/property"; + digester.addObjectCreate(path, PropertyBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addProperty"); + + path = "*/properties/property"; + digester.addObjectCreate(path, PropertyBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addProperty"); + + // Listeners + + path = "components/listener"; + digester.addObjectCreate(path, ListenerBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addListener"); + path = "components/listener/tag"; + digester.addObjectCreate(path, TagBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTag"); + path = "components/listener/taghandler"; + digester.addObjectCreate(path, TagHandlerBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "setTaghandler"); + path = "components/listener/property"; + digester.addObjectCreate(path, PropertyBean.class); + digester.addBeanPropertySetter(path + "/?"); + digester.addSetProperties(path); + digester.addSetNext(path, "addProperty"); + + // Set this config as root. + digester.push(this); + try { + digester.parse(configFile.toString()); + } catch (IOException e) { + // TODO Auto-generated catch block + throw new ParsingException("I/O error on parsing config file ", e); + } catch (SAXException e) { + // TODO Auto-generated catch block + throw new ParsingException("SAX Parsing error in config file ", e); } - - public List<ConverterBean> getConverters() { - return converters; - } - - public List<ValidatorBean> getValidators() { - return validators; - } + // checkComopnentProperties(); + // return this; + } - public List<ListenerBean> getListeners() { - return listeners; + /** + * Check all components for existing and default properties. + * + * @param classpath - + * classpath to find user components, renderers, tags + * @throws ConfigurationException + */ + public void checkComopnentProperties() throws ParsingException { + // ClassLoader loader = getProject().createClassLoader(classpath); + // if(null == loader) { + // loader = this.getClass().getClassLoader(); + // } + // setLoader(loader); + + for (ListenerBean listener : getListeners()) { + try { + Class<?> listenerClass = Class.forName(listener + .getComponentclass(), false, getLoader()); + for (ComponentBean bean : getComponents()) { + if (bean.getSuperclass() != null) { + Class<?> componentSClass = Class.forName(bean + .getSuperclass(), false, getLoader()); + + if (listenerClass.isAssignableFrom(componentSClass)) { + + PropertyBean listenerProperty = bean + .getProperty(listener.getName()); + if (null == listenerProperty) { + listenerProperty = new PropertyBean(); + listenerProperty.setName(listener.getName()); + bean.addProperty(listenerProperty); + + } + // TODO - check existing property for compability with this listener. + listenerProperty + .setClassname("javax.faces.el.MethodBinding"); + listenerProperty.setEl(true); + listenerProperty.setElonly(true); + listenerProperty.setAttachedstate(true); + listenerProperty.setMethodargs(listener + .getEventclass() + + ".class"); + + listener.addSuitableComponent(bean); + } + } + } + } catch (ClassNotFoundException e) { + throw new BuildException(e); + } } - /** - * @return the renderers - */ - public List<RendererBean> getRenderers() { - return this.renderers; + for (Iterator iter = this.getComponents().iterator(); iter.hasNext();) { + ComponentBaseBean component = (ComponentBaseBean) iter.next(); + component.checkProperties(); } - /* (non-Javadoc) - * @see java.util.List#remove(int) - */ - public ComponentBaseBean remove(int index) { - return components.remove(index); + for (Iterator iter = this.getValidators().iterator(); iter.hasNext();) { + ComponentBaseBean component = (ComponentBaseBean) iter.next(); + component.checkProperties(); } - /* (non-Javadoc) - * @see java.util.List#remove(java.lang.Object) - */ - public boolean remove(ComponentBaseBean o) { - return components.remove(o); + for (Iterator iter = this.getConverters().iterator(); iter.hasNext();) { + ComponentBaseBean component = (ComponentBaseBean) iter.next(); + component.checkProperties(); } - /* (non-Javadoc) - * @see java.util.List#size() - */ - public int size() { - return components.size(); - } + } + + /* + * (non-Javadoc) + * + * @see com.exadel.vcp.builder.config.LoaderHolder#getLoader() + */ + public ClassLoader getLoader() { + return _loader; + } + + /* + * (non-Javadoc) + * + * @see com.exadel.vcp.builder.config.LoaderHolder#setLoader(java.lang.ClassLoader) + */ + public void setLoader(ClassLoader loader) { + _loader = loader; + } + + public Logger getLog() { + return _log; + } + + public void addComponent(ComponentBean component) { + this.components.add(component); + component.setParent(this); + } + + public void addValidator(ValidatorBean validator) { + this.validators.add(validator); + validator.setParent(this); + } + + public void addConverter(ConverterBean converter) { + this.converters.add(converter); + converter.setParent(this); + } + + public void addRenderer(RendererBean renderer) { + this.renderers.add(renderer); + renderer.setParent(this); + } + + public void addListener(ListenerBean listener) { + this.listeners.add(listener); + listener.setParent(this); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#clear() + */ + public void clear() { + components.clear(); + renderers.clear(); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#contains(java.lang.Object) + */ + public boolean contains(Object o) { + return components.contains(o); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#get(int) + */ + public ComponentBaseBean get(int index) { + return components.get(index); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#indexOf(java.lang.Object) + */ + public int indexOf(ComponentBaseBean o) { + return components.indexOf(o); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#isEmpty() + */ + public boolean isEmpty() { + return components.isEmpty(); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#listIterator() + */ + public List<ComponentBean> getComponents() { + return components; + } + + public List<ConverterBean> getConverters() { + return converters; + } + + public List<ValidatorBean> getValidators() { + return validators; + } + + public List<ListenerBean> getListeners() { + return listeners; + } + + /** + * @return the renderers + */ + public List<RendererBean> getRenderers() { + return this.renderers; + } + + /* + * (non-Javadoc) + * + * @see java.util.List#remove(int) + */ + public ComponentBaseBean remove(int index) { + return components.remove(index); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#remove(java.lang.Object) + */ + public boolean remove(ComponentBaseBean o) { + return components.remove(o); + } + + /* + * (non-Javadoc) + * + * @see java.util.List#size() + */ + public int size() { + return components.size(); + } } Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java 2007-05-23 00:24:05 UTC (rev 211) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/config/ComponentBaseBean.java 2007-05-23 22:53:03 UTC (rev 212) @@ -110,6 +110,10 @@ public boolean containProperty(String name) { return properties.containsKey(name); } + + public PropertyBean getProperty(String name){ + return properties.get(name); + } /** * Append property to component. If property with name exist, replace it Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-05-23 00:24:05 UTC (rev 211) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/draggable_attributes.ent 2007-05-23 22:53:03 UTC (rev 212) @@ -24,5 +24,13 @@ <classname>java.lang.String</classname> <description>A JavaScript event handler called after a drag operation. </description> </property> + <property elonly="true" attachedstate="true"> + <name>dragListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <description> + MethodBinding representing an listener method that will be notified afrer drag operation. + </description> + <methodargs>org.ajax4jsf.dnd.event.DragEvent.class</methodargs> + </property> </properties> Modified: trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent =================================================================== --- trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-05-23 00:24:05 UTC (rev 211) +++ trunk/cdk/generator/src/main/resources/META-INF/schema/entities/dropzone_attributes.ent 2007-05-23 22:53:03 UTC (rev 212) @@ -36,4 +36,13 @@ <classname>java.lang.String</classname> <description>A Javascript handler for event fired on a drop even the drop for a given type is not available</description> </property> + <property> + <name>dropListener</name> + <classname>javax.faces.el.MethodBinding</classname> + <description><![CDATA[ + MethodBinding representing an action listener method that will be notified afrer drop operation. + ]]> + </description> + <methodargs>org.ajax4jsf.dnd.event.DropEvent.class</methodargs> + </property> </properties>

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r211 - in trunk: cdk/generator/src/main/java/org/ajax4jsf/builder/generator and 1 other directory.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-22 20:24:05 -0400 (Tue, 22 May 2007) New Revision: 211 Added: trunk/release.properties Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java Log: Work in progress for a http://jira.jboss.com/jira/browse/RF-186 . Fix AJSF-66 ( double // on resources URL ). Modified: trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java =================================================================== --- trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java 2007-05-23 00:24:00 UTC (rev 210) +++ trunk/cdk/generator/src/main/java/org/ajax4jsf/builder/generator/ResourcesConfigGenerator.java 2007-05-23 00:24:05 UTC (rev 211) @@ -180,6 +180,10 @@ ResourcesConfigGeneratorBean configBean) { String resolvedPath = resolveResourcePath(name, packageName); + // remove leading / from resource name. + if(name.startsWith("/")){ + name = name.substring(1); + } if (resolvedPath != null) { configBean.addPathResource(name, resolvedPath); } else { Added: trunk/release.properties =================================================================== --- trunk/release.properties (rev 0) +++ trunk/release.properties 2007-05-23 00:24:05 UTC (rev 211) @@ -0,0 +1,9 @@ +#release configuration +#Wed May 16 16:30:33 PDT 2007 +preparationGoals=clean integration-test +scm.commentPrefix=[maven-release-plugin] +scm.username=alexsmirnov +scm.password=2314do1a +exec.additionalArguments=-P jboss +completedPhase=check-poms +scm.url=scm\:svn\:https\://svn.jboss.org/repos/ajax4jsf/trunk/

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r210 - in trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet: application and 1 other directory.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-22 20:24:00 -0400 (Tue, 22 May 2007) New Revision: 210 Added: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletWindowStates.java Removed: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStates.java Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java Log: Work in progress for a http://jira.jboss.com/jira/browse/RF-186 . Fix AJSF-66 ( double // on resources URL ). Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java 2007-05-22 19:28:25 UTC (rev 209) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/AjaxFacesPortlet.java 2007-05-23 00:24:00 UTC (rev 210) @@ -22,6 +22,7 @@ import javax.portlet.GenericPortlet; import javax.portlet.PortletConfig; import javax.portlet.PortletException; +import javax.portlet.PortletMode; import javax.portlet.PortletRequest; import javax.portlet.PortletResponse; import javax.portlet.PortletSession; @@ -41,8 +42,10 @@ private static final Log log = LogFactory.getLog(AjaxFacesPortlet.class); /** - * Stored portlet config. - */ + * <p>The key used to store/retrive the PortletConfig object.</p> + */ + public static final String PORTLET_CONFIG = "javax.portlet.PortletConfig"; + private Lifecycle lifecycle; private FacesContextFactory facesContextFactory; @@ -82,6 +85,7 @@ log.debug("Done portlet initialisation for " + config.getPortletName()); } + getPortletContext().setAttribute(PORTLET_CONFIG, config); } /* @@ -304,7 +308,7 @@ * @param facesContext * @return */ - public static String getPortletID(FacesContext facesContext) { + public static String getPortletNamespace(FacesContext facesContext) { ExternalContext externalContext = facesContext.getExternalContext(); Object response = externalContext.getResponse(); String namespace = null; @@ -317,4 +321,25 @@ } return namespace; } + + /** + * @param facesContext + * @return + */ + public static PortletMode getPortletMode(FacesContext facesContext) { + ExternalContext externalContext = facesContext.getExternalContext(); + Object request = externalContext.getRequest(); + PortletMode mode = null; + if (request instanceof PortletRequest) { + mode = ((PortletRequest) request).getPortletMode(); + } else if (null != externalContext.getRequestParameterMap().get( + AbstractExternalContext.PORTLET_MODE_PARAMETER)) { + String modeName = (String) externalContext.getRequestParameterMap().get( + AbstractExternalContext.PORTLET_MODE_PARAMETER); + if(null != modeName){ + mode = new PortletMode(modeName); + } + } + return mode; + } } Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java 2007-05-22 19:28:25 UTC (rev 209) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/PortletAjaxContext.java 2007-05-23 00:24:00 UTC (rev 210) @@ -76,7 +76,7 @@ public Map getCommonAjaxParameters() { Map map = super.getCommonAjaxParameters(); FacesContext facesContext = FacesContext.getCurrentInstance(); - String namespace = AjaxFacesPortlet.getPortletID(facesContext); + String namespace = AjaxFacesPortlet.getPortletNamespace(facesContext); if (null != namespace) { map.put(AbstractExternalContext.NAMESPACE_PARAMETER, namespace); } Copied: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java (from rev 208, trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStates.java) =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java (rev 0) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStateHolder.java 2007-05-23 00:24:00 UTC (rev 210) @@ -0,0 +1,145 @@ +/** + * + */ +package org.ajax4jsf.portlet.application; + +import java.io.Serializable; +import java.util.HashMap; +import java.util.Map; + +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.portlet.PortletMode; +import javax.portlet.PortletRequest; + +import org.apache.commons.collections.map.LRUMap; + +/** + * @author asmirnov + * + */ +public class PortletStateHolder implements Serializable { + private static final String STATE_HOLDER = PortletStateHolder.class + .getName(); + + private static final String[] modes = { PortletMode.VIEW.toString(), + PortletMode.EDIT.toString(), PortletMode.HELP.toString() }; + + private PortletMode lastMode = PortletMode.VIEW; + + /** + * View states for a different portlet modes, Views and serial numbers. + */ + private Map states = new LRUMap(); + + + /** + * Private constructor - instance must be stored in the session, and + * created on nessesary by factory method. + * + * @param context + */ + private PortletStateHolder(FacesContext context) { + ExternalContext externalContext = context.getExternalContext(); + Object request = externalContext.getRequest(); + if (request instanceof PortletRequest) { + PortletRequest portletRequest = (PortletRequest) request; + lastMode = portletRequest.getPortletMode(); + } + } + + /** + * Get instance of portlet states, stored in the session. If no + * previsious instance in session, create default value. + * + * @param context + * @return + */ + public static PortletStateHolder getInstance(FacesContext context) { + ExternalContext externalContext = context.getExternalContext(); + Object session = externalContext.getSession(true); + Map sessionMap = externalContext.getSessionMap(); + PortletStateHolder instance = null; + synchronized (session) { + instance = (PortletStateHolder) sessionMap.get(STATE_HOLDER); + if (null == instance) { + // Create and store in session new state holder. + instance = new PortletStateHolder(context); + + sessionMap.put(STATE_HOLDER, instance); + } + } + return instance; + } + + public String getViewId(FacesContext context) { + String viewId = null; + // First - check for a existing viewId. + if(null != context.getViewRoot()){ + viewId = context.getViewRoot().getViewId(); + } + if(null == viewId){ + + } + return viewId; + } + + public PortletWindowStates getWindowStates() { + return null; + } + /** + * @author asmirnov + * + */ + private static class StateKey implements Serializable { + private PortletMode mode; + + private String namespace; + + + /** + * @param mode + * @param namespace + */ + public StateKey(PortletMode mode, String namespace) { + this.mode = mode; + this.namespace = namespace; + } + + /* (non-Javadoc) + * @see java.lang.Object#hashCode() + */ + public int hashCode() { + final int PRIME = 31; + int result = 1; + result = PRIME * result + ((mode == null) ? 0 : mode.hashCode()); + result = PRIME * result + ((namespace == null) ? 0 : namespace.hashCode()); + return result; + } + + /* (non-Javadoc) + * @see java.lang.Object#equals(java.lang.Object) + */ + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + final StateKey other = (StateKey) obj; + if (mode == null) { + if (other.mode != null) + return false; + } else if (!mode.equals(other.mode)) + return false; + if (namespace == null) { + if (other.namespace != null) + return false; + } else if (!namespace.equals(other.namespace)) + return false; + return true; + } + + } +} Deleted: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStates.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStates.java 2007-05-22 19:28:25 UTC (rev 209) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletStates.java 2007-05-23 00:24:00 UTC (rev 210) @@ -1,18 +0,0 @@ -/** - * - */ -package org.ajax4jsf.portlet.application; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; -import javax.portlet.PortletMode; - -/** - * @author asmirnov - * - */ -public class PortletStates implements Serializable { - private String lastMode; - private Map states = new HashMap(); -} Modified: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java 2007-05-22 19:28:25 UTC (rev 209) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletViewState.java 2007-05-23 00:24:00 UTC (rev 210) @@ -3,6 +3,7 @@ */ package org.ajax4jsf.portlet.application; +import java.io.Serializable; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; @@ -17,7 +18,7 @@ * @author asmirnov * */ -public class PortletViewState { +public class PortletViewState implements Serializable { public static final String SAVED_VIEW_ATTRIBUTE = PortletViewState.class.getName(); Added: trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletWindowStates.java =================================================================== --- trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletWindowStates.java (rev 0) +++ trunk/a4j-portlet/src/main/java/org/ajax4jsf/portlet/application/PortletWindowStates.java 2007-05-23 00:24:00 UTC (rev 210) @@ -0,0 +1,46 @@ +/** + * + */ +package org.ajax4jsf.portlet.application; + +import java.io.Serializable; +import java.util.Map; + +import org.apache.commons.collections.map.LRUMap; + +/** + * @author asmirnov + * + */ +public class PortletWindowStates implements Serializable { + + private String viewId; + + private Map viewStates; + + public PortletWindowStates() { + viewStates = new LRUMap(); + } + + /** + * @return the viewId + */ + public String getViewId() { + return viewId; + } + + /** + * @param viewId the viewId to set + */ + public void setViewId(String viewId) { + this.viewId = viewId; + } + + public PortletViewState getState() { + PortletViewState state = (PortletViewState) viewStates.get(viewId); + if(null == state){ + state = new PortletViewState(); + } + return state; + } +}

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r209 - trunk/a4j-portlet.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-05-22 15:28:25 -0400 (Tue, 22 May 2007) New Revision: 209 Modified: trunk/a4j-portlet/ Log: Eclipse service files svn:ignore'd Property changes on: trunk/a4j-portlet ___________________________________________________________________ Name: svn:ignore - target + target .project .classpath .settings

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r208 - in trunk/framework/src/main/java/org/ajax4jsf/framework: util/style and 1 other directory.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: nbelaevski Date: 2007-05-21 16:57:41 -0400 (Mon, 21 May 2007) New Revision: 208 Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java trunk/framework/src/main/java/org/ajax4jsf/framework/util/style/CSSFormat.java Log: Escapement in url() implemented Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-05-19 00:39:22 UTC (rev 207) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/renderer/compiler/ClassElement.java 2007-05-21 20:57:41 UTC (rev 208) @@ -27,6 +27,7 @@ import javax.faces.FacesException; import org.ajax4jsf.framework.util.message.Messages; +import org.ajax4jsf.framework.util.style.CSSFormat; import org.xml.sax.SAXException; /** @@ -38,8 +39,6 @@ private String _name; - private static final String[] url = { "url(", ")" }; - /* * (non-Javadoc) * @@ -97,12 +96,10 @@ string.append(" "); boolean isUrl = element instanceof ResourceElement; if (isUrl) { - string.append(url[0]); + string.append(CSSFormat.url(str)); + } else { + string.append(str); } - string.append(str); - if (isUrl) { - string.append(url[1]); - } } } } Modified: trunk/framework/src/main/java/org/ajax4jsf/framework/util/style/CSSFormat.java =================================================================== --- trunk/framework/src/main/java/org/ajax4jsf/framework/util/style/CSSFormat.java 2007-05-19 00:39:22 UTC (rev 207) +++ trunk/framework/src/main/java/org/ajax4jsf/framework/util/style/CSSFormat.java 2007-05-21 20:57:41 UTC (rev 208) @@ -49,7 +49,8 @@ */ public static String url(String url){ StringBuffer buf = new StringBuffer(url.length() + 7); - buf.append("url(").append(url).append(")"); + //escape url according to http://www.w3.org/TR/REC-CSS1#url + buf.append("url(").append(url.replaceAll("([\\)\\(\\s,\'\"])", "\\\\$1")).append(")"); return buf.toString(); } /**

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r207 - in branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework: skin and 1 other directory.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-18 20:39:22 -0400 (Fri, 18 May 2007) New Revision: 207 Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/skin/VersionBean.java Log: Fix BUG https://jira.exadel.com/browse/PS-46 , mark version as 1.0.8 Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java 2007-05-16 23:55:16 UTC (rev 206) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/resource/ResourceBuilderImpl.java 2007-05-19 00:39:22 UTC (rev 207) @@ -542,6 +542,7 @@ int totalOut = compressor.deflate(compressed); byte[] zipsrc = new byte[totalOut]; System.arraycopy(compressed, 0, zipsrc, 0, totalOut); + compressor.end(); return codec.encode(zipsrc); } catch (Exception e) { throw new FacesException("Error encode resource data",e); Modified: branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/skin/VersionBean.java =================================================================== --- branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/skin/VersionBean.java 2007-05-16 23:55:16 UTC (rev 206) +++ branches/version_1_0_7/src/framework/java/org/ajax4jsf/framework/skin/VersionBean.java 2007-05-19 00:39:22 UTC (rev 207) @@ -37,7 +37,7 @@ * Revision version, must be auto modified by CVS */ - public static final String REVISION = ".7 , CVS $Revision: 1.17 $ $Date: 2007/01/24 23:06:07 $";//$Revision: 1.17 $ $Date: 2007/01/24 23:06:07 $"; + public static final String REVISION = ".8 , CVS $Revision: 1.17 $ $Date: 2007/01/24 23:06:07 $";//$Revision: 1.17 $ $Date: 2007/01/24 23:06:07 $"; public static final Version _version = new Version(); public String getVendor() {

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r206 - in trunk: a4j-portlet and 8 other directories.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-16 19:55:16 -0400 (Wed, 16 May 2007) New Revision: 206 Modified: trunk/a4j-portlet/pom.xml trunk/cdk/compiler/pom.xml trunk/cdk/generator/pom.xml trunk/cdk/maven-archetype-jsf-component/pom.xml trunk/cdk/maven-archetype-jsfwebapp/pom.xml trunk/cdk/maven-cdk-plugin/pom.xml trunk/cdk/pom.xml trunk/framework/pom.xml trunk/pom.xml trunk/test/pom.xml Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/a4j-portlet/pom.xml =================================================================== --- trunk/a4j-portlet/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/a4j-portlet/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> @@ -55,12 +55,12 @@ <dependency> <groupId>org.ajax4jsf</groupId> <artifactId>ajax4jsf</artifactId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.ajax4jsf</groupId> <artifactId>test</artifactId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> <scope>test</scope> </dependency> </dependencies> Modified: trunk/cdk/compiler/pom.xml =================================================================== --- trunk/cdk/compiler/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/cdk/compiler/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/cdk/generator/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/maven-cdk-plugin/pom.xml =================================================================== --- trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>cdk</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf.cdk</groupId> Modified: trunk/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/cdk/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -3,14 +3,14 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> <artifactId>cdk</artifactId> <packaging>pom</packaging> <name>JSF Components Development kit</name> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> <dependencies /> <build> Modified: trunk/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/framework/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -3,7 +3,7 @@ <groupId>org.ajax4jsf</groupId> <artifactId>master</artifactId> <packaging>pom</packaging> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> <name>Ajax for Java Server faces core project</name> <url>http://labs.jboss.com/jbossajax4jsf</url> <properties> @@ -126,9 +126,9 @@ </repository> </repositories> <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</connection> - <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</developerConnection> - <url>http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</url> + <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/</developerConnection> + <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> </scm>  Modified: trunk/test/pom.xml =================================================================== --- trunk/test/pom.xml 2007-05-16 23:55:08 UTC (rev 205) +++ trunk/test/pom.xml 2007-05-16 23:55:16 UTC (rev 206) @@ -2,7 +2,7 @@ <parent> <artifactId>master</artifactId> <groupId>org.ajax4jsf</groupId> - <version>1.1.1-rc4</version> + <version>1.1.1-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <groupId>org.ajax4jsf</groupId>

17 years, 7 months

1
0
0 / 0

JBoss Ajax4JSF SVN: r205 - in tags: 1_1_1_rc4 and 9 other directories.

by ajax4jsf-svn-commits＠lists.jboss.org

Author: alexsmirnov Date: 2007-05-16 19:55:08 -0400 (Wed, 16 May 2007) New Revision: 205 Added: tags/1_1_1_rc4/ tags/1_1_1_rc4/a4j-portlet/pom.xml tags/1_1_1_rc4/cdk/compiler/pom.xml tags/1_1_1_rc4/cdk/generator/pom.xml tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml tags/1_1_1_rc4/cdk/pom.xml tags/1_1_1_rc4/framework/pom.xml tags/1_1_1_rc4/pom.xml tags/1_1_1_rc4/test/pom.xml Removed: tags/1_1_1_rc4/a4j-portlet/pom.xml tags/1_1_1_rc4/cdk/compiler/pom.xml tags/1_1_1_rc4/cdk/generator/pom.xml tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml tags/1_1_1_rc4/cdk/pom.xml tags/1_1_1_rc4/framework/pom.xml tags/1_1_1_rc4/pom.xml tags/1_1_1_rc4/test/pom.xml Log: [maven-release-plugin] copy for tag 1_1_1_rc4 Copied: tags/1_1_1_rc4 (from rev 203, trunk) Deleted: tags/1_1_1_rc4/a4j-portlet/pom.xml =================================================================== --- trunk/a4j-portlet/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/a4j-portlet/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,70 +0,0 @@ -<?xml version="1.0"?> -<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> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>a4j-portlet</artifactId> - <name>ajax4jsf portlet brige</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>portlet-api</groupId> - <artifactId>portlet-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_04</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_04</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.11</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>1.1.1-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>test</artifactId> - <version>1.1.1-SNAPSHOT</version> - <scope>test</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/a4j-portlet/pom.xml (from rev 204, trunk/a4j-portlet/pom.xml) =================================================================== --- tags/1_1_1_rc4/a4j-portlet/pom.xml (rev 0) +++ tags/1_1_1_rc4/a4j-portlet/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,67 @@ +<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> + <artifactId>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>a4j-portlet</artifactId> + <name>ajax4jsf portlet brige</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/a4j-portlet</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>portlet-api</groupId> + <artifactId>portlet-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_04</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>1.1.1-rc4</version> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>test</artifactId> + <version>1.1.1-rc4</version> + <scope>test</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/cdk/compiler/pom.xml =================================================================== --- trunk/cdk/compiler/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/cdk/compiler/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,63 +0,0 @@ -<?xml version="1.0"?><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> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>compiler</artifactId> - <name>JSF Renderers templates complier</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/compiler</url> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging-api</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>el-impl</groupId> - <artifactId>el-impl</artifactId> - <version>1.0</version> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/cdk/compiler/pom.xml (from rev 204, trunk/cdk/compiler/pom.xml) =================================================================== --- tags/1_1_1_rc4/cdk/compiler/pom.xml (rev 0) +++ tags/1_1_1_rc4/cdk/compiler/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,63 @@ +<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> + <artifactId>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>compiler</artifactId> + <name>JSF Renderers templates complier</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/compiler</url> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging-api</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>el-impl</groupId> + <artifactId>el-impl</artifactId> + <version>1.0</version> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/cdk/generator/pom.xml =================================================================== --- trunk/cdk/generator/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/cdk/generator/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,84 +0,0 @@ -<?xml version="1.0"?><project> - <parent> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>generator</artifactId> - <name>Java Server Faces component generator</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/generator</url> - <build> - <plugins> - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <inherited>true</inherited> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>ant</groupId> - <artifactId>ant</artifactId> - <version>1.6.5</version> - </dependency> - <dependency> - <groupId>velocity</groupId> - <artifactId>velocity-dep</artifactId> - <version>1.4</version> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.5</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - </dependency> - <dependency> - <groupId>qdox</groupId> - <artifactId>qdox</artifactId> - <version>1.6</version> - </dependency> - <dependency> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>compiler</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>cglib</groupId> - <artifactId>cglib</artifactId> - <version>2.1_3</version> - </dependency> - </dependencies> - <reporting> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - </plugin> - </plugins> - </reporting> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/cdk/generator/pom.xml (from rev 204, trunk/cdk/generator/pom.xml) =================================================================== --- tags/1_1_1_rc4/cdk/generator/pom.xml (rev 0) +++ tags/1_1_1_rc4/cdk/generator/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,84 @@ +<?xml version="1.0"?><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> + <artifactId>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>generator</artifactId> + <name>Java Server Faces component generator</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/generator</url> + <build> + <plugins> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <inherited>true</inherited> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>ant</groupId> + <artifactId>ant</artifactId> + <version>1.6.5</version> + </dependency> + <dependency> + <groupId>velocity</groupId> + <artifactId>velocity-dep</artifactId> + <version>1.4</version> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.5</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + </dependency> + <dependency> + <groupId>qdox</groupId> + <artifactId>qdox</artifactId> + <version>1.6</version> + </dependency> + <dependency> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>compiler</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>cglib</groupId> + <artifactId>cglib</artifactId> + <version>2.1_3</version> + </dependency> + </dependencies> + <reporting> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + </plugin> + </plugins> + </reporting> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,11 +0,0 @@ -<?xml version="1.0"?><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> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-archetype-jsf-component</artifactId> - <name>Archetype - maven-archetype-jsf-component</name> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml (from rev 204, trunk/cdk/maven-archetype-jsf-component/pom.xml) =================================================================== --- tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml (rev 0) +++ tags/1_1_1_rc4/cdk/maven-archetype-jsf-component/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,11 @@ +<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> + <artifactId>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-archetype-jsf-component</artifactId> + <name>Archetype - maven-archetype-jsf-component</name> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml =================================================================== --- trunk/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,11 +0,0 @@ -<?xml version="1.0"?><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> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-archetype-jsfwebapp</artifactId> - <name>Archetype for jsf webapp project</name> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml (from rev 204, trunk/cdk/maven-archetype-jsfwebapp/pom.xml) =================================================================== --- tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml (rev 0) +++ tags/1_1_1_rc4/cdk/maven-archetype-jsfwebapp/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,11 @@ +<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> + <artifactId>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-archetype-jsfwebapp</artifactId> + <name>Archetype for jsf webapp project</name> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml =================================================================== --- trunk/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,56 +0,0 @@ -<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> - <artifactId>cdk</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <packaging>maven-plugin</packaging> - <name>Maven plugin for JSF components code generation</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/maven-cdk-plugin/</url> - <dependencies> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-artifact</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-plugin-api</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-project</artifactId> - <version>2.0.4</version> - </dependency> - <dependency> - <groupId>org.apache.maven</groupId> - <artifactId>maven-archiver</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.apache.maven.shared</groupId> - <artifactId>file-management</artifactId> - <version>1.1</version> - </dependency> - <dependency> - <groupId>org.codehaus.plexus</groupId> - <artifactId>plexus-velocity</artifactId> - <version>1.1.2</version> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>generator</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml (from rev 204, trunk/cdk/maven-cdk-plugin/pom.xml) =================================================================== --- tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml (rev 0) +++ tags/1_1_1_rc4/cdk/maven-cdk-plugin/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,56 @@ +<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> + <artifactId>cdk</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <packaging>maven-plugin</packaging> + <name>Maven plugin for JSF components code generation</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk/maven-cdk-plugin/</url> + <dependencies> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-artifact</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-plugin-api</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-project</artifactId> + <version>2.0.4</version> + </dependency> + <dependency> + <groupId>org.apache.maven</groupId> + <artifactId>maven-archiver</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.apache.maven.shared</groupId> + <artifactId>file-management</artifactId> + <version>1.1</version> + </dependency> + <dependency> + <groupId>org.codehaus.plexus</groupId> + <artifactId>plexus-velocity</artifactId> + <version>1.1.2</version> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>generator</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/cdk/pom.xml =================================================================== --- trunk/cdk/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/cdk/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>cdk</artifactId> - <packaging>pom</packaging> - <name>JSF Components Development kit</name> - <version>1.1.1-SNAPSHOT</version> - <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> - <dependencies/> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - <modules> - <module>maven-cdk-plugin</module> - <module>compiler</module> - <module>generator</module> - <module>maven-archetype-jsf-component</module> - <module>maven-archetype-jsfwebapp</module> - </modules> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/cdk/pom.xml (from rev 204, trunk/cdk/pom.xml) =================================================================== --- tags/1_1_1_rc4/cdk/pom.xml (rev 0) +++ tags/1_1_1_rc4/cdk/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + <artifactId>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>cdk</artifactId> + <packaging>pom</packaging> + <name>JSF Components Development kit</name> + <version>1.1.1-rc4</version> + <url>http://labs.jboss.com/wiki/Ajax4jsf/cdk</url> + <dependencies /> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <modules> + <module>maven-cdk-plugin</module> + <module>compiler</module> + <module>generator</module> + <module>maven-archetype-jsf-component</module> + <module>maven-archetype-jsfwebapp</module> + </modules> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/framework/pom.xml =================================================================== --- trunk/framework/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/framework/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,344 +0,0 @@ -<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> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <name>Java Server Faces AJAX framework</name> - <url>http://labs.jboss.com/wiki/Ajax4jsf/framework</url> - <properties> - <jsfVersion>1.1</jsfVersion> - </properties> - <build> - <resources> - <resource> - <directory>src/main/resources</directory> - </resource> - <resource> - <directory>target/javascript</directory> - </resource> - </resources> - <plugins> - <plugin> - <groupId>org.ajax4jsf.cdk</groupId> - <artifactId>maven-cdk-plugin</artifactId> - <version>${project.version}</version> - <executions> - <execution> - <phase>generate-sources</phase> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - <configuration> - <library> - <prefix>org.ajax4jsf</prefix> - <jsfVersion>${jsfVersion}</jsfVersion> - <taglib> - <uri> - https://ajax4jsf.dev.java.net/ajax - </uri> - <shortName>a4j</shortName> - </taglib> - </library> - </configuration> - </plugin> - <plugin> - <artifactId>maven-antrun-plugin</artifactId> - <executions> - <execution> - <phase>generate-resources</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <tasks> - <ant - antfile="${basedir}/generatescript.xml" inheritRefs="true"> - <target name="assembly" /> - <property name="target-dir" - value="${project.build.directory}/javascript"> - </property> - </ant> - </tasks> - <resourceRoot> - ${project.build.directory}/javascript - </resourceRoot> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - <reporting> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - </plugin> - </plugins> - </reporting> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>opensymphony</groupId> - <artifactId>oscache</artifactId> - <version>2.3</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>com.sun.facelets</groupId> - <artifactId>jsf-facelets</artifactId> - <version>1.1.11</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>nekohtml</groupId> - <artifactId>nekohtml</artifactId> - <version>0.9.5</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>0.9</version> - <optional>true</optional> - <exclusions> - <exclusion> - <groupId>commons-lang</groupId> - <artifactId>commons-lang</artifactId> - </exclusion> - <exclusion> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>1.0.4</version> - </dependency> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>commons-beanutils</groupId> - <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> - </dependency> - <dependency> - <groupId>commons-digester</groupId> - <artifactId>commons-digester</artifactId> - <version>1.8</version> - </dependency> - <dependency> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - <version>3.2</version> - </dependency> - </dependencies> - <profiles> - <profile> - <id>jsf1_1</id> - <activation> - <activeByDefault>true</activeByDefault> - <property> - <name>jsfVersion</name> - <value>1.1</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.4</source> - <target>1.4</target> - </configuration> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.1_02</version> - <exclusions> -  - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet.jsp.jstl</groupId> - <artifactId>jstl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.1_02</version> - <scope>runtime</scope> - <exclusions> -  - <exclusion> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - </exclusion> - <exclusion> - <groupId>javax.servlet.jsp.jstl</groupId> - <artifactId>jstl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - <version>1.0</version> - </dependency> - </dependencies> - </profile> - <profile> - <id>jsf1_2</id> - <activation> - <property> - <name>jsfVersion</name> - <value>1.2</value> - </property> - </activation> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-compiler-plugin</artifactId> - <version>2.0</version> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId> - build-helper-maven-plugin - </artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>process-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/jsf12</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - <dependencies> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <version>2.1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2_03</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-impl</artifactId> - <version>1.2_03</version> - <scope>runtime</scope> - </dependency> - </dependencies> - </profile> - <profile> - <id>assembly</id> - <build> - <plugins> - <plugin> - <groupId>net.sourceforge.maven-taglib</groupId> - <artifactId>maven-taglib-plugin</artifactId> - <configuration> - <taglib.src.dir> - ${project.build.directory}/generated-component/resources/META-INF - </taglib.src.dir> - <tldDocDir> - ${project.build.directory}/tlddoc - </tldDocDir> - </configuration> - - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>taglibdocjar</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/framework/pom.xml (from rev 204, trunk/framework/pom.xml) =================================================================== --- tags/1_1_1_rc4/framework/pom.xml (rev 0) +++ tags/1_1_1_rc4/framework/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,340 @@ +<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> + <artifactId>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <name>Java Server Faces AJAX framework</name> + <url>http://labs.jboss.com/wiki/Ajax4jsf/framework</url> + <properties> + <jsfVersion>1.1</jsfVersion> + </properties> + <build> + <resources> + <resource> + <directory>src/main/resources</directory> + </resource> + <resource> + <directory>target/javascript</directory> + </resource> + </resources> + <plugins> + <plugin> + <groupId>org.ajax4jsf.cdk</groupId> + <artifactId>maven-cdk-plugin</artifactId> + <version>${project.version}</version> + <executions> + <execution> + <phase>generate-sources</phase> + <goals> + <goal>generate</goal> + </goals> + </execution> + </executions> + <configuration> + <library> + <prefix>org.ajax4jsf</prefix> + <jsfVersion>${jsfVersion}</jsfVersion> + <taglib> + <uri> + https://ajax4jsf.dev.java.net/ajax + </uri> + <shortName>a4j</shortName> + </taglib> + </library> + </configuration> + </plugin> + <plugin> + <artifactId>maven-antrun-plugin</artifactId> + <executions> + <execution> + <phase>generate-resources</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <tasks> + <ant antfile="${basedir}/generatescript.xml" inheritRefs="true"> + <target name="assembly" /> + <property name="target-dir" value="${project.build.directory}/javascript"> + </property> + </ant> + </tasks> + <resourceRoot> + ${project.build.directory}/javascript + </resourceRoot> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + <reporting> + <plugins> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + </plugin> + </plugins> + </reporting> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>opensymphony</groupId> + <artifactId>oscache</artifactId> + <version>2.3</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>com.sun.facelets</groupId> + <artifactId>jsf-facelets</artifactId> + <version>1.1.11</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>nekohtml</groupId> + <artifactId>nekohtml</artifactId> + <version>0.9.5</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>0.9</version> + <optional>true</optional> + <exclusions> + <exclusion> + <groupId>commons-lang</groupId> + <artifactId>commons-lang</artifactId> + </exclusion> + <exclusion> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>1.0.4</version> + </dependency> + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <version>1.2.14</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>commons-beanutils</groupId> + <artifactId>commons-beanutils</artifactId> + <version>1.7.0</version> + </dependency> + <dependency> + <groupId>commons-digester</groupId> + <artifactId>commons-digester</artifactId> + <version>1.8</version> + </dependency> + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + <version>3.2</version> + </dependency> + </dependencies> + <profiles> + <profile> + <id>jsf1_1</id> + <activation> + <activeByDefault>true</activeByDefault> + <property> + <name>jsfVersion</name> + <value>1.1</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.4</source> + <target>1.4</target> + </configuration> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.1_02</version> + <exclusions> +  + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>jstl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.1_02</version> + <scope>runtime</scope> + <exclusions> +  + <exclusion> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.servlet.jsp.jstl</groupId> + <artifactId>jstl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + <version>1.0</version> + </dependency> + </dependencies> + </profile> + <profile> + <id>jsf1_2</id> + <activation> + <property> + <name>jsfVersion</name> + <value>1.2</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>2.0</version> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId> + build-helper-maven-plugin + </artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>process-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/jsf12</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + <dependencies> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <version>2.1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2_03</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-impl</artifactId> + <version>1.2_03</version> + <scope>runtime</scope> + </dependency> + </dependencies> + </profile> + <profile> + <id>assembly</id> + <build> + <plugins> + <plugin> + <groupId>net.sourceforge.maven-taglib</groupId> + <artifactId>maven-taglib-plugin</artifactId> + <configuration> + <taglib.src.dir> + ${project.build.directory}/generated-component/resources/META-INF + </taglib.src.dir> + <tldDocDir> + ${project.build.directory}/tlddoc + </tldDocDir> + </configuration> + + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>taglibdocjar</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/pom.xml =================================================================== --- trunk/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,317 +0,0 @@ -<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"> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>master</artifactId> - <packaging>pom</packaging> - <version>1.1.1-SNAPSHOT</version> - <name>Ajax for Java Server faces core project</name> - <url>http://labs.jboss.com/jbossajax4jsf</url> - <properties> - <maven.test.failure.ignore>true</maven.test.failure.ignore> - </properties> - <build> - <pluginManagement> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <index>true</index> - <manifest> - <addDefaultSpecificationEntries> - true - </addDefaultSpecificationEntries> - <addDefaultImplementationEntries> - true - </addDefaultImplementationEntries> - </manifest> - <manifestEntries> - <mode>development</mode> - <Build-Number> - ${buildNumber} - </Build-Number> - </manifestEntries> - </archive> - </configuration> - </plugin> - </plugins> - </pluginManagement> - </build> - <licenses> - <license> - <name>LGPL 2.1</name> - <url>http://www.gnu.org/licenses/lgpl.html</url> - <distribution>repo</distribution> - <comments> - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 - </comments> - </license> - </licenses> - <issueManagement> - <system>JIRA</system> - <url>http://jira.jboss.org/jira/browse/AJSF</url> - </issueManagement> - <developers> - <developer> - <id>alexsmirnov</id> - <name>Alexander Smirnov</name> - <email>alexsmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>-3</timezone> - </developer> - <developer> - <id>ishabalov</id> - <name>Igor Shabalov</name> - <email>ishabalov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - <developer> - <id>sergeysmirnov</id> - <name>Sergey Smirnov</name> - <email>sergeysmirnov(a)exadel.com</email> - <organization>Exadel Inc.</organization> - <organizationUrl>http://www.exadel.com</organizationUrl> - <roles> - <role>architect</role> - <role>developer</role> - </roles> - <timezone>+8</timezone> - </developer> - </developers> - <distributionManagement> - <downloadUrl> - http://labs.jboss.com/portal/jbossajax4jsf/downloads - </downloadUrl> - <repository> - <id>release-repository</id> - <uniqueVersion>false</uniqueVersion> - <url>${releaseRepository}</url> - </repository> - <snapshotRepository> - <id>snap-repository</id> - <uniqueVersion>true</uniqueVersion> - <url>${snapshotRepository}</url> - </snapshotRepository> - <site> - <id>ajax4jsf-site</id> - <url>ajax4jsf/</url> - </site> - </distributionManagement> - <repositories> - <repository> - <releases> - <enabled>true</enabled> - </releases> - <snapshots> - <enabled>true</enabled> - </snapshots> - <id>maven-repository.dev.java.net</id> - <name>Java.net Repository for Maven</name> - <url> - https://maven-repository.dev.java.net/nonav/repository - </url> - <layout>legacy</layout> - </repository> - </repositories> - <scm> - <connection> - scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/trunk/ - </connection> - <developerConnection> - scm:svn:https://svn.jboss.org/repos/ajax4jsf/trunk/ - </developerConnection> - <url>http://anonsvn.jboss.org/repos/ajax4jsf/trunk/</url> - </scm> -  - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId> - maven-project-info-reports-plugin - </artifactId> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <configuration> - <quiet>true</quiet> - </configuration> - </plugin> -  - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jxr-plugin</artifactId> - </plugin> -  - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <configuration> - <xmlOutput>false</xmlOutput> - <threshold>Normal</threshold> - <effort>Max</effort> - </configuration> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-report-plugin</artifactId> - </plugin> - </plugins> - - </reporting> - <ciManagement> - <notifiers></notifiers> - <system>cruisecontrol</system> - </ciManagement> - - <modules> - <module>framework</module> - <module>test</module> - <module>cdk</module> - <module>a4j-portlet</module> - </modules> - <profiles> - <profile> - <id>gwt</id> - <modules> - <module>gwtjsf</module> - </modules> - </profile> - <profile> - <id>trinidad</id> - <modules> - <module>a4j-trinidad</module> - </modules> - </profile> - <profile> - <id>seam</id> - <modules> - <module>a4j-seam</module> - </modules> - </profile> - <profile> - <id>assembly</id> - <build> - <plugins> - <plugin> - <artifactId>maven-javadoc-plugin</artifactId> - <executions> - <execution> - <id>attach-javadoc</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-source-plugin</artifactId> - <executions> - <execution> - <id>attach-source</id> - <goals> - <goal>jar</goal> - </goals> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <inherited>false</inherited> - <configuration> - <finalName>ajax4jsf-${version}</finalName> - <descriptors> - <descriptor> - src/main/assembly/distribution.xml - </descriptor> - <descriptor> - src/main/assembly/src.xml - </descriptor> - </descriptors> - </configuration> - </plugin> - </plugins> - </build> - </profile> - <profile> - <id>clover</id> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> - <configuration> - <includesAllSourceRoots> - true - </includesAllSourceRoots> - <licenseLocation> - ${clover.license.path} - </licenseLocation> - <jdk>1.5</jdk> - </configuration> - <executions> - <execution> - <phase>verify</phase> - <goals> - <goal>instrument</goal> - <goal>aggregate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - - </build> - <reporting> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-clover-plugin</artifactId> -  - </plugin> - </plugins> - </reporting> - </profile> - </profiles> -  -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/pom.xml (from rev 204, trunk/pom.xml) =================================================================== --- tags/1_1_1_rc4/pom.xml (rev 0) +++ tags/1_1_1_rc4/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,311 @@ +<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"> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>master</artifactId> + <packaging>pom</packaging> + <version>1.1.1-rc4</version> + <name>Ajax for Java Server faces core project</name> + <url>http://labs.jboss.com/jbossajax4jsf</url> + <properties> + <maven.test.failure.ignore>true</maven.test.failure.ignore> + </properties> + <build> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jar-plugin</artifactId> + <configuration> + <archive> + <index>true</index> + <manifest> + <addDefaultSpecificationEntries> + true + </addDefaultSpecificationEntries> + <addDefaultImplementationEntries> + true + </addDefaultImplementationEntries> + </manifest> + <manifestEntries> + <mode>development</mode> + <Build-Number> + ${buildNumber} + </Build-Number> + </manifestEntries> + </archive> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> + <licenses> + <license> + <name>LGPL 2.1</name> + <url>http://www.gnu.org/licenses/lgpl.html</url> + <distribution>repo</distribution> + <comments> + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + </comments> + </license> + </licenses> + <issueManagement> + <system>JIRA</system> + <url>http://jira.jboss.org/jira/browse/AJSF</url> + </issueManagement> + <developers> + <developer> + <id>alexsmirnov</id> + <name>Alexander Smirnov</name> + <email>alexsmirnov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>-3</timezone> + </developer> + <developer> + <id>ishabalov</id> + <name>Igor Shabalov</name> + <email>ishabalov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + <developer> + <id>sergeysmirnov</id> + <name>Sergey Smirnov</name> + <email>sergeysmirnov(a)exadel.com</email> + <organization>Exadel Inc.</organization> + <organizationUrl>http://www.exadel.com</organizationUrl> + <roles> + <role>architect</role> + <role>developer</role> + </roles> + <timezone>+8</timezone> + </developer> + </developers> + <distributionManagement> + <downloadUrl> + http://labs.jboss.com/portal/jbossajax4jsf/downloads + </downloadUrl> + <repository> + <id>release-repository</id> + <uniqueVersion>false</uniqueVersion> + <url>${releaseRepository}</url> + </repository> + <snapshotRepository> + <id>snap-repository</id> + <uniqueVersion>true</uniqueVersion> + <url>${snapshotRepository}</url> + </snapshotRepository> + <site> + <id>ajax4jsf-site</id> + <url>ajax4jsf/</url> + </site> + </distributionManagement> + <repositories> + <repository> + <releases> + <enabled>true</enabled> + </releases> + <snapshots> + <enabled>true</enabled> + </snapshots> + <id>maven-repository.dev.java.net</id> + <name>Java.net Repository for Maven</name> + <url> + https://maven-repository.dev.java.net/nonav/repository + </url> + <layout>legacy</layout> + </repository> + </repositories> + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</connection> + <developerConnection>scm:svn:https://svn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</developerConnection> + <url>http://anonsvn.jboss.org/repos/ajax4jsf/tags/1_1_1_rc4</url> + </scm> +  + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId> + maven-project-info-reports-plugin + </artifactId> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-javadoc-plugin</artifactId> + <configuration> + <quiet>true</quiet> + </configuration> + </plugin> +  + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-jxr-plugin</artifactId> + </plugin> +  + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>findbugs-maven-plugin</artifactId> + <configuration> + <xmlOutput>false</xmlOutput> + <threshold>Normal</threshold> + <effort>Max</effort> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-report-plugin</artifactId> + </plugin> + </plugins> + + </reporting> + <ciManagement> + <notifiers /> + <system>cruisecontrol</system> + </ciManagement> + + <modules> + <module>framework</module> + <module>test</module> + <module>cdk</module> + <module>a4j-portlet</module> + </modules> + <profiles> + <profile> + <id>gwt</id> + <modules> + <module>gwtjsf</module> + </modules> + </profile> + <profile> + <id>trinidad</id> + <modules> + <module>a4j-trinidad</module> + </modules> + </profile> + <profile> + <id>seam</id> + <modules> + <module>a4j-seam</module> + </modules> + </profile> + <profile> + <id>assembly</id> + <build> + <plugins> + <plugin> + <artifactId>maven-javadoc-plugin</artifactId> + <executions> + <execution> + <id>attach-javadoc</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-source-plugin</artifactId> + <executions> + <execution> + <id>attach-source</id> + <goals> + <goal>jar</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <inherited>false</inherited> + <configuration> + <finalName>ajax4jsf-${version}</finalName> + <descriptors> + <descriptor> + src/main/assembly/distribution.xml + </descriptor> + <descriptor> + src/main/assembly/src.xml + </descriptor> + </descriptors> + </configuration> + </plugin> + </plugins> + </build> + </profile> + <profile> + <id>clover</id> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> + <configuration> + <includesAllSourceRoots> + true + </includesAllSourceRoots> + <licenseLocation> + ${clover.license.path} + </licenseLocation> + <jdk>1.5</jdk> + </configuration> + <executions> + <execution> + <phase>verify</phase> + <goals> + <goal>instrument</goal> + <goal>aggregate</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + + </build> + <reporting> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-clover-plugin</artifactId> +  + </plugin> + </plugins> + </reporting> + </profile> + </profiles> +  +</project> \ No newline at end of file Deleted: tags/1_1_1_rc4/test/pom.xml =================================================================== --- trunk/test/pom.xml 2007-05-16 23:51:00 UTC (rev 203) +++ tags/1_1_1_rc4/test/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -1,76 +0,0 @@ -<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> - <artifactId>master</artifactId> - <groupId>org.ajax4jsf</groupId> - <version>1.1.1-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <groupId>org.ajax4jsf</groupId> - <artifactId>test</artifactId> - <name>Ajax4Jsf test framework</name> - <url>https://ajax4jsf.dev.java.net</url> - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>3.8.1</version> - </dependency> - <dependency> - <groupId>org.apache.shale</groupId> - <artifactId>shale-test</artifactId> - <version>1.0.4</version> - <exclusions> - <exclusion> - <groupId>org.apache.myfaces</groupId> - <artifactId>myfaces-api</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.myfaces</groupId> - <artifactId>myfaces-impl</artifactId> - </exclusion> - <exclusion> - <groupId>myfaces</groupId> - <artifactId>myfaces-api</artifactId> - </exclusion> - <exclusion> - <groupId>myfaces</groupId> - <artifactId>myfaces-impl</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.ajax4jsf</groupId> - <artifactId>ajax4jsf</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>1.10</version> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymock</artifactId> - <version>2.2</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>org.easymock</groupId> - <artifactId>easymockclassextension</artifactId> - <version>2.2.1</version> - <optional>true</optional> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.4</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jsp-api</artifactId> - <version>2.0</version> - <scope>provided</scope> - </dependency> - </dependencies> -</project> \ No newline at end of file Copied: tags/1_1_1_rc4/test/pom.xml (from rev 204, trunk/test/pom.xml) =================================================================== --- tags/1_1_1_rc4/test/pom.xml (rev 0) +++ tags/1_1_1_rc4/test/pom.xml 2007-05-16 23:55:08 UTC (rev 205) @@ -0,0 +1,76 @@ +<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> + <artifactId>master</artifactId> + <groupId>org.ajax4jsf</groupId> + <version>1.1.1-rc4</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <groupId>org.ajax4jsf</groupId> + <artifactId>test</artifactId> + <name>Ajax4Jsf test framework</name> + <url>https://ajax4jsf.dev.java.net</url> + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>3.8.1</version> + </dependency> + <dependency> + <groupId>org.apache.shale</groupId> + <artifactId>shale-test</artifactId> + <version>1.0.4</version> + <exclusions> + <exclusion> + <groupId>org.apache.myfaces</groupId> + <artifactId>myfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>org.apache.myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + </exclusion> + <exclusion> + <groupId>myfaces</groupId> + <artifactId>myfaces-api</artifactId> + </exclusion> + <exclusion> + <groupId>myfaces</groupId> + <artifactId>myfaces-impl</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.ajax4jsf</groupId> + <artifactId>ajax4jsf</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>htmlunit</groupId> + <artifactId>htmlunit</artifactId> + <version>1.10</version> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymock</artifactId> + <version>2.2</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>org.easymock</groupId> + <artifactId>easymockclassextension</artifactId> + <version>2.2.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>2.4</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jsp-api</artifactId> + <version>2.0</version> + <scope>provided</scope> + </dependency> + </dependencies> +</project> \ No newline at end of file

17 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

ajax4jsf-svn-commits May 2007