Move OSGi plugin to trunk from the sandbox, fix assembly descriptors

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

assembly/pom.xml

@@ -161,6 +161,20 @@
                         <version>${version}</version>
                         <classifier>jdk14</classifier>
                     </dependency>
+                    
+                    <dependency>
+                        <groupId>org.apache.struts</groupId>
+                        <artifactId>struts2-oval-plugin</artifactId>
+                        <version>${version}</version>
+                        <classifier>jdk14</classifier>
+                    </dependency>
+                    
+                    <dependency>
+                        <groupId>org.apache.struts</groupId>
+                        <artifactId>struts2-osgi-plugin</artifactId>
+                        <version>${version}</version>
+                        <classifier>jdk14</classifier>
+                    </dependency>
             </dependencies>
         </profile>
     </profiles>
@@ -254,7 +268,7 @@
                                 </exec>
                                 <unzip src="${project.build.directory}/docs.zip" dest="${project.build.directory}/cwiki" />
 -->
-                                <!-- <exec executable="wget">
+                                <exec executable="wget">
                                     <arg value="-erobots=off" />
                                     <arg value="-nH" />
                                     <arg value="-nv" />
@@ -265,7 +279,7 @@
                                 </exec>    
                                 <move todir="${project.build.directory}/cwiki">
                                     <fileset dir="2.x/docs"/>
-                                </move> -->
+                                </move>
                             </tasks>
                         </configuration>
                         <goals>
@@ -428,6 +442,12 @@
             <artifactId>struts2-oval-plugin</artifactId>
             <version>${version}</version>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.struts</groupId>
+            <artifactId>struts2-osgi-plugin</artifactId>
+            <version>${version}</version>
+        </dependency>
 
     </dependencies>
 

assembly/src/main/assembly/all.xml

@@ -215,6 +215,10 @@
         <directory>../plugins/oval/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-oval-plugin</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../plugins/osgi/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin</outputDirectory>
+      </fileSet>
 
     <!-- Include the source code in the assembly -->
     <fileSet>

assembly/src/main/assembly/docs.xml

@@ -127,6 +127,14 @@
         <directory>../plugins/tiles/target/site</directory>
         <outputDirectory>docs/struts2-plugins/struts2-tiles-plugin</outputDirectory>
       </fileSet>
+      <fileSet>
+        <directory>../plugins/oval/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-oval-plugin</outputDirectory>
+      </fileSet>
+      <fileSet>
+        <directory>../plugins/osgi/target/site</directory>
+        <outputDirectory>docs/struts2-plugins/struts2-osgi-plugin</outputDirectory>
+      </fileSet>
 
   </fileSets>
 </assembly>

plugins/osgi/pom.xml

@@ -5,38 +5,19 @@
     <parent>
         <groupId>org.apache.struts</groupId>
         <artifactId>struts2-plugins</artifactId>
-        <version>2.0.9</version>
+        <version>2.1.7-SNAPSHOT</version>
     </parent>
     <groupId>org.apache.struts</groupId>
     <artifactId>struts2-osgi-plugin</artifactId>
     <packaging>jar</packaging>
-    <version>1.0.0-SNAPSHOT</version>
-    <name>Struts 2 OSGI Plugin</name>
+    <name>Struts 2 OSGi Plugin</name>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-osgi-plugin/</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/sandbox/trunk/struts2-osgi-plugin/</developerConnection>
-        <url>http://svn.apache.org/viewcvs.cgi/struts/sandbox/trunk/struts2-osgi-plugin/</url>
+       <connection>scm:svn:http://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/</connection>
+       <developerConnection>scm:svn:https://svn.apache.org/repos/asf/struts/struts2/trunk/plugins/osgi/</developerConnection>
+       <url>http://svn.apache.org/viewcvs.cgi/struts/struts2/trunk/plugins/osgi/</url>
     </scm>
 
-    <build>
-        <plugins>
-            <plugin>
-                <inherited>true</inherited>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-sources</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
         <dependency>
             <groupId>org.apache.felix</groupId>

plugins/pom.xml

@@ -60,6 +60,8 @@
         <module>junit</module>
         <module>testng</module>
         <module>dwr</module>
+        <module>oval</module>
+        <module>osgi</module>
     </modules>
 
     <dependencies>