Author: gmazza
Date: Sun Jul 28 20:33:15 2013
New Revision: 1507842

URL: http://svn.apache.org/r1507842
Log:
Removed no-longer-needed javaee build

Added:
    roller/trunk/assembly-release/src/main/assembly/standard.xml
      - copied, changed from r1507812, 
roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml
    roller/trunk/assembly-war/src/main/assembly/standard.xml
      - copied, changed from r1507812, 
roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml
    roller/trunk/build-release.sh
      - copied unchanged from r1507812, roller/trunk/build-tomcat-release.sh
    roller/trunk/sign-release.sh
      - copied, changed from r1507812, roller/trunk/sign-tomcat-release.sh
Removed:
    roller/trunk/assembly-release/src/main/assembly/for-javaee.xml
    roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml
    roller/trunk/assembly-war/src/main/assembly/for-javaee.xml
    roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml
    roller/trunk/build-javaee-release.sh
    roller/trunk/build-tomcat-release.sh
    roller/trunk/sign-javaee-release.sh
    roller/trunk/sign-tomcat-release.sh
Modified:
    roller/trunk/README.txt
    roller/trunk/assembly-release/pom.xml
    roller/trunk/assembly-release/src/main/assembly/for-jboss.xml
    roller/trunk/assembly-war/pom.xml
    roller/trunk/assembly-war/src/main/assembly/for-jboss.xml
    roller/trunk/build-jboss-release.sh
    roller/trunk/docs/roller-install-guide.odt

Modified: roller/trunk/README.txt
URL: 
http://svn.apache.org/viewvc/roller/trunk/README.txt?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
--- roller/trunk/README.txt (original)
+++ roller/trunk/README.txt Sun Jul 28 20:33:15 2013
@@ -14,69 +14,27 @@ Building this version of Roller requires
   - 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
+----------------------------------------------------------
+BUILDING FOR APACHE TOMCAT and JAVA EE 6 (e.g., GlassFish)
 
-The normal Roller build creates a product suitable for use on Tomcat 6 or 
later,
-which includes OpenJPA bytecode enhancement, OpenJPA and other Java EE jars.
+The normal Roller build creates a product generically suitable for use several
+application containers, however see the Roller Install guide for application 
server
+specific configuration information.
 
 After pulling the source tree and changing directory to its top level, as
 indicated above, the following command will build and run all unit tests:
 
-   mvn clean
-   mvn install
+   mvn clean install
 
 After doing that, you should find the newly built Roller webapp, suitable
-for use with Tomcat in weblogger-web/target/roller. 
-
-To build Roller release files, you do this:
-
-   cd weblogger-war-assembly
-   mvn -Dtomcat=true install
-   cd ..
-
-   cd weblogger-assembly
-   mvn -Dtomcat=true install
-   cd ..
-
-After that, you'll find Roller distribution files in 
weblogger-assembly/target. 
-The Tomcat specific release files will have 'for-tomcat' in their names.
-
-See the script build-tomcat-release.sh to see the sequence of commands used
-to create Roller releases for Tomcat.
+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.
 
----------------------------
-BUILDING FOR JAVA EE 6
-
-The Tomcat build includes extra things that are not needed on a full Java EE
-application server. In fact, the Tomcat release won't work on some Java EE 
-servers. If we leave those extra things out, Roller can run on most Java EE 
-servers.
-
-If you add a 'javaee' flag to the Roller build invocation, you can create 
-Roller release files that will work on a Java EE 6 app server.
+After that, you'll find Roller distribution files in assembly-release/target. 
 
-    mvn clean
-    mvn -Djavaee=true install
-
-    cd weblogger-war-assembly
-    mvn -Djavaee=true install
-    cd ..
-
-    cd weblogger-assembly
-    mvn -Djavaee=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-javaee' in their names.
-      
-See the script build-javaee-release.sh to see the sequence of commands used
-to create Roller releases for Java EE.
-
-
----------------------------
+----------------------------------------------------------
 BUILDING FOR JBOSS 6
 
 JBoss 6 is a Java EE server, but due to differences in JNDI naming, it needs

