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/08 21:52:25 UTC
svn commit: r1491050 - in /roller/branches/fewer_modules: ./
test-utils/src/main/java/org/apache/roller/weblogger/ant/
weblogger-assembly/src/main/assembly/
Author: snoopdave
Date: Sat Jun 8 19:52:24 2013
New Revision: 1491050
URL: http://svn.apache.org/r1491050
Log:
Merge from trunk
Modified:
roller/branches/fewer_modules/build-javaee-release.sh
roller/branches/fewer_modules/build-jboss-release.sh
roller/branches/fewer_modules/build-tomcat-release.sh
roller/branches/fewer_modules/test-utils/src/main/java/org/apache/roller/weblogger/ant/ (props changed)
roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-javaee.xml
roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-jboss.xml
roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-tomcat.xml
Modified: roller/branches/fewer_modules/build-javaee-release.sh
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/build-javaee-release.sh?rev=1491050&r1=1491049&r2=1491050&view=diff
==============================================================================
--- roller/branches/fewer_modules/build-javaee-release.sh (original)
+++ roller/branches/fewer_modules/build-javaee-release.sh Sat Jun 8 19:52:24 2013
@@ -1,4 +1,5 @@
# How to build the Java EE release of Roller (Glassfish)
+# See build-tomcat-release.sh for differences between release builds
mvn clean
mvn -Djavaee=true install
Modified: roller/branches/fewer_modules/build-jboss-release.sh
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/build-jboss-release.sh?rev=1491050&r1=1491049&r2=1491050&view=diff
==============================================================================
--- roller/branches/fewer_modules/build-jboss-release.sh (original)
+++ roller/branches/fewer_modules/build-jboss-release.sh Sat Jun 8 19:52:24 2013
@@ -1,4 +1,5 @@
# How to build the JBoss release of Roller
+# See build-tomcat-release.sh for differences between release builds
mvn clean
mvn -Djavaee=true -Djboss=true install
Modified: roller/branches/fewer_modules/build-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/build-tomcat-release.sh?rev=1491050&r1=1491049&r2=1491050&view=diff
==============================================================================
--- roller/branches/fewer_modules/build-tomcat-release.sh (original)
+++ roller/branches/fewer_modules/build-tomcat-release.sh Sat Jun 8 19:52:24 2013
@@ -1,10 +1,12 @@
# How to build a Tomcat release of Roller
+# See weblogger-war-assembly/src/main/assembly/*.xml for JAR diffs
+# between builds
mvn clean
mvn install
cd weblogger-war-assembly
mvn clean
-mvn -Dtomcat=true install
+mvn -Dtomcat=true install
cd ..
cd weblogger-assembly
Propchange: roller/branches/fewer_modules/test-utils/src/main/java/org/apache/roller/weblogger/ant/
------------------------------------------------------------------------------
Merged /roller/trunk/test-utils/src/main/java/org/apache/roller/weblogger/ant:r1465398-1490991
Modified: roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-javaee.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-javaee.xml?rev=1491050&r1=1491049&r2=1491050&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-javaee.xml (original)
+++ roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-javaee.xml Sat Jun 8 19:52:24 2013
@@ -46,7 +46,7 @@
<source>../LICENSE.txt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-javaee</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-javaee/docs</outputDirectory>
</file>
@@ -57,7 +57,7 @@
<file>
<source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-javaee/docs</outputDirectory>
- </file>
+ </file-->
</files>
</assembly>
Modified: roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-jboss.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-jboss.xml?rev=1491050&r1=1491049&r2=1491050&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-jboss.xml (original)
+++ roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-jboss.xml Sat Jun 8 19:52:24 2013
@@ -46,18 +46,18 @@
<source>../LICENSE.txt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/docs</outputDirectory>
- </file>
+ </file>
<file>
<source>../weblogger-docs/userguide/generated/roller-user-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/docs</outputDirectory>
- </file>
+ </file>
<file>
<source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/docs</outputDirectory>
- </file>
+ </file-->
</files>
</assembly>
Modified: roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-tomcat.xml
URL: http://svn.apache.org/viewvc/roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-tomcat.xml?rev=1491050&r1=1491049&r2=1491050&view=diff
==============================================================================
--- roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-tomcat.xml (original)
+++ roller/branches/fewer_modules/weblogger-assembly/src/main/assembly/for-tomcat.xml Sat Jun 8 19:52:24 2013
@@ -46,7 +46,7 @@
<source>../LICENSE.txt</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat</outputDirectory>
</file>
- <file>
+ <!--file>
<source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/docs</outputDirectory>
</file>
@@ -57,7 +57,7 @@
<file>
<source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/docs</outputDirectory>
- </file>
+ </file-->
</files>
</assembly>