[richfaces-svn-commits] JBoss Rich Faces SVN: r17640 - in root: core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330 and 28 other directories.

Friday, 18 June 2010

Author: alexsmirnov
Date: 2010-06-18 15:14:03 -0400 (Fri, 18 Jun 2010)
New Revision: 17640

Modified:
 root/commons/trunk/api/
 root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Binder.java
 
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/BinderImpl.java
 
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/InjectorImpl.java
 root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Target.java
 root/docs/trunk/
 root/docs/trunk/Component_Reference/
 root/docs/trunk/Developer_Guide/
 root/docs/trunk/Migration_Guide/
 root/examples/iteration-demo/trunk/
 root/examples/misc-demo/trunk/
 root/ui/core/trunk/
 root/ui/core/trunk/parent/
 root/ui/core/trunk/parent/pom.xml
 root/ui/core/trunk/ui/
 root/ui/core/trunk/ui/pom.xml
 root/ui/dist/trunk/richfaces-components-api/
 root/ui/dist/trunk/richfaces-components-impl/
 root/ui/dist/trunk/richfaces-components-ui/
 root/ui/iteration/trunk/datascroller/
 root/ui/iteration/trunk/datascroller/ui/pom.xml
 root/ui/iteration/trunk/dist/
 root/ui/iteration/trunk/dist/richfaces-ui-iteration-api/
 root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl/
 root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui/
 root/ui/iteration/trunk/parent/
 root/ui/iteration/trunk/parent/pom.xml
 root/ui/iteration/trunk/tables/
 root/ui/iteration/trunk/tables/api/
 root/ui/iteration/trunk/tables/impl/
 root/ui/iteration/trunk/tables/ui/
 root/ui/iteration/trunk/tables/ui/pom.xml
 root/ui/misc/trunk/
 root/ui/misc/trunk/componentcontrol/
 root/ui/misc/trunk/componentcontrol/pom.xml
 root/ui/misc/trunk/dist/richfaces-ui-misc-ui/
 root/ui/misc/trunk/functions/
 root/ui/misc/trunk/functions/pom.xml
 root/ui/misc/trunk/parent/pom.xml
Log:
set targets and eclipse files to svn:ignore, add new scopes


Property changes on: root/commons/trunk/api
___________________________________________________________________
Name: svn:ignore
 - target

 + target
.settings
.project
.classpath
.clover



Modified:
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Binder.java
===================================================================
---
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Binder.java	2010-06-18
18:16:11 UTC (rev 17639)
+++
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Binder.java	2010-06-18
19:14:03 UTC (rev 17640)
@@ -27,14 +27,17 @@
 
 /**
 * 
+ * This interface lets {@link Module} to register concrete implementation of service.
 * 
 * 
 * @author asmirnov(a)exadel.com
 * 
+ * @param T
+ * type of object provided by binder
+ * 
 */
 public interface Binder<T> {
 
-
 public Binder<T> to(Class<? extends T> implementation);
 
 public Binder<T> toInstance(T value);
@@ -48,8 +51,15 @@
 public Binder<T> toService(Class<? extends T> defaultImplementation);
 
 public Binder<T> asSingleton();
+
 public Binder<T> asSessionScope();
+
 public Binder<T> asRequestScope();
+
 public Binder<T> asApplicationScope();
- 
+
+ public abstract Binder<T> asComponentScope();
+
+ public abstract Binder<T> asContexScope();
+
 }

Modified:
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/BinderImpl.java
===================================================================
---
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/BinderImpl.java	2010-06-18
18:16:11 UTC (rev 17639)
+++
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/BinderImpl.java	2010-06-18
19:14:03 UTC (rev 17640)
@@ -27,6 +27,7 @@
 import java.util.Map;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
+import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.inject.Provider;
 
@@ -61,10 +62,52 @@
 }
 };
 
