svn commit: r830854 - in /incubator/log4php/trunk: package-config.php pom.xml src/assembly/pear-assembly.xml

[gr...@apache.org]

Author: grobmeier
Date: Thu Oct 29 07:12:30 2009
New Revision: 830854

URL: http://svn.apache.org/viewvc?rev=830854&view=rev
Log:
cleaned up

Removed:
    incubator/log4php/trunk/src/assembly/pear-assembly.xml
Modified:
    incubator/log4php/trunk/package-config.php
    incubator/log4php/trunk/pom.xml

Modified: incubator/log4php/trunk/package-config.php
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/package-config.php?rev=830854&r1=830853&r2=830854&view=diff
==============================================================================
--- incubator/log4php/trunk/package-config.php (original)
+++ incubator/log4php/trunk/package-config.php Thu Oct 29 07:12:30 2009
@@ -19,7 +19,7 @@
 // parse pom.xml to get version in sync
 preg_match("/<version>(.+?)(-(\w+))?<\/version>/", file_get_contents("../../pom.xml"), $pom_version);
 
-$name = 'log4php';
+$name = 'apachelog4php';
 $summary = 'log4Php is a PHP port of log4j framework';
 $version = $pom_version[1].(empty($pom_version[3]) ? '' : $pom_version[3]);
 $versionBuild = 'b1';

Modified: incubator/log4php/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/log4php/trunk/pom.xml?rev=830854&r1=830853&r2=830854&view=diff
==============================================================================
--- incubator/log4php/trunk/pom.xml (original)
+++ incubator/log4php/trunk/pom.xml Thu Oct 29 07:12:30 2009
@@ -167,7 +167,7 @@
                       -->
                     <execution>
                         <id>pear-package</id>
-                        <phase>process-sources</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>run</goal>
                         </goals>
@@ -186,7 +186,7 @@
                                     <fileset dir="src">     
                                         <include name="examples/**/*"/>     
                                     </fileset>      
-                                </copy>     
+                                </copy>
                                 <copy todir="target/pear/log4php">      
                                     <fileset dir="src/main/php">    
                                         <include name="**/*.php"/>      
@@ -199,7 +199,7 @@
                                 <exec executable="pear" dir="target/pear">
                                     <arg line="package"/>
                                 </exec>
-                                <move file="target/pear/log4php-${pear.version}.tgz" todir="target/" />
+                                <move file="target/pear/apachelog4php-${pear.version}.tgz" tofile="target/apache-log4php-${pear.version}-pear.tgz" />
                             </tasks>
                         </configuration>
                     </execution>
@@ -264,7 +264,6 @@
 				<configuration>
 					<descriptors>
 						<descriptor>src/assembly/bin.xml</descriptor>
-						<descriptor>src/assembly/pear-assembly.xml</descriptor>
 					</descriptors>
 					<appendAssemblyId>true</appendAssemblyId>
 				</configuration>
@@ -337,5 +336,5 @@
       <id>logging.site</id>
       <url>file:///${user.dir}/target/site-deploy</url>
     </site>
-  </distributionManagement> 
+  </distributionManagement>
 </project>