Commits

Anonymous committed e9e5a19

Check and verify maven assembly:assembly tasks for distribution
o updated pom for retroweaver
o updated assembly configurations (still in progress)
o added basic build.xml to build from packed sources
o added LICENSE.txt
o fixed retroweaver profile

Issue Number: XW-446

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@1244e221344d-f017-0410-9bd5-d282ab1896d7

  • Participants
  • Parent commits 5d3420a

Comments (0)

Files changed (6)

         <name>OpenSymphony</name>
         <url>http://www.opensymphony.com/</url>
     </organization>
+
+    <developers>
+        <developer>
+            <id>plightbo</id>
+            <name>Patrick Lightbody</name>
+            <email>plightbo at gmail.com</email>
+            <roles>
+                <role>Owner</role>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <id>jcarreira</id>
+            <name>Jason Carreira</name>
+            <email>jcarreira at gmail.com</email>
+            <roles>
+                <role>Owner</role>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <id>rainerh</id>
+            <name>Rainer Hermanns</name>
+            <email>hermanns at apache.org</email>
+            <roles>
+                <role>Release Manager</role>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Gabriel Zimmermann</name>
+            <id>gjz22</id>
+        </developer>
+        <developer>
+            <name>Peter Kelley</name>
+            <id>pkelley</id>
+            <email>yellekau at yahoo.com</email>
+        </developer>
+        <developer>
+            <name>Ted Husted</name>
+            <id>husted</id>
+            <email>husted at apache.org</email>
+            <roles>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Alexandru Popescu</name>
+            <id>apopescu</id>
+            <email>apopescu at apache.org</email>
+            <roles>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Rene Gielen</name>
+            <id>rgielen</id>
+            <email>rgielen at apache.org</email>
+            <roles>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Toby Jee</name>
+            <id>tmjee</id>
+            <email>tmjee at apache.org</email>
+            <roles>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Bob Lee</name>
+            <id>crazybob</id>
+            <email>crazybob at apache.org</email>
+            <roles>
+                <role>Committer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Matt Ho</name>
+            <email>matt at xtreme.com</email>
+        </developer>
+        <developer>
+            <name>Cameron Braid</name>
+            <email>cameron at braid.com.au</email>
+        </developer>
+        <developer>
+            <name>Bill Lynch</name>
+            <email>bill at jivesoftware.com</email>
+        </developer>
+        <developer>
+            <name>James House</name>
+            <email>jhouse at revolition.net</email>
+        </developer>
+        <developer>
+            <id>jon_lipsky</id>
+            <name>Jon Lipsky</name>
+            <email>jon.lipsky at xesoft.com</email>
+            <roles>
+                <role>XWork Configuration Editor</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Matthew Payne</name>
+            <email>matthew.payne at sutternow.com</email>
+        </developer>
+        <developer>
+            <name>Mark Woon</name>
+            <email>morpheus at helix.stanford.edu</email>
+        </developer>
+        <developer>
+            <id>jmitchell</id>
+            <name>James Mitchell</name>
+            <email>jmitchell at apache.org</email>
+        </developer>
+    </developers>
+    <contributors>
+        <contributor>
+            <name>Eric Molitor</name>
+        </contributor>
+    </contributors>
+    <ciManagement/>
     <issueManagement>
         <system>JIRA</system>
         <url>http://jira.opensymphony.com/browse/XW</url>
     <licenses>
         <license>
             <name>The OpenSymphony Software License 1.1</name>
-            <url>http://opensymphony.com/xwork/license.action</url>
+            <!--<url>http://opensymphony.com/xwork/license.action</url>-->
+            <url>src/etc/LICENSE.txt</url>
             <comments>
                 This license is derived and fully compatible with the Apache Software
                 License - see http://www.apache.org/LICENSE.txt
                         <artifactId>retrotranslator-maven-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>retrotranslate</id>
+                                <phase>process-classes</phase>
+                                <goals>
+                                    <goal>translate</goal>
+                                </goals>
+                                <configuration>
+                                    <verify>false</verify>
+                                    <failonwarning>true</failonwarning>
+                                    <lazy>true</lazy>
+                                    <verbose>false</verbose>
+                                    <destdir>${project.build.directory}/classes-retro</destdir>
+                                    <includes>
+                                        <include>
+                                            <directory>${project.build.directory}/classes</directory>
+                                        </include>
+                                    </includes>
+                                </configuration>
                             </execution>
                         </executions>
                     </plugin>
                         <artifactId>maven-jar-plugin</artifactId>
                         <executions>
                             <execution>
-                                <id>create-j4-jar</id>
                                 <goals>
                                     <goal>jar</goal>
                                 </goals>
