Author: gmazza
Date: Sun Aug 4 17:48:04 2013
New Revision: 1510278
URL: http://svn.apache.org/r1510278
Log:
Removed assembly-war submodule; assembly release now uses the WAR from the app
folder.
Removed:
roller/trunk/assembly-war/
roller/trunk/build-release.sh
Modified:
roller/trunk/README.txt
roller/trunk/assembly-release/pom.xml
roller/trunk/assembly-release/src/main/assembly/source.xml
roller/trunk/assembly-release/src/main/assembly/standard.xml
Modified: roller/trunk/README.txt
URL:
http://svn.apache.org/viewvc/roller/trunk/README.txt?rev=1510278&r1=1510277&r2=1510278&view=diff
==============================================================================
--- roller/trunk/README.txt (original)
+++ roller/trunk/README.txt Sun Aug 4 17:48:04 2013
@@ -6,16 +6,17 @@ Roller is made up of the following Maven
roller-project: Top level project
app: Roller Weblogger webapp, JSP pages, Velocity
templates
+ it-selenium Integrated browser tests for Roller using Selenium
To pull the latest trunk sources you need a Subversion client:
svn co https://svn.apache.org/repos/asf/roller/trunk roller_trunk
-Building this version of Roller requires Apache Maven 3.
+Building this version of Roller requires Apache Maven 3.0.5.
- How to build Roller: https://cwiki.apache.org/confluence/x/EM4
- To build and run Roller on Eclipse:
https://cwiki.apache.org/confluence/x/EM4
----------------------------------------------------------
-BUILDING FOR APACHE TOMCAT and JAVA EE 6 (e.g., GlassFish)
+How to build the source
The normal Roller build creates a product generically suitable for use several
application containers, however see the Roller Install guide for application
server
@@ -27,53 +28,20 @@ indicated above, the following command w
mvn clean install
After doing that, you should find the newly built Roller webapp, suitable
-for use in weblogger-web/target/roller.
-
-To build Roller release files run "sh build-release.sh". If using Windows,
use the
-commands within this script.
-
-After that, you'll find Roller distribution files in assembly-release/target.
-
-----------------------------------------------------------
-BUILDING FOR JBOSS 6
-
-JBoss 6 is a Java EE server, but due to differences in JNDI naming, it needs
-a separate build. If you add a 'jboss' flag to the Roller build invocation,
-you can create Roller release files that will work on a JBoss 6 app server.
-
- mvn clean
- mvn -Djboss=true install
-
- cd weblogger-war-assembly
- mvn -Djboss=true install
- cd ..
-
- cd weblogger-assembly
- mvn -Djboss=true install
- cd ..
-
-When that finishes, you will find Roller distribution files in
-weblogger-assembly/target. The Java EE specific release files will have
-'for-jboss' in their names.
-
-See the script build-jbossee-release.sh to see the sequence of commands used
-to create Roller releases for JBoss.
+for use in app/target/roller.
+To build Roller, subsequently run "mvn clean install" from the assembly-release
+folder. After that, you'll find Roller distribution files in
+assembly-release/target.
---------------------------
NOTES
-1) Set MAVEN_OPTS to include your preferred server
-
-If you always build for one server, then you might wish to define
-MAVEN_OPTS to include your preferred server flag, for example:
-
- export MAVEN_OPTS=${MAVEN_OPTS} -Dtomcat=true
-
-2) Building other versions of Roller
+Building other versions of Roller
If you wish to pull a branch other than the trunk, replace the word
"trunk" in both lines above with the appropriate branch name. Note that
versions of Roller before 5.0 have an Ant-based build. In general, you should
be able to follow instructions accompanying the sources that you pull in order
to build that version.
+
Modified: roller/trunk/assembly-release/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1510278&r1=1510277&r2=1510278&view=diff
==============================================================================
--- roller/trunk/assembly-release/pom.xml (original)
+++ roller/trunk/assembly-release/pom.xml Sun Aug 4 17:48:04 2013
@@ -32,6 +32,10 @@
<name>Roller release assembly</name>
<description>Assembles Roller into a distribution package</description>
+ <!--
+ Check the README.txt in the Roller base folder for
+ information on creating the Roller distribution files.
+ -->
<build>
<plugins>
<plugin>
@@ -89,4 +93,3 @@
</profiles>
</project>
-
Modified: roller/trunk/assembly-release/src/main/assembly/source.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/source.xml?rev=1510278&r1=1510277&r2=1510278&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/source.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/source.xml Sun Aug 4
17:48:04 2013
@@ -35,8 +35,6 @@
<excludes>
<exclude>it-selenium/**</exclude>
<exclude>**/target/**</exclude>
- <exclude>**/samples/create.sql</exclude>
- <exclude>**/samples/drop.sql</exclude>
<exclude>**/derby.log</exclude>
<exclude>**/.idea/**</exclude>
<exclude>**/._*</exclude>
Modified: roller/trunk/assembly-release/src/main/assembly/standard.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/standard.xml?rev=1510278&r1=1510277&r2=1510278&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/standard.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/standard.xml Sun Aug 4
17:48:04 2013
@@ -28,34 +28,32 @@
<files>
<file>
-
<source>../assembly-war/target/roller-war-${artifact.version}-standard.war</source>
- <!-- To grab directly from the app submodule: -->
- <!--source>../app/target/roller.war</source-->
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/webapp</outputDirectory>
+ <source>../app/target/roller.war</source>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}/webapp</outputDirectory>
</file>
<file>
<source>../README.txt</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
</file>
<file>
<source>../NOTICE.txt</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
</file>
<file>
<source>../LICENSE.txt</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}</outputDirectory>
</file>
<!--file>
<source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/docs</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
<file>
<source>../weblogger-docs/userguide/generated/roller-user-guide.pdf</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/docs</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file>
<file>
<source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
-
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/docs</outputDirectory>
+
<outputDirectory>${artifact.artifactId}-${artifact.version}/docs</outputDirectory>
</file-->
</files>
