[seam-commits] Seam SVN: r14432 - in branches/community/Seam_2_3/jboss-seam-gen: dist/util and 1 other directories.

Author: manaRH Date: 2012-03-20 12:43:32 -0400 (Tue, 20 Mar 2012) New Revision: 14432 Removed: branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl branches/community/Seam_2_3/jboss-seam-gen/pom.xml branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml Log: JBSEAM-4909 fixed the util template Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl 2012-03-20 16:07:55 UTC (rev 14431) +++ branches/community/Seam_2_3/jboss-seam-gen/dist/util/TypeInfo.ftl 2012-03-20 16:43:32 UTC (rev 14432) @@ -28,7 +28,7 @@ </#function> <#function isToOne property> - <#return property.value.class.name.matches("javax.persistence.(One|Many)ToOne")/> + <#return property.value.class.name.matches("org.hibernate.mapping.(One|Many)ToOne")/> </#function> <#function label property> Modified: branches/community/Seam_2_3/jboss-seam-gen/pom.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-20 16:07:55 UTC (rev 14431) +++ branches/community/Seam_2_3/jboss-seam-gen/pom.xml 2012-03-20 16:43:32 UTC (rev 14432) @@ -1,7 +1,6 @@ <?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"> <modelVersion>4.0.0</modelVersion> - <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-gen</artifactId> <name>Seam Generator</name> <packaging>jar</packaging> @@ -26,7 +25,7 @@ </goals> <configuration> <descriptors> - <descriptor>src/main/assembly/assembly${ee6-property}.xml</descriptor> + <descriptor>src/main/assembly/assembly.xml</descriptor> </descriptors> <!-- <finalName>${project.build.finalName}-${project.version}</finalName>--> </configuration> Deleted: branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml 2012-03-20 16:07:55 UTC (rev 14431) +++ branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly-ee6.xml 2012-03-20 16:43:32 UTC (rev 14432) @@ -1,29 +0,0 @@ -<assembly - xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-2.2.xsd"> - - <id>distribution-ee6</id> - <formats> - <format>zip</format> - </formats> - <includeBaseDirectory>false</includeBaseDirectory> - - <!-- Add distribution files --> - <fileSets> - <!-- Copy EE6 template variants --> - <fileSet> - <directory>./dist/src-ee6</directory> - <outputDirectory>./src</outputDirectory> - </fileSet> - <fileSet> - <directory>dist</directory> - <outputDirectory>.</outputDirectory> - <excludes> - <exclude>pom.xml</exclude> - <exclude>./src-ee6/</exclude> - </excludes> - </fileSet> - </fileSets> - - </assembly> \ No newline at end of file Modified: branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml =================================================================== --- branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml 2012-03-20 16:07:55 UTC (rev 14431) +++ branches/community/Seam_2_3/jboss-seam-gen/src/main/assembly/assembly.xml 2012-03-20 16:43:32 UTC (rev 14432) @@ -17,7 +17,6 @@ <outputDirectory>.</outputDirectory> <excludes> <exclude>pom.xml</exclude> - <exclude>./src-ee6/</exclude> </excludes> </fileSet> </fileSets>