+                                <phase>package</phase>
                                 <configuration>
                                     <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
                                     <classifier>j4</classifier>
             </testResource>
         </testResources>
         <plugins>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-idea-plugin</artifactId>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>attach-source</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
                 <configuration>
                     <sourcepath>src/java</sourcepath>
                     <encoding>UTF-8</encoding>
                     </execution>
                 </executions>
             </plugin>
-
+            <!--plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>retrotranslator-maven-plugin</artifactId>
+              <version>1.0-SNAPSHOT</version>
+              <executions>
+                <execution>
+                    <id>attach-source</id>
+                    <goals>
+                        <goal>translate</goal>
+                    </goals>
+                </execution>
+              </executions>
+                <configuration>
+                    <verify>false</verify>
+                    <failonwarning>true</failonwarning>
+                    <lazy>true</lazy>
+                    <verbose>false</verbose>
+                    <includes>
+                        <include>
+                            <directory>${pom.basedir}/target/classes</directory>
+                        </include>
+                    </includes>
+                    <destdir>${project.build.directory}/classes-retro</destdir>
+                </configuration>
+            </plugin-->
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
                 <artifactId>cobertura-maven-plugin</artifactId>
                     </execution>
                 </executions>
             </plugin>
-
         </plugins>
         <defaultGoal>install</defaultGoal>
     </build>

src/assembly/all.xml

             <outputDirectory></outputDirectory>
             <includes>
                 <include>pom*</include>
-                <include>osbuild*</include>
+                <!--include>osbuild*</include>
                 <include>build*</include>
-                <include>ivy*</include>
+                <include>ivy*</include-->
             </includes>
         </fileSet>
         <fileSet>
             <outputDirectory></outputDirectory>
             <includes>
                 <include>README*</include>
+                <include>LICENSE*</include>
+                <include>build*</include>
             </includes>
         </fileSet>
 
-        <!-- Include the XWork Javadoc in the assembly -->
-        <!--fileSet>
-          <directory>target/xwork-apidocs</directory>
-          <outputDirectory>docs/xwork-apidocs</outputDirectory>
-        </fileSet-->
-
         <!-- Include the website in the assembly -->
         <fileSet>
             <directory>docs</directory>
             <outputDirectory>docs</outputDirectory>
         </fileSet>
 
+        <!-- Include the XWork Javadoc in the assembly -->
+        <fileSet>
+          <directory>target/xwork-apidocs</directory>
+          <outputDirectory>docs/xwork-apidocs</outputDirectory>
+        </fileSet>
+
         <!-- Include the maven site in the assembly -->
         <fileSet>
             <directory>target/site</directory>
-            <outputDirectory>site</outputDirectory>
+            <outputDirectory>docs/site</outputDirectory>
         </fileSet>
 
         <!-- Include the source code in the assembly -->
                 <include>src/</include>
             </includes>
         </fileSet>
+
+        <!-- Include the generated jars in archive root -->
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>xwork-${version}-javadoc.jar</include>
+                <include>xwork-${version}-sources.jar</include>
+                <include>xwork-${version}.jar</include>
+            </includes>
+        </fileSet>
+
     </fileSets>
 </assembly>

src/assembly/lib.xml

 -->
 
 <assembly>
-  <id>lib</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
-    <fileSet>
-    	<directory>src/etc</directory>
-    	<outputDirectory></outputDirectory>
-      <includes>
-        <include>README*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
+    <id>lib</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <scope>runtime</scope>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
+        <fileSet>
+            <directory>src/etc</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>xwork-${version}-javadoc.jar</include>
+                <include>xwork-${version}-sources.jar</include>
+                <include>xwork-${version}.jar</include>
+            </includes>
+        </fileSet>
+    </fileSets>
 </assembly>

src/assembly/src.xml

 -->
 
 <assembly>
-  <id>src</id>
-  <formats>
-    <format>zip</format>
-  </formats>
-  <includeBaseDirectory>true</includeBaseDirectory>
-  <dependencySets>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>optional</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>compile</scope>
-    </dependencySet>
-    <dependencySet>
-      <outputDirectory>lib</outputDirectory>
-      <scope>provided</scope>
-    </dependencySet>
-  </dependencySets>
-  <fileSets>
+    <id>src</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+    <includeBaseDirectory>true</includeBaseDirectory>
+    <dependencySets>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <scope>optional</scope>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <scope>compile</scope>
+        </dependencySet>
+        <dependencySet>
+            <outputDirectory>lib</outputDirectory>
+            <scope>provided</scope>
+        </dependencySet>
+    </dependencySets>
+    <fileSets>
 
