Author: gmazza
Date: Wed Jul 31 15:35:27 2013
New Revision: 1508930
URL: http://svn.apache.org/r1508930
Log:
Removed unused JBoss-specific build; install instructions now have JBoss users
work from the standard Roller war.
Removed:
roller/trunk/assembly-release/src/main/assembly/for-jboss.xml
roller/trunk/assembly-war/src/main/assembly/for-jboss.xml
roller/trunk/build-jboss-release.sh
roller/trunk/sign-jboss-release.sh
Modified:
roller/trunk/assembly-release/pom.xml
roller/trunk/assembly-war/pom.xml
roller/trunk/assembly-war/src/main/assembly/standard.xml
roller/trunk/build-release.sh
Modified: roller/trunk/assembly-release/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1508930&r1=1508929&r2=1508930&view=diff
==============================================================================
--- roller/trunk/assembly-release/pom.xml (original)
+++ roller/trunk/assembly-release/pom.xml Wed Jul 31 15:35:27 2013
@@ -82,29 +82,6 @@
</profile>
<profile>
- <id>jboss-assembly</id>
- <activation>
- <property>
- <name>jboss</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/for-jboss.xml</descriptor>
- </descriptors>
- <tarLongFileMode>gnu</tarLongFileMode>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
- <profile>
<id>release-sign-artifacts</id>
<activation>
<property>
Modified: roller/trunk/assembly-war/pom.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-war/pom.xml?rev=1508930&r1=1508929&r2=1508930&view=diff
==============================================================================
--- roller/trunk/assembly-war/pom.xml (original)
+++ roller/trunk/assembly-war/pom.xml Wed Jul 31 15:35:27 2013
@@ -78,29 +78,7 @@
</plugins>
</build>
</profile>
-
- <profile>
- <id>jboss-assembly</id>
- <activation>
- <property>
- <name>jboss</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <configuration>
- <descriptors>
-
<descriptor>src/main/assembly/for-jboss.xml</descriptor>
- </descriptors>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
-
+
</profiles>
</project>
Modified: roller/trunk/assembly-war/src/main/assembly/standard.xml
URL:
http://svn.apache.org/viewvc/roller/trunk/assembly-war/src/main/assembly/standard.xml?rev=1508930&r1=1508929&r2=1508930&view=diff
==============================================================================
--- roller/trunk/assembly-war/src/main/assembly/standard.xml (original)
+++ roller/trunk/assembly-war/src/main/assembly/standard.xml Wed Jul 31
15:35:27 2013
@@ -28,10 +28,6 @@
<fileSet>
<outputDirectory></outputDirectory>
<directory>../app/target/roller/</directory>
- <excludes>
- <!-- don't include Jetty config, needed for build time only -->
- <exclude>**/jetty-env.xml</exclude>
- </excludes>
</fileSet>
</fileSets>
Modified: roller/trunk/build-release.sh
URL:
http://svn.apache.org/viewvc/roller/trunk/build-release.sh?rev=1508930&r1=1508929&r2=1508930&view=diff
==============================================================================
--- roller/trunk/build-release.sh (original)
+++ roller/trunk/build-release.sh Wed Jul 31 15:35:27 2013
@@ -1,16 +1,14 @@
-# How to build a Tomcat release of Roller
-# See assembly-war/src/main/assembly/*.xml for JAR diffs
-# between builds
+# Full build process for Roller.
mvn clean
mvn install
cd assembly-war
mvn clean
-mvn -Dtomcat=true install
+mvn install
cd ..
cd assembly-release
mvn clean
-mvn -Dtomcat=true install
+mvn install
cd ..
