incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1209418 - in /incubator/odf/trunk: assemble/bin.xml assemble/src.xml pom.xml validator/pom.xml
Date Fri, 02 Dec 2011 11:36:14 GMT
Author: devinhan
Date: Fri Dec  2 11:36:12 2011
New Revision: 1209418

URL: http://svn.apache.org/viewvc?rev=1209418&view=rev
Log:
Update pom.xml to generate a more simple and clear directory structure for bin package.

Modified:
    incubator/odf/trunk/assemble/bin.xml
    incubator/odf/trunk/assemble/src.xml
    incubator/odf/trunk/pom.xml
    incubator/odf/trunk/validator/pom.xml

Modified: incubator/odf/trunk/assemble/bin.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/assemble/bin.xml?rev=1209418&r1=1209417&r2=1209418&view=diff
==============================================================================
--- incubator/odf/trunk/assemble/bin.xml (original)
+++ incubator/odf/trunk/assemble/bin.xml Fri Dec  2 11:36:12 2011
@@ -26,23 +26,12 @@
   </formats>
   <fileSets>
     <fileSet>
-      <directory>${project.basedir}</directory>
+      <directory>${project.basedir}/target/${project.version}/</directory>
       <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>**/target/**.jar</include>
-        <include>**/target/**.war</include>
-      </includes>
       <excludes>
-        <exclude>**/target/**-javadoc.jar</exclude>
-        <exclude>**/target/**-sources.jar</exclude>
+        <exclude>*.md5</exclude>
+        <exclude>*.sha</exclude>
       </excludes>
     </fileSet>
-    <fileSet>
-      <directory>${project.build.directory}/site</directory>
-      <outputDirectory>docs</outputDirectory>
-    </fileSet>
   </fileSets>
 </assembly>
\ No newline at end of file

Modified: incubator/odf/trunk/assemble/src.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/assemble/src.xml?rev=1209418&r1=1209417&r2=1209418&view=diff
==============================================================================
--- incubator/odf/trunk/assemble/src.xml (original)
+++ incubator/odf/trunk/assemble/src.xml Fri Dec  2 11:36:12 2011
@@ -31,6 +31,8 @@
         <include>README*</include>
         <include>LICENSE*</include>
         <include>NOTICE*</include>
+        <include>CHANGES*</include>
+        <include>KEYS*</include>
         <include>pom.xml</include>
       </includes>
       <useDefaultExcludes>true</useDefaultExcludes>

Modified: incubator/odf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/pom.xml?rev=1209418&r1=1209417&r2=1209418&view=diff
==============================================================================
--- incubator/odf/trunk/pom.xml (original)
+++ incubator/odf/trunk/pom.xml Fri Dec  2 11:36:12 2011
@@ -73,7 +73,7 @@
 			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/</archive>
 		</mailingList>
 	</mailingLists>
-
+	
 	<modules>
 		<module>taglets</module>
 		<module>generator</module>
@@ -83,23 +83,7 @@
 		<module>validator</module>
 		<module>simple</module>
 	</modules>
-
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>org.apache.rat</groupId>
-				<artifactId>apache-rat-plugin</artifactId>
-				<configuration>
-					<excludes>
-						<exclude>.gitignore</exclude>
-						<exclude>.git/**</exclude>
-						<exclude>.idea/**</exclude>
-					</excludes>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-
+	
 	<profiles>
 		<profile>
 			<id>pedantic</id>
@@ -141,31 +125,19 @@
 										<descriptor>assemble/src.xml</descriptor>
 									</descriptors>
 								</configuration>
-							</execution>
+							</execution>	
 							<execution>
 								<id>bin</id>
 								<goals>
 									<goal>single</goal>
 								</goals>
-								<phase>package</phase>
+								<phase>install</phase>
 								<configuration>
 									<descriptors>
 										<descriptor>assemble/bin.xml</descriptor>
 									</descriptors>
 								</configuration>
-							</execution>
-							<execution>
-								<id>doc</id>
-								<goals>
-									<goal>single</goal>
-								</goals>
-								<phase>package</phase>
-								<configuration>
-									<descriptors>
-										<descriptor>assemble/doc.xml</descriptor>
-									</descriptors>
-								</configuration>
-							</execution>
+							</execution>							
 						</executions>
 					</plugin>
 					<plugin>
@@ -176,8 +148,43 @@
 									<goal>run</goal>
 								</goals>
 								<phase>package</phase>
-								<configuration>
-									<tasks>										
+                				<configuration>
+                					<tasks>
+                    					<mkdir dir="${basedir}/target/${project.version}" />
+                    					<copy todir="${basedir}/target/${project.version}" flatten="true">
+                      						<fileset dir="${basedir}">
+                        						<include name="*.txt" />
+        										<include name="KEYS" />        
+                        						<include name="target/*-src.zip" />
+                        						<include name="odfdom/target/*.jar" />
+                        						<include name="simple/target/*.jar" />
+                        						<include name="validator/target/*.?ar" />
+                        						<include name="xslt-runner/target/*.jar" />
+                        						<include name="xslt-runner-task/target/*.jar" />
+                        						<exclude name="**/target/**-javadoc.jar" />
+        										<exclude name="**/target/**-sources.jar" />
+                      						</fileset>
+                    					</copy>
+                    					<mkdir dir="${basedir}/target/${project.version}/docs"/>
+                    					<copy todir="${basedir}/target/${project.version}/docs" flatten="true">
 
+                    						<fileset dir="${basedir}">                  					
+                        						<include name="odfdom/target/*-javadoc.jar" />
+                        						<include name="simple/target/*-javadoc.jar" />
+        									</fileset>
+                    					</copy>                    					
+                    					<checksum algorithm="MD5" fileext=".md5">
+                      						<fileset dir="${basedir}/target/${project.version}">
+                        						<include name="*.zip" />
+                        						<include name="*.?ar" />
+                      						</fileset>
+                    					</checksum>
+                    					<checksum algorithm="SHA1" fileext=".sha">
+                      						<fileset dir="${basedir}/target/${project.version}">
+                        						<include name="*.zip" />
+                        						<include name="*.?ar" />
+                      						</fileset>
+                    					</checksum>
+                    					<checksum file="target/${project.version}/odftoolkit-${project.version}-src.zip"
algorithm="SHA1" property="checksum" />								
 										<echo file="${basedir}/target/vote.txt">
 											From: ${username}@apache.org
 											To: odf-dev@incubator.apache.org
@@ -185,8 +192,8 @@
 
 											A candidate for the ODF Toolkit ${project.version} release is available	at:
 
-											http://people.apache.org/~${username}/odftoolkit/${project.version}/
-
+											http://people.apache.org/~${username}/odftoolkit-release/odftoolkit-${project.version}/
+											
 											The release candidate is a zip archive of the sources in:
 
 											https://svn.apache.org/repos/asf/incubator/odf/tags/${project.version}/
@@ -211,7 +218,7 @@
 											A release vote template has been generated for you:	file://${basedir}/target/vote.txt
                     					</echo>
 										<echo/>
-									</tasks>
+									</tasks>                 				
 								</configuration>
 							</execution>
 						</executions>

Modified: incubator/odf/trunk/validator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/validator/pom.xml?rev=1209418&r1=1209417&r2=1209418&view=diff
==============================================================================
--- incubator/odf/trunk/validator/pom.xml (original)
+++ incubator/odf/trunk/validator/pom.xml Fri Dec  2 11:36:12 2011
@@ -68,7 +68,7 @@
       			<executions>
       				<execution>
           				<id>download-odf-schema-v1.2</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -80,7 +80,7 @@
         			</execution>
         			<execution>
           				<id>download-odf-manifest-schema-v1.1</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -92,7 +92,7 @@
         			</execution>
         			<execution>
           				<id>download-odf-schema-v1.1</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -104,7 +104,7 @@
         			</execution>
         			<execution>
           				<id>download-odf-strict-schema-v1.1</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -116,7 +116,7 @@
         			</execution>
         			<execution>
           				<id>download-odf-manifest-schema-v1.0</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -128,7 +128,7 @@
         			</execution>
         			<execution>
           				<id>download-odf-schema-v1.0</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -140,7 +140,7 @@
         			</execution>
         			<execution>
           				<id>download-odf-strict-schema-v1.0</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -152,7 +152,7 @@
         			</execution>
         			<execution>
           				<id>download-mathml-schema-v3.0</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -164,7 +164,7 @@
         			</execution>
         			<execution>
           				<id>download-mathml-schema-v2.0</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -176,7 +176,7 @@
         			</execution>
         			<execution>
           				<id>download-mathml-schema-v1.01</id>
-          				<phase>generate-resources</phase>
+          				<phase>validate</phase>
           				<goals>
             				<goal>download-single</goal>
           				</goals>
@@ -195,9 +195,9 @@
     			<executions>
         			<execution>
             			<id>unzip schema packages</id>
-            			<phase>generate-resources</phase>
+            			<phase>validate</phase>
             			<configuration>
-                			<tasks>
+            				<tasks>
                     			<echo message="unzip odf 1.2 schemas" />
                     			<unzip src="${project.build.directory}/schemas/odf1.2/OpenDocument-v1.2-cos01-schemas.zip"
dest="src/main/resources/schema/odf1.2/" />
                     			<echo message="unzip mathml 3.0 schemas" />
@@ -209,7 +209,7 @@
                     			<echo message="unzip mathml 1.01 schemas" />
                     			<unzip src="${project.build.directory}/schemas/mmlents.zip" dest="src/main/resources/schema/"
/>
                     			<move file="src/main/resources/schema/mmlents" tofile="src/main/resources/schema/mathml1.01"/>
-                			</tasks>
+                			</tasks>           			
             			</configuration>
             			<goals>
                 			<goal>run</goal>
@@ -219,12 +219,12 @@
             			<id>clean schema files</id>
             			<phase>clean</phase>
             			<configuration>
-                			<tasks>
+            				<tasks>
                     			<echo message="remove schema files" />
                     			<delete>
  									<fileset dir="src/main/resources/schema/" excludes="odf*.properties" defaultexcludes="false"/>
 								</delete>
-                			</tasks>
+                			</tasks>                				
             			</configuration>
             			<goals>
                 			<goal>run</goal>



Mime
View raw message