Author: snoopdave
Date: Thu Nov 25 15:41:46 2010
New Revision: 1039076
URL: http://svn.apache.org/viewvc?rev=1039076&view=rev
Log:
For https://issues.apache.org/jira/browse/ROL-1894
Enable Roller 5 to run on JBoss AS 6
Unfortunately, it appears that JBoss will need its own build, one that does not
include Xerces or Javassist because those are included in the webapp classpath
by default.
Also adding two scripts to make creating Tomcat, Java EE and JBoss releases
easier.
Added:
roller/trunk/build-javaee-releases.sh (with props)
roller/trunk/build-tomcat-release.sh (with props)
roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml
- copied, changed from r1038901,
roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml
Modified:
roller/trunk/weblogger-assembly/pom.xml
roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml
roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml
Added: roller/trunk/build-javaee-releases.sh
URL:
http://svn.apache.org/viewvc/roller/trunk/build-javaee-releases.sh?rev=1039076&view=auto
==============================================================================
--- roller/trunk/build-javaee-releases.sh (added)
+++ roller/trunk/build-javaee-releases.sh Thu Nov 25 15:41:46 2010
@@ -0,0 +1,5 @@
+mvn clean
+mvn -Djavaee=true install
+pushd weblogger-assembly
+mvn -Djavaee=true install
+popd
Propchange: roller/trunk/build-javaee-releases.sh
------------------------------------------------------------------------------
svn:executable = *
Added: roller/trunk/build-tomcat-release.sh
URL:
http://svn.apache.org/viewvc/roller/trunk/build-tomcat-release.sh?rev=1039076&view=auto
==============================================================================
--- roller/trunk/build-tomcat-release.sh (added)
+++ roller/trunk/build-tomcat-release.sh Thu Nov 25 15:41:46 2010
@@ -0,0 +1,6 @@
+mvn clean
+mvn install
+pushd weblogger-assembly
+mvn install
+popd
+
Propchange: roller/trunk/build-tomcat-release.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: roller/trunk/weblogger-assembly/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/pom.xml?rev=1039076&r1=1039075&r2=1039076&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/pom.xml (original)
+++ roller/trunk/weblogger-assembly/pom.xml Thu Nov 25 15:41:46 2010
@@ -40,14 +40,7 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/for-javaee.xml</descriptor>
-
<descriptor>src/main/assembly/for-tomcat.xml</descriptor>
- <descriptor>src/main/assembly/source.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
+ <!-- See profiles below for configuration -->
<executions>
<execution>
@@ -65,6 +58,56 @@
</build>
<profiles>
+
+ <profile>
+ <id>tomcat-assembly</id>
+ <activation>
+ <property>
+ <name>!javaee</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/for-tomcat.xml</descriptor>
+
<descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+ <profile>
+ <id>javaee-assembly</id>
+ <activation>
+ <property>
+ <name>javaee</name>
+ </property>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+
<descriptor>src/main/assembly/for-javaee.xml</descriptor>
+
<descriptor>src/main/assembly/for-jboss.xml</descriptor>
+
<descriptor>src/main/assembly/source.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
<profile>
<id>release-sign-artifacts</id>
<activation>
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=1039076&r1=1039075&r2=1039076&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml (original)
+++ roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml Thu Nov 25
15:41:46 2010
@@ -16,12 +16,19 @@
* specific language governing permissions and limitations
* under the License.
-->
+
+<!--
+ WARNING: to produce a Java EE compatible build you MUST first build Roller
+ Weblogger using the -Djavaee=true option, e.g. mvn -Djavaee=true install
+-->
<assembly>
<id>for-javaee</id>
<formats>
+ <format>dir</format>
+ <!--
<format>zip</format>
<format>tar.gz</format>
- <format>tar.bz2</format>
+ -->
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
@@ -34,7 +41,6 @@
<excludes>
<!-- don't include all those Jave EE jars that Tomcat needs -->
<exclude>**/openjpa**</exclude>
- <exclude>**/xml-apis**</exclude>
<exclude>**/xercesImpl**</exclude>
<exclude>**/geronimo**</exclude>
</excludes>
Copied: roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml (from
r1038901, roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml)
URL:
http://svn.apache.org/viewvc/roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml?p2=roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml&p1=roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml&r1=1038901&r2=1039076&rev=1039076&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/src/main/assembly/for-javaee.xml (original)
+++ roller/trunk/weblogger-assembly/src/main/assembly/for-jboss.xml Thu Nov 25
15:41:46 2010
@@ -16,12 +16,19 @@
* specific language governing permissions and limitations
* under the License.
-->
+
+<!--
+ WARNING: to produce a JBoss compatible build you MUST first build Roller
+ Weblogger using the -Djavaee=true option, e.g. mvn -Djavaee=true install
+-->
<assembly>
- <id>for-javaee</id>
+ <id>for-jboss</id>
<formats>
+ <format>dir</format>
+ <!--
<format>zip</format>
<format>tar.gz</format>
- <format>tar.bz2</format>
+ -->
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
@@ -35,8 +42,11 @@
<!-- don't include all those Jave EE jars that Tomcat needs -->
<exclude>**/openjpa**</exclude>
<exclude>**/xml-apis**</exclude>
- <exclude>**/xercesImpl**</exclude>
<exclude>**/geronimo**</exclude>
+
+ <!-- oddly enough, JBoss already has these in webapp classpath
-->
+ <exclude>**/javassist**</exclude>
+ <exclude>**/xercesImpl**</exclude>
</excludes>
</fileSet>
</fileSets>
@@ -44,27 +54,27 @@
<files>
<file>
<source>../README.txt</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss</outputDirectory>
</file>
<file>
<source>../NOTICE.txt</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss</outputDirectory>
</file>
<file>
<source>../LICENSE.txt</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss</outputDirectory>
</file>
<file>
<source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/docs</outputDirectory>
</file>
<file>
<source>../weblogger-docs/userguide/generated/roller-user-guide.pdf</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/docs</outputDirectory>
</file>
<file>
<source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}-jboss/docs</outputDirectory>
</file>
</files>
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=1039076&r1=1039075&r2=1039076&view=diff
==============================================================================
--- roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml (original)
+++ roller/trunk/weblogger-assembly/src/main/assembly/for-tomcat.xml Thu Nov 25
15:41:46 2010
@@ -16,12 +16,19 @@
* specific language governing permissions and limitations
* under the License.
-->
+
+<!--
+ WARNING: to produce a Tomcat compatible build you MUST first build Roller
+ Weblogger AND NOT USING the -Djavaee=true option, e.g. mvn install
+-->
<assembly>
<id>for-tomcat</id>
<formats>
+ <format>dir</format>
+ <!--
<format>zip</format>
<format>tar.gz</format>
- <format>tar.bz2</format>
+ -->
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