Modified: roller/trunk/assembly-release/pom.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/assembly-release/pom.xml?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
--- roller/trunk/assembly-release/pom.xml (original)
+++ roller/trunk/assembly-release/pom.xml Sun Jul 28 20:33:15 2013
@@ -60,12 +60,10 @@
     <profiles>
         
         <profile>
-            <id>tomcat-assembly</id>
+            <id>standard-assembly</id>
             <activation>
-                <property>
-                    <name>tomcat</name>
-                </property>
-            </activation> 
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -73,7 +71,7 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                
<descriptor>src/main/assembly/for-tomcat.xml</descriptor>
+                                
<descriptor>src/main/assembly/standard.xml</descriptor>
                                 
<descriptor>src/main/assembly/source.xml</descriptor>
                             </descriptors>
                             <tarLongFileMode>gnu</tarLongFileMode>
@@ -84,29 +82,6 @@
         </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>
-                            </descriptors>
-                            <tarLongFileMode>gnu</tarLongFileMode>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
             <id>jboss-assembly</id>
             <activation>
                 <property>

Modified: roller/trunk/assembly-release/src/main/assembly/for-jboss.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/for-jboss.xml?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/for-jboss.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/for-jboss.xml Sun Jul 28 
20:33:15 2013
@@ -17,10 +17,6 @@
  * 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-jboss</id>
     <formats>

Copied: roller/trunk/assembly-release/src/main/assembly/standard.xml (from 
r1507812, roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml)
URL: 
http://svn.apache.org/viewvc/roller/trunk/assembly-release/src/main/assembly/standard.xml?p2=roller/trunk/assembly-release/src/main/assembly/standard.xml&p1=roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml&r1=1507812&r2=1507842&rev=1507842&view=diff
==============================================================================
--- roller/trunk/assembly-release/src/main/assembly/for-tomcat.xml (original)
+++ roller/trunk/assembly-release/src/main/assembly/standard.xml Sun Jul 28 
20:33:15 2013
@@ -18,12 +18,8 @@
  * 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>
+    <id>standard</id>
     <formats>
         <format>zip</format>
         <format>tar.gz</format>
@@ -32,32 +28,32 @@
 
     <files> 
         <file> 
-            
<source>../assembly-war/target/roller-war-${artifact.version}-tomcat.war</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/webapp</outputDirectory>
+            
<source>../assembly-war/target/roller-war-${artifact.version}-standard.war</source>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/webapp</outputDirectory>
         </file> 
         <file> 
             <source>../README.txt</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat</outputDirectory>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard</outputDirectory>
         </file> 
         <file> 
             <source>../NOTICE.txt</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat</outputDirectory>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard</outputDirectory>
         </file> 
         <file> 
             <source>../LICENSE.txt</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat</outputDirectory>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard</outputDirectory>
         </file> 
         <!--file>
             
<source>../weblogger-docs/installguide/generated/roller-install-guide.pdf</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/docs</outputDirectory>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/docs</outputDirectory>
         </file> 
         <file> 
             
<source>../weblogger-docs/userguide/generated/roller-user-guide.pdf</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/docs</outputDirectory>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/docs</outputDirectory>
         </file> 
         <file> 
             
<source>../weblogger-docs/templateguide/generated/roller-template-guide.pdf</source>
-            
<outputDirectory>${artifact.artifactId}-${artifact.version}-tomcat/docs</outputDirectory>
+            
<outputDirectory>${artifact.artifactId}-${artifact.version}-standard/docs</outputDirectory>
         </file-->
     </files>
 

Modified: roller/trunk/assembly-war/pom.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/assembly-war/pom.xml?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
--- roller/trunk/assembly-war/pom.xml (original)
+++ roller/trunk/assembly-war/pom.xml Sun Jul 28 20:33:15 2013
@@ -60,34 +60,10 @@
     <profiles>
         
         <profile>
