Permalink
Browse files

Merged revisions 18523-18529,18580,18604,18606-18608,18634,18684,1872…

…5 via svnmerge from https://svn.jboss.org/repos/richfaces/branches/cdk-8570

........
  r18523 | alexsmirnov | 2010-08-09 15:26:39 -0700 (Mon, 09 Aug 2010) | 1 line
  
  remove old CDK archetypes
........
  r18524 | alexsmirnov | 2010-08-09 15:31:50 -0700 (Mon, 09 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9011
........
  r18525 | alexsmirnov | 2010-08-09 15:37:58 -0700 (Mon, 09 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9011
........
  r18526 | alexsmirnov | 2010-08-09 15:38:20 -0700 (Mon, 09 Aug 2010) | 1 line
  
  https://jira.jboss.org/browse/RF-9011
........
  r18527 | alexsmirnov | 2010-08-09 15:45:33 -0700 (Mon, 09 Aug 2010) | 1 line
  
  RF-8570
........
  r18528 | alexsmirnov | 2010-08-09 15:50:50 -0700 (Mon, 09 Aug 2010) | 1 line
  
  RF-8570
........
  r18529 | alexsmirnov | 2010-08-09 16:44:47 -0700 (Mon, 09 Aug 2010) | 1 line
  
  move all projects at the top level
........
  r18580 | alexsmirnov | 2010-08-11 16:28:17 -0700 (Wed, 11 Aug 2010) | 2 lines
  
  CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml 
  https://jira.jboss.org/browse/RF-8909
........
  r18604 | alexsmirnov | 2010-08-12 15:37:47 -0700 (Thu, 12 Aug 2010) | 2 lines
  
  CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml 
  https://jira.jboss.org/browse/RF-8909
........
  r18606 | alexsmirnov | 2010-08-12 15:55:41 -0700 (Thu, 12 Aug 2010) | 2 lines
  
  CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml 
  https://jira.jboss.org/browse/RF-8909
........
  r18607 | alexsmirnov | 2010-08-12 16:43:13 -0700 (Thu, 12 Aug 2010) | 2 lines
  
  complete - task : Optimise generated TagHandler imports 
........
  r18608 | alexsmirnov | 2010-08-12 16:45:02 -0700 (Thu, 12 Aug 2010) | 1 line
........
  r18634 | alexsmirnov | 2010-08-13 16:14:53 -0700 (Fri, 13 Aug 2010) | 2 lines
  
  CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml 
  https://jira.jboss.org/browse/RF-8909
........
  r18684 | alexsmirnov | 2010-08-16 16:09:37 -0700 (Mon, 16 Aug 2010) | 2 lines
  
  CODING IN PROGRESS - issue RF-8909: CDK: renderer-type is not written into .taglib.xml 
  https://jira.jboss.org/browse/RF-8909
........
  r18725 | alexsmirnov | 2010-08-17 10:16:37 -0700 (Tue, 17 Aug 2010) | 1 line
  
  build passed after merging
........
  • Loading branch information...
1 parent a08eeea commit 2143891fd3066c76b25c0c83a98026937df0a2b9 Alexander Smirnov committed Aug 18, 2010
Showing 943 changed files with 816 additions and 11,598 deletions.
File renamed without changes.
@@ -2,21 +2,20 @@
<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>
- <artifactId>maven-plugins</artifactId>
+ <artifactId>parent</artifactId>
<groupId>org.richfaces.cdk</groupId>
<version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
+ <relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>annotations</artifactId>
<version>4.0.0-SNAPSHOT</version>
<description>That project contains annotations for JSF classes</description>
<name>annotations</name>
<dependencies>
- <dependency>
- <groupId>com.sun.faces</groupId>
- <artifactId>jsf-api</artifactId>
- <scope>provided</scope>
- </dependency>
+ <dependency>
+ <groupId>${jsf2.api.groupid}</groupId>
+ <artifactId>${jsf2.api.artifactid}</artifactId>
+ </dependency>
</dependencies>
</project>
@@ -125,7 +125,7 @@
*
* @return
*/
- public Tag[] tag() default { @Tag };
+ public Tag[] tag() default {};
/**
* <p class="changed_added_4_0">
View
@@ -1,23 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>parent</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-archetypes</artifactId>
- <packaging>pom</packaging>
- <name>maven archetypes</name>
-
- <modules>
- <module>ui-singlemodule</module>
- <module>ui-multimodule</module>
- </modules>
-
-</project>
@@ -1,30 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-archetypes</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.cdk.maven-archetypes</groupId>
- <artifactId>richfaces-ui-multimodule-archetype</artifactId>
- <name>maven ui multimodule archetype</name>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<archetype-descriptor name="richfaces-ui-multimodule-archetype">
- <modules>
- <module id="${parent.artifactId}-api" dir="${parent.artifactId}-api" name="${parent.artifactId}-api" />
- <module id="${parent.artifactId}-ui" dir="${parent.artifactId}-ui" name="${parent.artifactId}-ui" />
- </modules>
-</archetype-descriptor>
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<archetype>
- <id>richfaces-ui-multimodule-archetype</id>
- <resources>
- <resource>api\pom.xml</resource>
- <resource>ui\pom.xml</resource>
- </resources>
-</archetype>
@@ -1,13 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-api</artifactId>
-
-</project>
@@ -1,15 +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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- <packaging>pom</packaging>
-
- <modules>
- <module>api</module>
- <module>ui</module>
- </modules>
-
-</project>
@@ -1,21 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <version>${version}</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>${parent.artifactId}-ui</artifactId>
-
- <dependencies>
- <dependency>
- <groupId>${project.groupId}</groupId>
- <version>${project.version}</version>
- <artifactId>${parent.artifactId}-api</artifactId>
- </dependency>
- </dependencies>
-
-</project>
@@ -1,30 +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/xsd/maven-4.0.0.xsd">
-
- <parent>
- <groupId>org.richfaces.cdk</groupId>
- <artifactId>maven-archetypes</artifactId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>org.richfaces.cdk.maven-archetypes</groupId>
- <artifactId>richfaces-ui-singlemodule-archetype</artifactId>
- <name>maven ui singlemodule archetype</name>
-
- <build>
- <extensions>
- <extension>
- <groupId>org.apache.maven.archetype</groupId>
- <artifactId>archetype-packaging</artifactId>
- </extension>
- </extensions>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-archetype-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-</project>
@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<archetype-descriptor name="richfaces-ui-singlemodule-archetype" />
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<archetype>
- <id>richfaces-ui-singlemodule-archetype</id>
-</archetype>
@@ -1,12 +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/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <groupId>${groupId}</groupId>
- <artifactId>${artifactId}</artifactId>
- <packaging>jar</packaging>
-
-</project>
@@ -1,12 +1,12 @@
<?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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>maven-plugins</artifactId>
- <groupId>org.richfaces.cdk</groupId>
- <version>4.0.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
+ <parent>
+ <artifactId>parent</artifactId>
+ <groupId>org.richfaces.cdk</groupId>
+ <version>4.0.0-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
<groupId>org.richfaces.cdk</groupId>
<artifactId>attributes</artifactId>
<version>4.0.0-SNAPSHOT</version>
Oops, something went wrong.

0 comments on commit 2143891

Please sign in to comment.