Merge pull request #799 from apache/deprecated-plugins

Delete missed files and deprecated plugins

assembly/pom.xml

@@ -178,11 +178,6 @@
             <artifactId>struts2-junit-plugin</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-plexus-plugin</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-rest-plugin</artifactId>
@@ -210,31 +205,5 @@
             <groupId>org.apache.struts</groupId>
             <artifactId>struts2-json-plugin</artifactId>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-embeddedjsp-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-gxp-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-osgi-plugin</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-osgi-admin-bundle</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.struts</groupId>
-            <artifactId>struts2-osgi-demo-bundle</artifactId>
-        </dependency>
-
     </dependencies>
 </project>

assembly/src/main/assembly/all.xml

@@ -56,13 +56,6 @@
         <include>OGNL-LICENSE.txt</include>
       </includes>
     </fileSet>
-    <fileSet>
-      <directory>../plugins/plexus/src/main/resources</directory>
-      <outputDirectory></outputDirectory>
-      <includes>
-        <include>CLASSWORLDS-LICENSE.txt</include>
-      </includes>
-    </fileSet>
     <fileSet>
       <directory>../plugins/rest/src/main/resources</directory>
       <outputDirectory></outputDirectory>
@@ -103,7 +96,7 @@
       </fileSet>
 
       <!-- Plugins -->
-      <!-- 
+      <!--
       <fileSet>
         <directory>../plugins/$plugin/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-$plugin-plugin</outputDirectory>
@@ -125,14 +118,6 @@
         <directory>../plugins/convention/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-convention-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/embeddedjsp/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-embeddedjsp-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/gxp/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-gxp-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/jasperreports/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-jasperreports-plugin/apidocs</outputDirectory>
@@ -153,22 +138,6 @@
         <directory>../plugins/junit/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-junit-plugin/apidocs</outputDirectory>
       </fileSet>
-      <fileSet>
-        <directory>../plugins/osgi/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/plexus/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-plexus-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/portlet/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-portlet-plugin/apidocs</outputDirectory>
-      </fileSet>
-      <fileSet>
-        <directory>../plugins/portlet-tiles/target/apidocs</directory>
-        <outputDirectory>docs/struts2-plugins/struts2-portlet-tiles-plugin/apidocs</outputDirectory>
-      </fileSet>
       <fileSet>
         <directory>../plugins/rest/target/apidocs</directory>
         <outputDirectory>docs/struts2-plugins/struts2-rest-plugin/apidocs</outputDirectory>
@@ -194,17 +163,6 @@
         <outputDirectory>docs/struts2-plugins/struts2-velocity-plugin/apidocs</outputDirectory>
       </fileSet>
 
-    <!-- bundles -->
-    <fileSet>
-       <directory>../bundles/admin/target/site</directory>
-       <outputDirectory>docs/struts2-bundles/admin</outputDirectory>
-    </fileSet>  
-
-    <fileSet>
-       <directory>../bundles/demo/target/site</directory>
-       <outputDirectory>docs/struts2-bundles/demo</outputDirectory>
-    </fileSet>  
-
     <!-- Include the source code in the assembly -->
     <fileSet>
       <directory>../</directory>