+ /**
+ * 
+ * This is base class for JSF single-thread scopes ( request, view, FacesContext
attributes )
+ * 
+ * 
+ * @author asmirnov(a)exadel.com
+ * 
+ */
 private abstract class FacesScope implements Scope<T> {
 
+ @SuppressWarnings("unchecked")
+ public T get() {
+ T value;
+ FacesContext facesContext = FacesContext.getCurrentInstance();
+ if (null != facesContext) {
+ Map map = getMap(facesContext);
+ String key = target.toKey();
+ value = (T) map.get(key);
+ if (null == value) {
+ value = getProvider().get();
+ map.put(key, value);
+ }
+ } else {
+ value = getProvider().get();
+ }
+ return value;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected abstract Map getMap(FacesContext facesContext);
+ }
+
+ /**
+ * 
+ * This class represent scopes that can be shared between threads, like application,
singleton or session. For
+ * thread-safety, it uses {@link ReentrantReadWriteLock} to insert object instance
into scope map.
+ * 
+ * 
+ * @author asmirnov(a)exadel.com
+ * 
+ */
+ private abstract class ThreadSafeFacesScope implements Scope<T> {
+
 private ReentrantReadWriteLock rwLock = new ReentrantReadWriteLock();
 
+ @SuppressWarnings("unchecked")
 public T get() {
 T value;
 rwLock.readLock().lock();
@@ -72,9 +115,9 @@
 FacesContext facesContext = FacesContext.getCurrentInstance();
 if (null != facesContext) {
 Map<String, Object> map = getMap(facesContext);
- String key = target.toString();
+ String key = target.toKey();
 value = (T) map.get(key);
- if(null == value){
+ if (null == value) {
 rwLock.readLock().unlock();
 rwLock.writeLock().lock();
 try {
@@ -96,9 +139,9 @@
 
 protected abstract Map<String, Object> getMap(FacesContext facesContext);
 }
- 
- private final Scope<T> sessionScope = new FacesScope() {
- 
+
+ private final Scope<T> sessionScope = new ThreadSafeFacesScope() {
+
 @Override
 protected Map<String, Object> getMap(FacesContext facesContext) {
 Map<String, Object> map =
facesContext.getExternalContext().getSessionMap();
@@ -112,10 +155,29 @@
 return facesContext.getExternalContext().getRequestMap();
 }
 };
- 
- private final Scope<T> applicationScope = new FacesScope() {
+
+ private final Scope<T> contextScope = new FacesScope() {
 @Override
+ protected Map<Object, Object> getMap(FacesContext facesContext) {
+ return facesContext.getAttributes();
+ }
+ };
+
+ private final Scope<T> componentScope = new FacesScope() {
+ @SuppressWarnings("unchecked")
+ @Override
 protected Map<String, Object> getMap(FacesContext facesContext) {
+ Map<String, Object> map =
+ (Map<String, Object>)
facesContext.getAttributes().get(UIComponent.CURRENT_COMPONENT);
+ if (null == map) {
+ throw new DependencyException("Current component is not set for
dependency target " + target.toString());
+ }
+ return map;
+ }
+ };
+ private final Scope<T> applicationScope = new ThreadSafeFacesScope() {
+ @Override
+ protected Map<String, Object> getMap(FacesContext facesContext) {
 return facesContext.getExternalContext().getApplicationMap();
 }
 };
@@ -128,7 +190,7 @@
 
 private Scope<T> scope;
 
- private volatile BinderImpl<Provider<T>> providerBinder;
+ private volatile Binder<Provider<T>> providerBinder;
 
 private boolean initialized = false;
 
@@ -149,7 +211,7 @@
 return scope.get();
 }
 
- public BinderImpl<Provider<T>> asProviderBinder() {
+ public Binder<Provider<T>> asProviderBinder() {
 if (null == providerBinder) {
 createProviderBinding();
 }
@@ -249,13 +311,23 @@
 return this;
 }
 
+ public Binder<T> asContexScope() {
+ this.scope = contextScope;
+ return this;
+ }
+
+ public Binder<T> asComponentScope() {
+ this.scope = componentScope;
+ return this;
+ }
+
 void init(Binders injector) throws DependencyException {
 checkNotInitialized();
 if (null == provider && null == providerOfProvider) {
 throw new DependencyException("binding not has not been set");
 }
 if (null != provider && provider instanceof Initializable) {
- if( ((Initializable) provider).init(injector)){
+ if (((Initializable) provider).init(injector)) {
 this.scope = singltonScope;
 }
 }
@@ -270,7 +342,7 @@
 if (null == provider && null != providerOfProvider) {
 this.provider = providerOfProvider.get();
 }
- if (this.scope == singltonScope ) {
+ if (this.scope == singltonScope) {
 scope.get();
 }
 createProviderBinding();
@@ -305,18 +377,14 @@
 }
 }
 
- @SuppressWarnings("unchecked")
 private void createProviderBinding() {
- BinderImpl<Provider<T>> providerBinder = new
BinderImpl(target.toProvider());
- if (null != provider) {
- providerBinder.toInstance(provider);
- } else if (null != providerOfProvider) {
- providerBinder.toProviderInstance(providerOfProvider);
- }
+ BinderImpl<Provider<T>> providerBinder = new
BinderImpl<Provider<T>>(target.toProvider());
+ providerBinder.toInstance(scope);
 providerBinder.initialized = true;
 this.providerBinder = providerBinder;
 }
 
+ @SuppressWarnings("unchecked")
 private Collection<Class<? extends T>> loadService() {
 if (null == target) {
 throw new DependencyException("Binder does not configured
correctly");

Modified:
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/InjectorImpl.java
===================================================================
---
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/InjectorImpl.java	2010-06-18
18:16:11 UTC (rev 17639)
+++
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/InjectorImpl.java	2010-06-18
19:14:03 UTC (rev 17640)
@@ -81,7 +81,7 @@
 registerBinding(type, binding);
 return binding;
 } else if (type.isProvider()) {
- return getBinding(type.toProviderTarget()).asProviderBinder();
+ return (BinderImpl<?>)
getBinding(type.toProviderTarget()).asProviderBinder();
 } else {
 throw new DependencyException("Type " + type + " has not been
registered");
 }

Modified:
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Target.java
===================================================================
---
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Target.java	2010-06-18
18:16:11 UTC (rev 17639)
+++
root/core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330/Target.java	2010-06-18
19:14:03 UTC (rev 17640)
@@ -47,7 +47,7 @@
 
 private final Type type;
 
- private Class<?> rawType;
+ private final Class<?> rawType;
 
 private Type[] actualTypeArguments;
 
@@ -85,8 +85,7 @@
 }
 
 public Target toProvider() {
- Target target = new Target(name, type);
- target.rawType = Provider.class;
+ Target target = new Target(name, Provider.class);
 target.actualTypeArguments = new Type[]{this.type};
 return target;
 }
@@ -200,4 +199,12 @@
 }
 return builder.toString();
 }
+
+ public String toKey() {
+ if(null != name){
+ return name;
+ } else {
+ return toString();
+ }
+ }
 }


Property changes on: root/docs/trunk
___________________________________________________________________
Name: svn:ignore
 - target
.settings
.project
.classpath
.clover

 + target
.settings
.project
.classpath
.clover




Property changes on: root/docs/trunk/Component_Reference
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover




Property changes on: root/docs/trunk/Developer_Guide
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover




Property changes on: root/docs/trunk/Migration_Guide
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover




Property changes on: root/examples/iteration-demo/trunk
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover




Property changes on: root/examples/misc-demo/trunk
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/core/trunk
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/core/trunk/parent
___________________________________________________________________
Name: svn:ignore
 + target
.settings
.project
.classpath
.clover



Modified: root/ui/core/trunk/parent/pom.xml
===================================================================

--- root/ui/core/trunk/parent/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/core/trunk/parent/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -65,6 +65,25 @@
                     <groupId>org.richfaces.cdk</groupId>
                     <artifactId>maven-cdk-plugin</artifactId>
                     <version>${org.richfaces.cdk.version}</version>
+                <configuration>
+                    <library>
+                        <prefix>org.richfaces</prefix>
+                        <taglib>
+                            <uri>http://richfaces.org/a4j</uri>
+                            <shortName>a4j</shortName>
+                            <displayName>Core ajax components
tags</displayName>
+                        </taglib>
+                    </library>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>cdk-generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 </plugin>
                 <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
@@ -106,29 +125,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.richfaces.cdk</groupId>
-                <artifactId>maven-cdk-plugin</artifactId>
-                <configuration>
-                    <library>
-                        <prefix>org.richfaces</prefix>
-                        <taglib>
-                            <uri>http://richfaces.org/a4j</uri>
-                            <shortName>a4j</shortName>
-                            <displayName>Core ajax components
tags</displayName>
-                        </taglib>
-                    </library>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>cdk-generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 


Property changes on: root/ui/core/trunk/ui
___________________________________________________________________
Name: svn:ignore
   - target

   + target
.settings
.project
.classpath
.clover



Modified: root/ui/core/trunk/ui/pom.xml
===================================================================
--- root/ui/core/trunk/ui/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/core/trunk/ui/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -1,120 +1,133 @@
-<!--
-    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/maven-v4_0_0.xsd">
+	<!--
+		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.
+	-->
 
-    <parent>
-        <groupId>org.richfaces.ui.core</groupId>
-        <artifactId>richfaces-ui-core-parent</artifactId>
-        <version>4.0.0-SNAPSHOT</version>
-        <relativePath>../parent/pom.xml</relativePath>
-    </parent>
+<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.richfaces.ui.core</groupId>
-    <artifactId>richfaces-ui-core-ui</artifactId>
-    <name>Richfaces UI Components: Core UI</name>
-    <packaging>jar</packaging>
+	<parent>
+		<groupId>org.richfaces.ui.core</groupId>
+		<artifactId>richfaces-ui-core-parent</artifactId>
+		<version>4.0.0-SNAPSHOT</version>
+		<relativePath>../parent/pom.xml</relativePath>
+	</parent>
 
-    <dependencies>
-        <!-- runtime -->
-        <dependency>
-            <groupId>org.richfaces.core</groupId>
-            <artifactId>richfaces-core-api</artifactId>
-        </dependency>
-        <dependency>
-            <!-- todo remove this dependency or move to test scope -->
-            <groupId>org.richfaces.core</groupId>
-            <artifactId>richfaces-core-impl</artifactId>
-        </dependency>
+	<modelVersion>4.0.0</modelVersion>
+	<groupId>org.richfaces.ui.core</groupId>
+	<artifactId>richfaces-ui-core-ui</artifactId>
+	<name>Richfaces UI Components: Core UI</name>
+	<packaging>jar</packaging>
 
-        <dependency>
-            <groupId>org.richfaces.cdk</groupId>
-            <artifactId>annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
+	<build>
+		<plugins>
+			<plugin>
+				<groupId>org.richfaces.cdk</groupId>
+				<artifactId>maven-cdk-plugin</artifactId>
+			</plugin>
+		</plugins>
+	</build>
+	<dependencies>
+		<!-- runtime -->
+		<dependency>
+			<groupId>org.richfaces.core</groupId>
+			<artifactId>richfaces-core-api</artifactId>
+		</dependency>
+		<dependency>
+			<!-- todo remove this dependency or move to test scope -->
+			<groupId>org.richfaces.core</groupId>
+			<artifactId>richfaces-core-impl</artifactId>
+		</dependency>
 
-        <!-- JSF with dependencies -->
-        <dependency>
-            <groupId>${jsf2.api.groupid}</groupId>
-            <artifactId>${jsf2.api.artifactid}</artifactId>
-            <version>2.0.2</version><!-- TODO: remove this dependency it
should inherited from perent poms -->
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet.jsp</groupId>
-            <artifactId>jsp-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.el</groupId>
-            <artifactId>el-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>javax.servlet</groupId>
-            <artifactId>jstl</artifactId>
-            <scope>provided</scope>
-        </dependency>
+		<dependency>
+			<groupId>org.richfaces.cdk</groupId>
+			<artifactId>annotations</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-        <!-- tests -->
-        <dependency>
-            <groupId>${jsf2.impl.groupid}</groupId>
-            <artifactId>${jsf2.impl.artifactid}</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <!-- todo api? -->
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.test-jsf</groupId>
-            <artifactId>jsf-test-stage</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.test-jsf</groupId>
-            <artifactId>htmlunit-client</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.test-jsf</groupId>
-            <artifactId>jsf-mock</artifactId>
-            <scope>test</scope>
-        </dependency>
-    </dependencies>
+		<!-- JSF with dependencies -->
+		<dependency>
+			<groupId>${jsf2.api.groupid}</groupId>
+			<artifactId>${jsf2.api.artifactid}</artifactId>
+			<version>2.0.2</version>
+			<!--
+				TODO: remove this dependency it should inherited from perent poms
+			-->
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet.jsp</groupId>
+			<artifactId>jsp-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.el</groupId>
+			<artifactId>el-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>jstl</artifactId>
+			<scope>provided</scope>
+		</dependency>
 
-    <scm>
-       
<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/co...
-       
<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root...
-        <url>http://fisheye.jboss.org/browse/richfaces</url>
-    </scm>
+		<!-- tests -->
+		<dependency>
+			<groupId>${jsf2.impl.groupid}</groupId>
+			<artifactId>${jsf2.impl.artifactid}</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<!-- todo api? -->
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-log4j12</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.test-jsf</groupId>
+			<artifactId>jsf-test-stage</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.test-jsf</groupId>
+			<artifactId>htmlunit-client</artifactId>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.jboss.test-jsf</groupId>
+			<artifactId>jsf-mock</artifactId>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+
+	<scm>
+		<connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/root/ui/co...
+		</connection>
+		<developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/root...
+		</developerConnection>
+		<url>http://fisheye.jboss.org/browse/richfaces</url>
+	</scm>
 </project>
\ No newline at end of file


Property changes on: root/ui/dist/trunk/richfaces-components-api
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/dist/trunk/richfaces-components-impl
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/dist/trunk/richfaces-components-ui
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/datascroller
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover



Modified: root/ui/iteration/trunk/datascroller/ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/datascroller/ui/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/iteration/trunk/datascroller/ui/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -34,6 +34,14 @@
     <artifactId>datascroller-ui</artifactId>
     <name>Richfaces UI Components: Datascroller UI</name>
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.richfaces.cdk</groupId>
+                <artifactId>maven-cdk-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <!-- runtime -->


Property changes on: root/ui/iteration/trunk/dist
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/dist/richfaces-ui-iteration-api
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/dist/richfaces-ui-iteration-impl
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/dist/richfaces-ui-iteration-ui
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/parent
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover



Modified: root/ui/iteration/trunk/parent/pom.xml
===================================================================
--- root/ui/iteration/trunk/parent/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/iteration/trunk/parent/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -62,11 +62,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.richfaces.cdk</groupId>
-                    <artifactId>maven-cdk-plugin</artifactId>
-                    <version>${org.richfaces.cdk.version}</version>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.1</version>
@@ -82,6 +77,30 @@
                     <version>2.0-alpha-4</version>
                     <extensions>true</extensions>
                 </plugin>
+            <plugin>
+                <groupId>org.richfaces.cdk</groupId>
+                <artifactId>maven-cdk-plugin</artifactId>
+                    <version>${org.richfaces.cdk.version}</version>
+                <configuration>
+                    <library>
+                        <prefix>org.richfaces</prefix>
+                        <taglib>
+                            <uri>http://richfaces.org/iteration</uri>
+                            <shortName>it</shortName>
+                            <displayName>Iteration components
tags</displayName>
+                        </taglib>
+                    </library>
+                </configuration>
+                <executions>
+                    <execution>
+                        <id>cdk-generate-sources</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>generate</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             </plugins>
         </pluginManagement>
 
@@ -106,29 +125,6 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-                <groupId>org.richfaces.cdk</groupId>
-                <artifactId>maven-cdk-plugin</artifactId>
-                <configuration>
-                    <library>
-                        <prefix>org.richfaces</prefix>
-                        <taglib>
-                            <uri>http://richfaces.org/iteration</uri>
-                            <shortName>it</shortName>
-                            <displayName>Iteration components
tags</displayName>
-                        </taglib>
-                    </library>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>cdk-generate-sources</id>
-                        <phase>generate-sources</phase>
-                        <goals>
-                            <goal>generate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 


Property changes on: root/ui/iteration/trunk/tables
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/tables/api
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/tables/impl
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/iteration/trunk/tables/ui
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover



Modified: root/ui/iteration/trunk/tables/ui/pom.xml
===================================================================
--- root/ui/iteration/trunk/tables/ui/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/iteration/trunk/tables/ui/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -34,6 +34,14 @@
     <artifactId>tables-ui</artifactId>
     <name>Richfaces UI Components: Tables UI</name>
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.richfaces.cdk</groupId>
+                <artifactId>maven-cdk-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <!-- runtime -->


Property changes on: root/ui/misc/trunk
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/misc/trunk/componentcontrol
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover



Modified: root/ui/misc/trunk/componentcontrol/pom.xml
===================================================================
--- root/ui/misc/trunk/componentcontrol/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/misc/trunk/componentcontrol/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -31,6 +31,14 @@
     <artifactId>componentcontrol-ui</artifactId>
     <name>Richfaces UI Components: Component control UI</name>
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.richfaces.cdk</groupId>
+                <artifactId>maven-cdk-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <!-- runtime -->


Property changes on: root/ui/misc/trunk/dist/richfaces-ui-misc-ui
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover




Property changes on: root/ui/misc/trunk/functions
___________________________________________________________________
Name: svn:ignore
   + target
.settings
.project
.classpath
.clover



Modified: root/ui/misc/trunk/functions/pom.xml
===================================================================
--- root/ui/misc/trunk/functions/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/misc/trunk/functions/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -31,6 +31,14 @@
     <artifactId>functions-ui</artifactId>
     <name>Richfaces UI Components: Functions UI</name>
     <packaging>jar</packaging>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.richfaces.cdk</groupId>
+                <artifactId>maven-cdk-plugin</artifactId>
+            </plugin>
+        </plugins>
+    </build>
 
     <dependencies>
         <!-- runtime -->

Modified: root/ui/misc/trunk/parent/pom.xml
===================================================================
--- root/ui/misc/trunk/parent/pom.xml	2010-06-18 18:16:11 UTC (rev 17639)
+++ root/ui/misc/trunk/parent/pom.xml	2010-06-18 19:14:03 UTC (rev 17640)
@@ -72,11 +72,6 @@
         <pluginManagement>
             <plugins>
                 <plugin>
-                    <groupId>org.richfaces.cdk</groupId>
-                    <artifactId>maven-cdk-plugin</artifactId>
-                    <version>${org.richfaces.cdk.version}</version>
-                </plugin>
-                <plugin>
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-dependency-plugin</artifactId>
                     <version>2.1</version>
@@ -92,21 +87,10 @@
                     <version>2.0-alpha-4</version>
                     <extensions>true</extensions>
                 </plugin>
-            </plugins>
-        </pluginManagement>
-
-        <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>
+                    <version>${org.richfaces.cdk.version}</version>
                 <executions>
                     <execution>
                         <id>cdk-generate-sources</id>
@@ -117,6 +101,18 @@
                     </execution>
                 </executions>
             </plugin>
+            </plugins>
+        </pluginManagement>
+
+        <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>
         </plugins>
     </build>
 


    

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[richfaces-svn-commits] JBoss Rich Faces SVN: r17640 - in root: core/branches/jsr-330/jsr330-impl/src/main/java/org/richfaces/jsr330 and 28 other directories.