[seam-commits] Seam SVN: r15387 - in branches/enterprise/WFK-2_1: build and 2 other directories.

[seam-commits at lists.jboss.org]

Author: vdedik
Date: 2013-01-10 06:36:21 -0500 (Thu, 10 Jan 2013)
New Revision: 15387

Removed:
   branches/enterprise/WFK-2_1/build/build.properties
Modified:
   branches/enterprise/WFK-2_1/.gitignore
   branches/enterprise/WFK-2_1/build/common.build.xml
   branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
   branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml
   branches/enterprise/WFK-2_1/pom.xml
Log:
Bug 875858 - Seam 2.3 seam-gen: XML validation doesn't work due to undefined 'version' property

Modified: branches/enterprise/WFK-2_1/.gitignore
===================================================================
--- branches/enterprise/WFK-2_1/.gitignore	2013-01-10 08:01:04 UTC (rev 15386)
+++ branches/enterprise/WFK-2_1/.gitignore	2013-01-10 11:36:21 UTC (rev 15387)
@@ -14,3 +14,6 @@
 
 #eclipse output
 bin
+
+#others
+/build/build.properties

Deleted: branches/enterprise/WFK-2_1/build/build.properties
===================================================================
--- branches/enterprise/WFK-2_1/build/build.properties	2013-01-10 08:01:04 UTC (rev 15386)
+++ branches/enterprise/WFK-2_1/build/build.properties	2013-01-10 11:36:21 UTC (rev 15387)
@@ -1,7 +0,0 @@
-offline.repository.jboss.org /home/mnovotny/projects/jboss-maven-repository/maven2
-jboss-releases-repository  https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/
-embedded.poms.dir /home/mnovotny/workspaces/jboss/jboss-seam_2_2/build/embedded
-embedded.dir /home/mnovotny/projects/EMBEDDED_JBOSS_BETA3_COMMUNITY/embedded
-#embedded.jars.dir /Users/pmuir/tmp/embedded-jboss-beta3/lib
-#ßembedded.dist.zip /Users/pmuir/Desktop/downloads/embedded-jboss-beta3.zip
-embedded.version beta3.SP10
\ No newline at end of file

Modified: branches/enterprise/WFK-2_1/build/common.build.xml
===================================================================
--- branches/enterprise/WFK-2_1/build/common.build.xml	2013-01-10 08:01:04 UTC (rev 15386)
+++ branches/enterprise/WFK-2_1/build/common.build.xml	2013-01-10 11:36:21 UTC (rev 15387)
@@ -45,9 +45,7 @@
     </copy>
     
     <!-- User set properties, order of this and default properties is important! -->
-    <property file="${seam.dir}/build.properties" />
-        
-    <property name="complete.version" value="2.3.0.Final-redhat-1" />
+    <property file="${build.dir}/build.properties" />
     
     <condition property="mavenized.property">
         <not>

Modified: branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml	2013-01-10 08:01:04 UTC (rev 15386)
+++ branches/enterprise/WFK-2_1/distribution/src/main/assembly/dist.xml	2013-01-10 11:36:21 UTC (rev 15387)
@@ -76,6 +76,7 @@
         <includes>
             <include>*.xml</include>
             <include>lib/*</include>
+            <include>build.properties</include>
         </includes>
       </fileSet>      
    </fileSets>    

Modified: branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml	2013-01-10 08:01:04 UTC (rev 15386)
+++ branches/enterprise/WFK-2_1/jboss-seam-gen/pom.xml	2013-01-10 11:36:21 UTC (rev 15387)
@@ -31,7 +31,38 @@
    				</execution>
    			</executions>
    		</plugin>
-   		
+   		<plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>generate build.properties</id>
+            <phase>generate-sources</phase>
+            <configuration>
+              <target>
+                <echo file="${project.basedir}/../build/build.properties">
+                  complete.version=${project.version}${line.separator}version=${project.short.version}
+                </echo>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+          <execution>
+            <id>clean build.properties</id>
+            <phase>clean</phase>
+            <configuration>
+              <target>
+                <delete file="${project.basedir}/../build/build.properties"/>
+              </target>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
    	</plugins>
    </build>
    <dependencies>

Modified: branches/enterprise/WFK-2_1/pom.xml
===================================================================
--- branches/enterprise/WFK-2_1/pom.xml	2013-01-10 08:01:04 UTC (rev 15386)
+++ branches/enterprise/WFK-2_1/pom.xml	2013-01-10 11:36:21 UTC (rev 15387)
@@ -37,6 +37,7 @@
 
 	<properties>
 		<!-- General properties -->
+        <project.short.version>2.3</project.short.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<seam.docbook.version>1.1.0.GA</seam.docbook.version>