-      <fileSet>
-          <directory></directory>
-          <outputDirectory></outputDirectory>
-          <includes>
-              <include>pom*</include>
-              <include>osbuild*</include>
-              <include>build*</include>
-              <include>ivy*</include>
-          </includes>
-      </fileSet>
-      
-      <fileSet>
-          <directory>src/etc</directory>
-          <outputDirectory></outputDirectory>
-          <includes>
-              <include>README*</include>
-              <!--include>LICENSE*</include>
-              <include>NOTICE*</include>
-              <include>build.xml</include-->
-          </includes>
-      </fileSet>
+        <fileSet>
+            <directory></directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>pom*</include>
+                <!--include>osbuild*</include>
+                <include>build*</include>
+                <include>ivy*</include-->
+            </includes>
+        </fileSet>
 
-      <!-- Include the source code in the assembly -->
-      <fileSet>
-          <directory>src</directory>
-          <outputDirectory>src/</outputDirectory>
-          <includes>
-              <include>java/</include>
-              <include>test/</include>
-              <include>etc/</include>
-              <include>assembly/</include>
-          </includes>
-      </fileSet>
+        <fileSet>
+            <directory>src/etc</directory>
+            <outputDirectory></outputDirectory>
+            <includes>
+                <include>README*</include>
+                <include>LICENSE*</include>
+                <include>build*</include>
+            </includes>
+        </fileSet>
 
-      <fileSet>
-          <directory>showcase</directory>
-          <outputDirectory>showcase</outputDirectory>
-          <includes>
-              <include>pom.xml</include>
-              <include>src/</include>
-          </includes>
-      </fileSet>
+        <!-- Include the source code in the assembly -->
+        <fileSet>
+            <directory>src</directory>
+            <outputDirectory>src/</outputDirectory>
+            <includes>
+                <include>java/</include>
+                <include>test/</include>
+                <include>etc/</include>
+                <include>assembly/</include>
+            </includes>
+        </fileSet>
 
-  </fileSets>
+        <fileSet>
+            <directory>showcase</directory>
+            <outputDirectory>showcase</outputDirectory>
+            <includes>
+                <include>pom.xml</include>
+                <include>src/</include>
+            </includes>
+        </fileSet>
+
+    </fileSets>
 </assembly>

src/etc/LICENSE.txt

+The OpenSymphony Software License, Version 1.1
+
+(this license is derived and fully compatible with the Apache Software
+License - see http://www.apache.org/LICENSE.txt)
+
+Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in
+   the documentation and/or other materials provided with the
+   distribution.
+
+3. The end-user documentation included with the redistribution,
+   if any, must include the following acknowledgment:
+      "This product includes software developed by the
+       OpenSymphony Group (http://www.opensymphony.com/)."
+   Alternately, this acknowledgment may appear in the software itself,
+   if and wherever such third-party acknowledgments normally appear.
+
+4. The names "OpenSymphony" and "The OpenSymphony Group"
+   must not be used to endorse or promote products derived from this
+   software without prior written permission. For written
+   permission, please contact license@opensymphony.com .
+
+5. Products derived from this software may not be called "OpenSymphony"
+   or "XWork", nor may "OpenSymphony" or "XWork" appear in their
+   name, without prior written permission of the OpenSymphony Group.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.

src/etc/build.xml

+<?xml version="1.0"?>
+<project name="xwork" default="default">
+
+  <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+  <!--                   directories                     -->
+  <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+  <property name="src.dir" value="src/java"/>
+  <property name="build.dir" value="build"/>
+  <property name="build.classes.dir" value="${build.dir}/classes"/>
+  <property name="dist.dir" value="dist"/>
+  <property name="lib.dir" value="lib"/>
+
+  <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+  <!--                    paths                          -->
+  <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+  <path id="compile.classpath">
+    <pathelement location="${build.classes.dir}"/>
+    <fileset dir="${lib.dir}">
+      <include name="**/*.jar" />
+    </fileset>
+  </path>
+
+  <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+  <!--                  targets                          -->
+  <!-- -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -->
+  <target name="default"
+          depends="dist"
+          description="default: build everything"
+  />
+
+  <target name="clean" description="remove all built files">
+    <delete dir="${build.dir}" />
+    <delete dir="${dist.dir}" />
+  </target>
+
+  <target name="dist"
+          depends="compile"
+          description="create distributables (jars etc)">
+    <mkdir dir="${dist.dir}" />
+    <jar jarfile="${dist.dir}/xwork2.jar"> 
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
+  </target>
+  <target name="compile" description="compile java">
+    <mkdir dir="${build.classes.dir}" />
+    <javac srcdir="${src.dir}"
+           destdir="${build.classes.dir}"
+           classpathref="compile.classpath"
+           debug="on"
+           deprecation="on"/>
+  </target>
+
+</project>