6:12 a.m.
Author: Alex.Kolonitsky
Date: 2010-05-15 07:12:06 -0400 (Sat, 15 May 2010)
New Revision: 17059
Modified:
root/commons/trunk/pom.xml
root/pom.xml
root/ui-sandbox/componentcontrol/trunk/pom.xml
root/ui-sandbox/datascroller/trunk/pom.xml
root/ui-sandbox/pom.xml
root/ui-sandbox/tables/trunk/pom.xml
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java
root/ui/core/trunk/parent/pom.xml
root/ui/core/trunk/pom.xml
Log:
correct pom structure
Modified: root/commons/trunk/pom.xml
===================================================================
--- root/commons/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/commons/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -42,5 +42,13 @@
<module>parent</module>
<module>api</module>
</modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-checkstyle-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
Modified: root/pom.xml
===================================================================
--- root/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -37,9 +37,9 @@
<module>core/${core.svn.dir}</module>
<module>cdk/${cdk.svn.dir}</module>
<module>ui/core/${ui.svn.dir}</module>
- <!--<module>ui-sandbox/${ui-sandbox.svn.dir}</module>-->
+ <!--<module>ui-sandbox</module>-->
<module>examples</module>
- <module>examples-sandbox/${examples-sandbox.svn.dir}</module>
+
<!--<module>examples-sandbox/${examples-sandbox.svn.dir}</module>-->
<!--<module>doc/${doc.svn.dir}</module>-->
</modules>
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java
===================================================================
---
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2010-05-15
07:12:11 UTC (rev 17058)
+++
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRenderer.java 2010-05-15
11:12:06 UTC (rev 17059)
@@ -31,7 +31,7 @@
/**
* @author Nick Belaevski Renderer for queue component
*/
- @JsfRenderer(type="org.richfaces.QueueRenderer",
family="org.richfaces.Queue")
+@JsfRenderer(type = "org.richfaces.QueueRenderer", family =
"org.richfaces.Queue")
public class QueueRenderer extends QueueRendererBase {
@Override
@@ -46,8 +46,7 @@
} else {
name = AbstractQueue.GLOBAL_QUEUE_NAME;
if
(!ContextInitParameters.isGlobalQueueEnabled(FacesContext.getCurrentInstance())) {
- LOGGER
- .warn("Global queue is disabled by you are using unnamed
queue, so new global queue will be created with defined parameters");
+ LOGGER.warn("Global queue is disabled by you are using unnamed
queue, so new global queue will be created with defined parameters");
}
}
comp.getAttributes().put(NAME_ATTRIBBUTE, name);
Modified:
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java
===================================================================
---
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-15
07:12:11 UTC (rev 17058)
+++
root/ui/core/trunk/api/src/main/java/org/richfaces/renderkit/html/QueueRendererBase.java 2010-05-15
11:12:06 UTC (rev 17059)
@@ -52,6 +52,10 @@
@ListenerFor(systemEventClass = PreRemoveFromViewEvent.class) })
public abstract class QueueRendererBase extends Renderer implements
ComponentSystemEventListener {
+ protected static final String QUEUE_ID_ATTRIBBUTE = "queueId";
+ protected static final String NAME_ATTRIBBUTE = "name";
+ protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger();
+
public void processEvent(ComponentSystemEvent event) throws AbortProcessingException
{
UIComponent comp = event.getComponent();
FacesContext context = FacesContext.getCurrentInstance();
@@ -70,10 +74,6 @@
protected abstract String getQueueName(UIComponent comp);
- protected static final String QUEUE_ID_ATTRIBBUTE = "queueId";
- protected static final String NAME_ATTRIBBUTE = "name";
- protected static final Logger LOGGER = RichfacesLogger.COMPONENTS.getLogger();
-
protected String findParentQueueId(UIComponent comp) {
UIComponent parentForm = findParentForm(comp);
for (UIComponent c : parentForm.getChildren()) {
Modified: root/ui/core/trunk/parent/pom.xml
===================================================================
--- root/ui/core/trunk/parent/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui/core/trunk/parent/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -25,8 +25,8 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.richfaces</groupId>
- <artifactId>richfaces-parent</artifactId>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>core-aggregator</artifactId>
<version>4.0.0-SNAPSHOT</version>
</parent>
@@ -36,6 +36,10 @@
<name>Richfaces UI Components: Core Parent</name>
<packaging>pom</packaging>
+ <modules>
+ <module>../api</module>
+ </modules>
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -113,14 +117,6 @@
<plugins>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-enforcer-plugin</artifactId>
- <version>1.0-beta-1</version>
- <configuration>
- <fail>false</fail>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.richfaces.cdk</groupId>
<artifactId>maven-cdk-plugin</artifactId>
<configuration>
Modified: root/ui/core/trunk/pom.xml
===================================================================
--- root/ui/core/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui/core/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -39,7 +39,6 @@
<modules>
<module>bom</module>
<module>parent</module>
- <module>api</module>
</modules>
<build>
@@ -52,6 +51,15 @@
<plugin>
<artifactId>maven-checkstyle-plugin</artifactId>
</plugin>
+
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-enforcer-plugin</artifactId>
+ <version>1.0-beta-1</version>
+ <configuration>
+ <fail>false</fail>
+ </configuration>
+ </plugin>
</plugins>
</build>
Modified: root/ui-sandbox/componentcontrol/trunk/pom.xml
===================================================================
--- root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/componentcontrol/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -1,39 +1,37 @@
<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">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd">
- <parent>
- <groupId>org.richfaces.ui</groupId>
- <artifactId>components</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.sandbox.ui.components</groupId>
- <artifactId>componentControl</artifactId>
- <name>RichFaces Component Control</name>
- <packaging>jar</packaging>
+ <parent>
+ <groupId>org.richfaces</groupId>
+ <artifactId>richfaces-parent</artifactId>
+ <version>1-SNAPSHOT</version>
+ </parent>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-cdk-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>annotations</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.richfaces.framework</groupId>
- <artifactId>richfaces-impl</artifactId>
- </dependency>
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.richfaces.ui</groupId>
+ <artifactId>componentControl</artifactId>
+ <name>Richfaces UI Components: Component Control</name>
+ <packaging>jar</packaging>
- </dependencies>
-
+
+ <dependencies>
+ <dependency>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.richfaces.core</groupId>
+ <artifactId>richfaces-core-impl</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.richfaces.cdk</groupId>
+ <artifactId>maven-cdk-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
</project>
\ No newline at end of file
Modified: root/ui-sandbox/datascroller/trunk/pom.xml
===================================================================
--- root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/datascroller/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -23,6 +23,12 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <parent>
+ <groupId>org.richfaces.sandbox.ui</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.ui-sandbox</groupId>
<artifactId>datascroller-aggregator</artifactId>
Modified: root/ui-sandbox/pom.xml
===================================================================
--- root/ui-sandbox/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -1,21 +1,39 @@
<?xml version="1.0" encoding="UTF-8"?>
-
+<!--
+ JBoss, Home of Professional Open Source Copyright 2010, Red Hat,
+ Inc. and individual contributors by the @authors tag. See the
+ copyright.txt in the distribution for a full listing of
+ individual contributors. This is free software; you can
+ redistribute it and/or modify it under the terms of the GNU
+ Lesser General Public License as published by the Free Software
+ Foundation; either version 2.1 of the License, or (at your
+ option) any later version. This software is distributed in the
+ hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ PARTICULAR PURPOSE. See the GNU Lesser General Public License
+ for more details. You should have received a copy of the GNU
+ Lesser General Public License along with this software; if not,
+ write to the Free Software Foundation, Inc., 51 Franklin St,
+ Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org.
+-->
<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+
<parent>
<groupId>org.richfaces</groupId>
<artifactId>richfaces-parent</artifactId>
<version>1-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces.sandbox.ui</groupId>
<artifactId>components</artifactId>
<version>4.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>richfaces components sandbox</name>
+ <name>Richfaces UI Components Sandbox Aggregator</name>
<modules>
<module>tables/trunk</module>
Modified: root/ui-sandbox/tables/trunk/pom.xml
===================================================================
--- root/ui-sandbox/tables/trunk/pom.xml 2010-05-15 07:12:11 UTC (rev 17058)
+++ root/ui-sandbox/tables/trunk/pom.xml 2010-05-15 11:12:06 UTC (rev 17059)
@@ -19,14 +19,21 @@
-->
<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/xsd/maven-4.0.0.xsd">
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.richfaces.sandbox.ui</groupId>
+ <artifactId>components</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ </parent>
+
<groupId>org.richfaces.ui-sandbox</groupId>
- <artifactId>tables-aggregator</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <packaging>pom</packaging>
- <name>Richfaces UI Components: Tables Aggregator</name>
+ <artifactId>tables-aggregator</artifactId>
+ <version>4.0.0-SNAPSHOT</version>
+ <packaging>pom</packaging>
+ <name>Richfaces UI Components: Tables Aggregator</name>
<build>
<plugins>
@@ -41,12 +48,12 @@
</plugins>
</build>
- <modules>
- <module>bom</module>
- <module>parent</module>
- <module>api</module>
- <module>impl</module>
- <module>ui</module>
- </modules>
+ <modules>
+ <module>bom</module>
+ <module>parent</module>
+ <module>api</module>
+ <module>impl</module>
+ <module>ui</module>
+ </modules>
</project>
\ No newline at end of file