You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2013/06/09 01:19:15 UTC
svn commit: r1491093 - in /roller/trunk: ./
assembly-release/src/main/assembly/ assembly-war/src/main/assembly/
Author: snoopdave
Date: Sat Jun 8 23:19:14 2013
New Revision: 1491093
URL: http://svn.apache.org/r1491093
Log:
fix paths in assemblies to use new directory names
Modified:
roller/trunk/assembly-release/src/main/assembly/for-javaee.xml
roller/trunk/assembly-release/src/main/assembly/for-jboss.xml
roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml
roller/trunk/assembly-war/src/main/assembly/for-javaee.xml
roller/trunk/assembly-war/src/main/assembly/for-jboss.xml
roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml
roller/trunk/build-javaee-release.sh
roller/trunk/build-jboss-release.sh
roller/trunk/build-tomcat-release.sh
roller/trunk/sign-javaee-release.sh
roller/trunk/sign-jboss-release.sh
roller/trunk/sign-tomcat-release.sh
Modified: roller/trunk/assembly-release/src/main/assembly/for-javaee.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/for-javaee.xml?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/for-javaee.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/for-javaee.xml Sat Jun 8 23:19:14 2013
@@ -31,7 +31,7 @@
<files>
<file>
- <source>../weblogger-war-assembly/target/roller-${artifact.version}-javaee.war</source>
+ <source>../assembly-war/target/roller-${artifact.version}-javaee.war</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-javaee/webapp</outputDirectory>
</file>
<file>
Modified: roller/trunk/assembly-release/src/main/assembly/for-jboss.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/for-jboss.xml?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/for-jboss.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/for-jboss.xml Sat Jun 8 23:19:14 2013
@@ -31,7 +31,7 @@
<files>
<file>
- <source>../weblogger-war-assembly/target/roller-${artifact.version}-jboss.war</source>
+ <source>../assembly-war/target/roller-${artifact.version}-jboss.war</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/webapp</outputDirectory>
</file>
<file>
Modified: roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml Sat Jun 8 23:19:14 2013
@@ -31,7 +31,7 @@
<files>
<file>
- <source>../weblogger-war-assembly/target/roller-${artifact.version}-tomcat.war</source>
+ <source>../assembly-war/target/roller-${artifact.version}-tomcat.war</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/webapp</outputDirectory>
</file>
<file>
Modified: roller/trunk/assembly-war/src/main/assembly/for-javaee.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-war/src/main/assembly/for-javaee.xml?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/assembly-war/src/main/assembly/for-javaee.xml (original)
+++ roller/trunk/assembly-war/src/main/assembly/for-javaee.xml Sat Jun 8 23:19:14 2013
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
<outputDirectory></outputDirectory>
- <directory>../weblogger-webapp/target/roller</directory>
+ <directory>../webapp/target/roller</directory>
<excludes>
<!-- don't include all those Jave EE jars that Tomcat needs -->
<exclude>**/openjpa**</exclude>
Modified: roller/trunk/assembly-war/src/main/assembly/for-jboss.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-war/src/main/assembly/for-jboss.xml?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/assembly-war/src/main/assembly/for-jboss.xml (original)
+++ roller/trunk/assembly-war/src/main/assembly/for-jboss.xml Sat Jun 8 23:19:14 2013
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
<outputDirectory></outputDirectory>
- <directory>../weblogger-webapp/target/roller</directory>
+ <directory>../webapp/target/roller</directory>
<excludes>
<!-- don't include all those Jave EE jars that Tomcat needs -->
<exclude>**/openjpa**</exclude>
Modified: roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml
URL: http://svn.apache.org/viewvc/roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml (original)
+++ roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml Sat Jun 8 23:19:14 2013
@@ -31,7 +31,7 @@
<fileSets>
<fileSet>
<outputDirectory></outputDirectory>
- <directory>../weblogger-webapp/target/roller/</directory>
+ <directory>../webapp/target/roller/</directory>
<excludes>
<!-- don't include Jetty config, needed for build time only -->
<exclude>**/jetty-env**</exclude>
Modified: roller/trunk/build-javaee-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-javaee-release.sh?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/build-javaee-release.sh (original)
+++ roller/trunk/build-javaee-release.sh Sat Jun 8 23:19:14 2013
@@ -3,12 +3,12 @@
mvn clean
mvn -Djavaee=true install
-cd weblogger-war-assembly
+cd assembly-war
mvn clean
mvn -Djavaee=true install
cd ..
-cd weblogger-assembly
+cd assembly-release
mvn clean
mvn -Djavaee=true install
cd ..
Modified: roller/trunk/build-jboss-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-jboss-release.sh?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/build-jboss-release.sh (original)
+++ roller/trunk/build-jboss-release.sh Sat Jun 8 23:19:14 2013
@@ -3,12 +3,12 @@
mvn clean
mvn -Djavaee=true -Djboss=true install
-cd weblogger-war-assembly
+cd assembly-war
mvn clean
mvn -Djboss=true install
cd ..
-cd weblogger-assembly
+cd assembly-release
mvn clean
mvn -Djboss=true install
cd ..
Modified: roller/trunk/build-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-tomcat-release.sh?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/build-tomcat-release.sh (original)
+++ roller/trunk/build-tomcat-release.sh Sat Jun 8 23:19:14 2013
@@ -4,12 +4,12 @@
mvn clean
mvn install
-cd weblogger-war-assembly
+cd assembly-war
mvn clean
mvn -Dtomcat=true install
cd ..
-cd weblogger-assembly
+cd assembly-release
mvn clean
mvn -Dtomcat=true install
cd ..
Modified: roller/trunk/sign-javaee-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/sign-javaee-release.sh?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/sign-javaee-release.sh (original)
+++ roller/trunk/sign-javaee-release.sh Sat Jun 8 23:19:14 2013
@@ -1,5 +1,5 @@
export rcstring=""
export vstring="5.1"
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-javaee.tar.gz
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-javaee.zip
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-javaee.tar.gz
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-javaee.zip
Modified: roller/trunk/sign-jboss-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/sign-jboss-release.sh?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/sign-jboss-release.sh (original)
+++ roller/trunk/sign-jboss-release.sh Sat Jun 8 23:19:14 2013
@@ -1,5 +1,5 @@
export rcstring=""
export vstring="5.1"
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-jboss.tar.gz
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-jboss.zip
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-jboss.tar.gz
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-jboss.zip
Modified: roller/trunk/sign-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/sign-tomcat-release.sh?rev=1491093&r1=1491092&r2=1491093&view=diff
==============================================================================
--- roller/trunk/sign-tomcat-release.sh (original)
+++ roller/trunk/sign-tomcat-release.sh Sat Jun 8 23:19:14 2013
@@ -1,8 +1,7 @@
export rcstring=""
export vstring="5.1"
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.tar.gz
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.zip
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-source.tar.gz
-gpg --armor --detach-sig weblogger-assembly/target/roller-weblogger-${vstring}${rcstring}-source.zip
-
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.tar.gz
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.zip
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-source.tar.gz
+gpg --armor --detach-sig assembly-release/target/roller-weblogger-${vstring}${rcstring}-source.zip
\ No newline at end of file