You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by gm...@apache.org on 2013/05/27 20:52:42 UTC
svn commit: r1486694 - in /roller/trunk: ./
weblogger-assembly/src/main/assembly/ weblogger-docs/installguide/
weblogger-webapp/src/main/webapp/WEB-INF/
Author: gmazza
Date: Mon May 27 18:52:41 2013
New Revision: 1486694
URL: http://svn.apache.org/r1486694
Log:
Turned off PDF bundling as we're not generating until release, changed the JBoss JNDI from java:/Mail to java:/RollerMail, updated the install doc: updated JBoss deployment instructions, removed WebSphere instructions.
Modified:
roller/trunk/build-javaee-release.sh
roller/trunk/build-jboss-release.sh
roller/trunk/build-tomcat-release.sh
roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml
roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml
roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml
roller/trunk/weblogger-docs/installguide/roller-install-guide.odt
roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml
Modified: roller/trunk/build-javaee-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-javaee-release.sh?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/build-javaee-release.sh (original)
+++ roller/trunk/build-javaee-release.sh Mon May 27 18:52:41 2013
@@ -1,6 +1,5 @@
# How to build the Java EE release of Roller (Glassfish)
-# Builds differ primarily by JARs bundled in the WAR,
-# see weblogger-war-assembly/src/main/assembly/*.xml for JAR diffs
+# See build-tomcat-release.sh for differences between release builds
mvn clean
mvn -Djavaee=true install
Modified: roller/trunk/build-jboss-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-jboss-release.sh?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/build-jboss-release.sh (original)
+++ roller/trunk/build-jboss-release.sh Mon May 27 18:52:41 2013
@@ -1,6 +1,5 @@
# How to build the JBoss release of Roller
-# Builds differ primarily by JARs bundled in the WAR,
-# see weblogger-war-assembly/src/main/assembly/*.xml for JAR diffs
+# See build-tomcat-release.sh for differences between release builds
mvn clean
mvn -Djavaee=true -Djboss=true install
Modified: roller/trunk/build-tomcat-release.sh
URL: http://svn.apache.org/viewvc/roller/trunk/build-tomcat-release.sh?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/build-tomcat-release.sh (original)
+++ roller/trunk/build-tomcat-release.sh Mon May 27 18:52:41 2013
@@ -1,6 +1,6 @@
# How to build a Tomcat release of Roller
-# Builds differ primarily by JARs bundled in the WAR,
-# see weblogger-war-assembly/src/main/assembly/*.xml for JAR diffs
+# See weblogger-war-assembly/src/main/assembly/*.xml for JAR diffs
+# between builds
mvn clean
mvn install
Modified: roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml (original)
+++ roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml Mon May 27 18:52:41 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/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml (original)
+++ roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml Mon May 27 18:52:41 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/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml (original)
+++ roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml Mon May 27 18:52:41 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>
Modified: roller/trunk/weblogger-docs/installguide/roller-install-guide.odt
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-docs/installguide/roller-install-guide.odt?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
Binary files - no diff available.
Modified: roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml
URL: http://svn.apache.org/viewvc/roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml?rev=1486694&r1=1486693&r2=1486694&view=diff
==============================================================================
--- roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml (original)
+++ roller/trunk/weblogger-webapp/src/main/webapp/WEB-INF/jboss-web.xml Mon May 27 18:52:41 2013
@@ -9,6 +9,6 @@
</resource-ref>
<resource-ref>
<res-ref-name>mail/Session</res-ref-name>
- <jndi-name>java:/Mail</jndi-name>
+ <jndi-name>java:/RollerMail</jndi-name>
</resource-ref>
</jboss-web>