Clean up Assembly to include Xwork Core

git-svn-id: https://svn.apache.org/repos/asf/struts/struts2/trunk@941378 13f79535-47bb-0310-9956-ffa450edef68

assembly/pom.xml

@@ -72,7 +72,7 @@
                     <dependency>
                         <groupId>com.opensymphony</groupId>
                         <artifactId>xwork-core</artifactId>
-                        <version>2.1.6</version>
+                        <version>${version}</version>
                         <type>jar</type>
                         <classifier>jdk14</classifier>
                         <scope>runtime</scope>
@@ -247,26 +247,9 @@
                             <outputDirectory>${project.build.directory}/apps</outputDirectory>
                         </configuration>
                     </execution>
-                    <execution>
-                        <id>xwork-core-javadoc</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>unpack</goal>
-                        </goals>
-                        <configuration>
-                            <artifactItems>
-                                <artifactItem>
-                                    <groupId>com.opensymphony</groupId>
-                                    <artifactId>xwork-core</artifactId>
-                                    <classifier>javadoc</classifier>
-                                    <version>${version}</version>
-                                </artifactItem>
-                            </artifactItems>
-                            <outputDirectory>${project.build.directory}/xwork-apidocs</outputDirectory>
-                        </configuration>
-                    </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
@@ -276,19 +259,17 @@
                         <configuration>
                             <tasks>
                                 <mkdir dir="${project.build.directory}/cwiki" />
-<!--
                                 <exec executable="ssh" failonerror="true" >
                                     <arg line="${username}@people.apache.org /www/struts.apache.org/2.x/docs-zip2.sh" />
                                 </exec>
                                 <unzip src="${project.build.directory}/docs.zip" dest="${project.build.directory}/cwiki" />
--->
                                 <exec executable="wget">
                                     <arg value="-erobots=off" />
                                     <arg value="-nH" />
                                     <arg value="-nv" />
                                     <arg value="-E" />
                                     <arg value="-L" />
-                                    <arg value="--directory-prefix=${project.build.directory}/cwiki" />
+                                    <arg value="- -directory-prefix=${project.build.directory}/cwiki" />
                                     <arg value="-r" />
                                     <arg value="http://cwiki.apache.org/WW/" />
                                 </exec>
@@ -300,6 +281,7 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>2.2-beta-1</version>

assembly/src/main/assembly/all.xml

@@ -54,7 +54,6 @@
       <includes>
         <include>FREEMARKER-LICENSE.txt</include>
         <include>OGNL-LICENSE.txt</include>
-        <include>XWORK-LICENSE.txt</include>
       </includes>
     </fileSet>
     <fileSet>
@@ -104,7 +103,7 @@
 
     <!-- Include the XWork Javadoc in the assembly -->
     <fileSet>
-      <directory>target/xwork-apidocs</directory>
+      <directory>../xwork-core/target/site/apidocs</directory>
       <outputDirectory>docs/xwork-apidocs</outputDirectory>
     </fileSet>
 
@@ -312,6 +311,14 @@
         <include>src/</include>
       </includes>
     </fileSet>
+    <fileSet>
+      <directory>../xwork-core</directory>
+      <outputDirectory>src/xwork-core</outputDirectory>
+      <includes>
+        <include>pom.xml</include>
+        <include>src/</include>
+      </includes>
+    </fileSet>
     <fileSet>
       <directory>../plugins</directory>
       <outputDirectory>src/plugins</outputDirectory>

assembly/src/main/assembly/apps.xml

@@ -48,7 +48,6 @@
       <includes>
         <include>FREEMARKER-LICENSE.txt</include>
         <include>OGNL-LICENSE.txt</include>
-        <include>XWORK-LICENSE.txt</include>
       </includes>
     </fileSet>
     <fileSet>

assembly/src/main/assembly/docs.xml

@@ -30,7 +30,7 @@
 
     <!-- Include the XWork Javadoc in the assembly -->
     <fileSet>
-      <directory>target/xwork-apidocs</directory>
+      <directory>../xwork-core/target/site/apidocs</directory>
       <outputDirectory>docs/xwork-apidocs</outputDirectory>
     </fileSet>
 

assembly/src/main/assembly/lib.xml

@@ -54,7 +54,6 @@
       <includes>
         <include>FREEMARKER-LICENSE.txt</include>
         <include>OGNL-LICENSE.txt</include>
-        <include>XWORK-LICENSE.txt</include>
       </includes>
     </fileSet>
     <fileSet>

assembly/src/main/assembly/src.xml

@@ -120,12 +120,23 @@
           <include>src/</include>
         </includes>
       </fileSet>
+      <fileSet>
+        <directory>../xwork-core</directory>
+        <outputDirectory>src/xwork-core</outputDirectory>
+        <includes>
+          <include>pom.xml</include>
+          <include>src/</include>
+        </includes>
+      </fileSet>
       <fileSet>
         <directory>../plugins</directory>
         <outputDirectory>src/plugins</outputDirectory>
         <excludes>
           <exclude>*/target/**</exclude>
           <exclude>target/**</exclude>
+          <exclude>*.iml</exclude>
+          <exclude>*.ipr</exclude>
+          <exclude>*.iws</exclude>
         </excludes>
       </fileSet>
       <fileSet>