-            <id>tomcat-assembly</id>
+            <id>standard-assembly</id>
             <activation>
-                <property>
-                    <name>tomcat</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>
-                            </descriptors>
-                        </configuration>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
-        
-        <profile>
-            <id>javaee-assembly</id>
-            <activation>
-                <property>
-                    <name>javaee</name>
-                </property>
-            </activation> 
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <build>
                 <plugins>
                     <plugin>
@@ -95,7 +71,7 @@
                         <artifactId>maven-assembly-plugin</artifactId>
                         <configuration>
                             <descriptors>
-                                
<descriptor>src/main/assembly/for-javaee.xml</descriptor>
+                                
<descriptor>src/main/assembly/standard.xml</descriptor>
                             </descriptors>
                         </configuration>
                     </plugin>

Modified: roller/trunk/assembly-war/src/main/assembly/for-jboss.xml
URL: 
http://svn.apache.org/viewvc/roller/trunk/assembly-war/src/main/assembly/for-jboss.xml?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
--- roller/trunk/assembly-war/src/main/assembly/for-jboss.xml (original)
+++ roller/trunk/assembly-war/src/main/assembly/for-jboss.xml Sun Jul 28 
20:33:15 2013
@@ -17,10 +17,6 @@
  * 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>jboss</id>
     <formats>

Copied: roller/trunk/assembly-war/src/main/assembly/standard.xml (from 
r1507812, roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml)
URL: 
http://svn.apache.org/viewvc/roller/trunk/assembly-war/src/main/assembly/standard.xml?p2=roller/trunk/assembly-war/src/main/assembly/standard.xml&p1=roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml&r1=1507812&r2=1507842&rev=1507842&view=diff
==============================================================================
--- roller/trunk/assembly-war/src/main/assembly/for-tomcat.xml (original)
+++ roller/trunk/assembly-war/src/main/assembly/standard.xml Sun Jul 28 
20:33:15 2013
@@ -17,12 +17,8 @@
  * 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>tomcat</id>
+    <id>standard</id>
     <formats>
         <format>war</format>
     </formats>

Modified: roller/trunk/build-jboss-release.sh
URL: 
http://svn.apache.org/viewvc/roller/trunk/build-jboss-release.sh?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
--- roller/trunk/build-jboss-release.sh (original)
+++ roller/trunk/build-jboss-release.sh Sun Jul 28 20:33:15 2013
@@ -1,7 +1,7 @@
 # How to build the JBoss release of Roller
-# See build-tomcat-release.sh for differences between release builds
+# See build-release.sh for differences between release builds
 mvn clean
-mvn -Djavaee=true -Djboss=true install
+mvn -Djboss=true install
 
 cd assembly-war
 mvn clean

Modified: roller/trunk/docs/roller-install-guide.odt
URL: 
http://svn.apache.org/viewvc/roller/trunk/docs/roller-install-guide.odt?rev=1507842&r1=1507841&r2=1507842&view=diff
==============================================================================
Binary files - no diff available.

Copied: roller/trunk/sign-release.sh (from r1507812, 
roller/trunk/sign-tomcat-release.sh)
URL: 
http://svn.apache.org/viewvc/roller/trunk/sign-release.sh?p2=roller/trunk/sign-release.sh&p1=roller/trunk/sign-tomcat-release.sh&r1=1507812&r2=1507842&rev=1507842&view=diff
==============================================================================
--- roller/trunk/sign-tomcat-release.sh (original)
+++ roller/trunk/sign-release.sh Sun Jul 28 20:33:15 2013
@@ -1,7 +1,7 @@
 export rcstring=""
 export vstring="5.1"
 
-gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.tar.gz
-gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}-for-tomcat.zip
+gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}.tar.gz
+gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}.zip
 gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}-source.tar.gz 
-gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}-source.zip
\ No newline at end of file
+gpg --armor --detach-sig 
assembly-release/target/roller-weblogger-${vstring}${rcstring}-source.zip


Reply via email to